]> spindle.queued.net Git - midori/commitdiff
Import upstream version 0.5.10
authorAndres Salomon <dilinger@debian.org>
Sun, 28 Jun 2015 05:58:11 +0000 (22:58 -0700)
committerAndres Salomon <dilinger@debian.org>
Sun, 28 Jun 2015 06:04:24 +0000 (23:04 -0700)
371 files changed:
CMakeLists.txt [new file with mode: 0644]
ChangeLog
GNUmakefile.in [new file with mode: 0644]
HACKING
INSTALL [deleted file]
README
cmake/ContainTest.cmake [new file with mode: 0644]
cmake/FindConvert.cmake [new file with mode: 0644]
cmake/FindIntltool.cmake [new file with mode: 0644]
cmake/FindVala.cmake [new file with mode: 0644]
cmake/GIR.cmake [new file with mode: 0644]
cmake/GLibHelpers.cmake [new file with mode: 0644]
cmake/GtkDoc.cmake [new file with mode: 0644]
cmake/ParseArguments.cmake [new file with mode: 0644]
cmake/ValaPrecompile.cmake [new file with mode: 0644]
config/CMakeLists.txt [new file with mode: 0644]
config/extensions/adblock/config [new file with mode: 0644]
config/search [new file with mode: 0644]
configure
data/CMakeLists.txt [new file with mode: 0644]
data/about.css
data/adblock.list [new file with mode: 0644]
data/adblock/blocked.svg [new file with mode: 0644]
data/adblock/disabled.svg [new file with mode: 0644]
data/adblock/element_hider.js [new file with mode: 0644]
data/adblock/enabled.svg [new file with mode: 0644]
data/autosuggestcontrol.js
data/bookmarks/Create.sql [new file with mode: 0644]
data/bookmarks/Import_old_db_bookmarks.sql [new file with mode: 0644]
data/com.nokia.midori.service [deleted file]
data/error.html
data/extensions/adblock/config [deleted file]
data/faq.html
data/flummi/Create.sql [new file with mode: 0644]
data/forms/Create.sql [new file with mode: 0644]
data/gtk3.css
data/history/Create.sql [new file with mode: 0644]
data/history/Day.sql [new file with mode: 0644]
data/midori.appdata.xml.in [new file with mode: 0644]
data/midori.desktop.in
data/nojs/nojs-statusicon-allowed.png [new file with mode: 0644]
data/nojs/nojs-statusicon-denied.png [new file with mode: 0644]
data/nojs/nojs-statusicon-mixed.png [new file with mode: 0644]
data/notes/Create.sql [new file with mode: 0644]
data/search [deleted file]
data/speeddial-head.html
data/tabby/Create.sql [new file with mode: 0644]
data/tabby/Update1.sql [new file with mode: 0644]
docs/api/CMakeLists.txt [new file with mode: 0644]
docs/api/wscript_build [deleted file]
extensions/CMakeLists.txt [new file with mode: 0644]
extensions/about.vala [new file with mode: 0644]
extensions/adblock.c [deleted file]
extensions/adblock/config.vala [new file with mode: 0644]
extensions/adblock/element.vala [new file with mode: 0644]
extensions/adblock/extension.vala [new file with mode: 0644]
extensions/adblock/filter.vala [new file with mode: 0644]
extensions/adblock/keys.vala [new file with mode: 0644]
extensions/adblock/options.vala [new file with mode: 0644]
extensions/adblock/pattern.vala [new file with mode: 0644]
extensions/adblock/subscriptions.vala [new file with mode: 0644]
extensions/adblock/updater.vala [new file with mode: 0644]
extensions/adblock/whitelist.vala [new file with mode: 0644]
extensions/adblock/widgets.vala [new file with mode: 0644]
extensions/addons.c
extensions/apps.vala
extensions/colorful-tabs.c
extensions/cookie-manager/cookie-manager-page.c
extensions/cookie-manager/cookie-manager.c
extensions/cookie-permissions/cookie-permission-manager-preferences-window.c
extensions/cookie-permissions/cookie-permission-manager.c
extensions/cookie-permissions/cookie-permission-manager.h
extensions/cookie-permissions/main.c
extensions/delayed-load.vala
extensions/devpet.vala [new file with mode: 0644]
extensions/domain-keys.vala [new file with mode: 0644]
extensions/external-download-manager.vala
extensions/feed-panel/feed-panel.c
extensions/feed-panel/feed-rss.c
extensions/feed-panel/katze-net.c [new file with mode: 0644]
extensions/feed-panel/katze-net.h [new file with mode: 0644]
extensions/feed-panel/main.c
extensions/flummi.vala [new file with mode: 0644]
extensions/formhistory/formhistory-frontend.h
extensions/formhistory/formhistory-gdom-frontend.c
extensions/formhistory/formhistory-js-frontend.c [deleted file]
extensions/formhistory/formhistory.c
extensions/history-list.vala
extensions/mouse-gestures.c
extensions/nojs/README.md [new file with mode: 0644]
extensions/nojs/main.c [new file with mode: 0644]
extensions/nojs/nojs-preferences.c [new file with mode: 0644]
extensions/nojs/nojs-preferences.h [new file with mode: 0644]
extensions/nojs/nojs-view.c [new file with mode: 0644]
extensions/nojs/nojs-view.h [new file with mode: 0644]
extensions/nojs/nojs.c [new file with mode: 0644]
extensions/nojs/nojs.h [new file with mode: 0644]
extensions/notes.vala [new file with mode: 0644]
extensions/nsplugin-manager.vala
extensions/open-with.vala [new file with mode: 0644]
extensions/status-clock.c
extensions/statusbar-features.c
extensions/tab-panel.c
extensions/tabby.vala [new file with mode: 0644]
extensions/tabs2one.c [new file with mode: 0644]
extensions/toolbar-editor.c
extensions/transfers.vala
extensions/web-cache.c [deleted file]
extensions/webmedia-now-playing.vala [new file with mode: 0644]
extensions/wscript_build [deleted file]
gir/CMakeLists.txt [new file with mode: 0644]
icons/CMakeLists.txt [new file with mode: 0644]
icons/wscript_build [deleted file]
katze/gtk3-compat.c
katze/gtk3-compat.h
katze/katze-array.c
katze/katze-array.h
katze/katze-arrayaction.c
katze/katze-cellrenderercomboboxtext.c [new file with mode: 0644]
katze/katze-cellrenderercomboboxtext.h [new file with mode: 0644]
katze/katze-http-auth.c
katze/katze-http-cookies-sqlite.c [deleted file]
katze/katze-http-cookies-sqlite.h [deleted file]
katze/katze-http-cookies.c [deleted file]
katze/katze-http-cookies.h [deleted file]
katze/katze-item.c
katze/katze-net.c [deleted file]
katze/katze-net.h [deleted file]
katze/katze-preferences.c
katze/katze-throbber.c [deleted file]
katze/katze-throbber.h [deleted file]
katze/katze-utils.c
katze/katze.h
katze/katze.vapi
katze/midori-paths.vala
katze/midori-uri.vala
midori/CMakeLists.txt [new file with mode: 0644]
midori/gtkiconentry.h [deleted file]
midori/main.c
midori/marshal.list
midori/midori-app.c
midori/midori-array.c
midori/midori-array.h
midori/midori-bookmarks-db.c [new file with mode: 0644]
midori/midori-bookmarks-db.h [new file with mode: 0644]
midori/midori-bookmarks.c [deleted file]
midori/midori-bookmarks.h [deleted file]
midori/midori-bookmarksdatabase.vala [new file with mode: 0644]
midori/midori-browser.c
midori/midori-completion.vala
midori/midori-contextaction.vala [new file with mode: 0644]
midori/midori-database.vala [new file with mode: 0644]
midori/midori-dialog.vala
midori/midori-download.vala
midori/midori-extension.c
midori/midori-extension.h
midori/midori-frontend.c
midori/midori-frontend.h
midori/midori-history.c
midori/midori-history.h
midori/midori-historycompletion.vala
midori/midori-historydatabase.vala [new file with mode: 0644]
midori/midori-locationaction.c
midori/midori-notebook.vala [new file with mode: 0644]
midori/midori-panedaction.vala
midori/midori-panel.c
midori/midori-platform.h
midori/midori-preferences.c
midori/midori-privatedata.c
midori/midori-privatedata.h
midori/midori-searchaction.c
midori/midori-searchcompletion.vala
midori/midori-session.c
midori/midori-session.h
midori/midori-settings.vala
midori/midori-speeddial.vala
midori/midori-tab.vala
midori/midori-view.c
midori/midori-view.h
midori/midori-viewcompletion.vala
midori/midori-websettings.c
midori/midori-websettings.h
midori/midori.h
midori/midori.vapi
midori/socket.c [deleted file]
midori/socket.h [deleted file]
midori/sokoke.c
midori/sokoke.h
midori/webkit2gtk-3.0.vapi
midori/webkitgtk-3.0.vapi
midori/wscript_build [deleted file]
module.xml [deleted file]
panels/midori-bookmarks.c
panels/midori-bookmarks.h
panels/midori-extensions.c
panels/midori-history.c
po/CMakeLists.txt [new file with mode: 0644]
po/POTFILES.in
po/af.po [new file with mode: 0644]
po/am.po [new file with mode: 0644]
po/ar.po
po/ast.po
po/be.po
po/bg.po
po/bn.po [new file with mode: 0644]
po/bs.po [new file with mode: 0644]
po/ca.po
po/ckb.po [new file with mode: 0644]
po/cs.po
po/cy.po [new file with mode: 0644]
po/da.po
po/de.po
po/el.po
po/en_AU.po [new file with mode: 0644]
po/en_CA.po [new file with mode: 0644]
po/en_GB.po
po/eo.po
po/es.po
po/et.po
po/eu.po
po/fa.po [new file with mode: 0644]
po/fi.po
po/fr.po
po/gd.po [new file with mode: 0644]
po/gl.po
po/he.po
po/hi.po [new file with mode: 0644]
po/hr.po
po/hu.po
po/ia.po [new file with mode: 0644]
po/id.po
po/it.po
po/ja.po
po/ka.po [new file with mode: 0644]
po/kk.po
po/km.po [new file with mode: 0644]
po/ko.po
po/ky.po [new file with mode: 0644]
po/lb.po [new file with mode: 0644]
po/lt.po
po/lv.po [new file with mode: 0644]
po/ml.po [new file with mode: 0644]
po/ms.po [new file with mode: 0644]
po/nap.po [new file with mode: 0644]
po/nb.po [new file with mode: 0644]
po/nl.po
po/nn.po [new file with mode: 0644]
po/no.po
po/pa.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po [new file with mode: 0644]
po/sq.po [new file with mode: 0644]
po/sr.po
po/sr@latin.po
po/sv.po
po/ta.po [new file with mode: 0644]
po/te.po [new file with mode: 0644]
po/th.po [new file with mode: 0644]
po/tr.po
po/ug.po
po/uk.po
po/ur.po [new file with mode: 0644]
po/uz.po [new file with mode: 0644]
po/vi.po [new file with mode: 0644]
po/zh_CN.po
po/zh_HK.po [new file with mode: 0644]
po/zh_TW.po
tests/CMakeLists.txt [new file with mode: 0644]
tests/actions.vala [new file with mode: 0644]
tests/app.vala
tests/bookmarks.c
tests/browser.c
tests/completion.vala
tests/database.vala [new file with mode: 0644]
tests/download.vala
tests/extensions.c
tests/license.sh
tests/magic-uri.c
tests/notebook.vala [new file with mode: 0644]
tests/potfiles.sh [changed mode: 0644->0755]
tests/searchaction.vala
tests/speeddial.vala
tests/tab.vala
tests/wscript_build [deleted file]
toolbars/midori-findbar.c
tools/midori-dev
tools/release
waf-modules/wafadmin/3rdparty/boost.py [deleted file]
waf-modules/wafadmin/3rdparty/fluid.py [deleted file]
waf-modules/wafadmin/Build.py [deleted file]
waf-modules/wafadmin/Configure.py [deleted file]
waf-modules/wafadmin/Constants.py [deleted file]
waf-modules/wafadmin/Environment.py [deleted file]
waf-modules/wafadmin/Logs.py [deleted file]
waf-modules/wafadmin/Node.py [deleted file]
waf-modules/wafadmin/Options.py [deleted file]
waf-modules/wafadmin/Runner.py [deleted file]
waf-modules/wafadmin/Scripting.py [deleted file]
waf-modules/wafadmin/Task.py [deleted file]
waf-modules/wafadmin/TaskGen.py [deleted file]
waf-modules/wafadmin/Tools/__init__.py [deleted file]
waf-modules/wafadmin/Tools/ar.py [deleted file]
waf-modules/wafadmin/Tools/bison.py [deleted file]
waf-modules/wafadmin/Tools/cc.py [deleted file]
waf-modules/wafadmin/Tools/ccroot.py [deleted file]
waf-modules/wafadmin/Tools/compiler_cc.py [deleted file]
waf-modules/wafadmin/Tools/compiler_cxx.py [deleted file]
waf-modules/wafadmin/Tools/compiler_d.py [deleted file]
waf-modules/wafadmin/Tools/config_c.py [deleted file]
waf-modules/wafadmin/Tools/cs.py [deleted file]
waf-modules/wafadmin/Tools/cxx.py [deleted file]
waf-modules/wafadmin/Tools/d.py [deleted file]
waf-modules/wafadmin/Tools/dbus.py [deleted file]
waf-modules/wafadmin/Tools/dmd.py [deleted file]
waf-modules/wafadmin/Tools/flex.py [deleted file]
waf-modules/wafadmin/Tools/gas.py [deleted file]
waf-modules/wafadmin/Tools/gcc.py [deleted file]
waf-modules/wafadmin/Tools/gdc.py [deleted file]
waf-modules/wafadmin/Tools/glib2.py [deleted file]
waf-modules/wafadmin/Tools/gnome.py [deleted file]
waf-modules/wafadmin/Tools/gnu_dirs.py [deleted file]
waf-modules/wafadmin/Tools/gob2.py [deleted file]
waf-modules/wafadmin/Tools/gxx.py [deleted file]
waf-modules/wafadmin/Tools/icc.py [deleted file]
waf-modules/wafadmin/Tools/icpc.py [deleted file]
waf-modules/wafadmin/Tools/intltool.py [deleted file]
waf-modules/wafadmin/Tools/javaw.py [deleted file]
waf-modules/wafadmin/Tools/kde4.py [deleted file]
waf-modules/wafadmin/Tools/libtool.py [deleted file]
waf-modules/wafadmin/Tools/lua.py [deleted file]
waf-modules/wafadmin/Tools/misc.py [deleted file]
waf-modules/wafadmin/Tools/msvc.py [deleted file]
waf-modules/wafadmin/Tools/nasm.py [deleted file]
waf-modules/wafadmin/Tools/ocaml.py [deleted file]
waf-modules/wafadmin/Tools/osx.py [deleted file]
waf-modules/wafadmin/Tools/perl.py [deleted file]
waf-modules/wafadmin/Tools/preproc.py [deleted file]
waf-modules/wafadmin/Tools/python.py [deleted file]
waf-modules/wafadmin/Tools/qt4.py [deleted file]
waf-modules/wafadmin/Tools/ruby.py [deleted file]
waf-modules/wafadmin/Tools/suncc.py [deleted file]
waf-modules/wafadmin/Tools/suncxx.py [deleted file]
waf-modules/wafadmin/Tools/tex.py [deleted file]
waf-modules/wafadmin/Tools/unittestw.py [deleted file]
waf-modules/wafadmin/Tools/vala.py [deleted file]
waf-modules/wafadmin/Tools/winres.py [deleted file]
waf-modules/wafadmin/Tools/xlc.py [deleted file]
waf-modules/wafadmin/Tools/xlcxx.py [deleted file]
waf-modules/wafadmin/Utils.py [deleted file]
waf-modules/wafadmin/__init__.py [deleted file]
waf-modules/wafadmin/ansiterm.py [deleted file]
waf-modules/wafadmin/pproc.py [deleted file]
waf-modules/wafadmin/py3kfixes.py [deleted file]
waf-unpacked [deleted file]
win32/README_OPENSUSE_MINGW.txt [deleted file]
win32/makedist/makedist.midori
win32/makedist/midori.nsi
win32/makedist/win32-release
win32/old/README_OPENSUSE_MINGW.txt [new file with mode: 0644]
win32/old/x86-mingw32-opensuse/crossconfig.sh [new file with mode: 0755]
win32/old/x86-mingw32-opensuse/install.sh [new file with mode: 0755]
win32/old/x86-mingw32-opensuse/packages.list [new file with mode: 0644]
win32/x86-mingw32-opensuse/crossconfig.sh [deleted file]
win32/x86-mingw32-opensuse/install.sh [deleted file]
win32/x86-mingw32-opensuse/packages.list [deleted file]
wscript [deleted file]

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4031d56
--- /dev/null
@@ -0,0 +1,299 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.6)
+# Work-around a bug in the included FindGettext fixed with 2.8.8
+# See http://www.cmake.org/pipermail/cmake-commits/2012-February/012117.html
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
+    cmake_policy(SET CMP0002 OLD)
+endif ()
+project(midori C)
+add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"")
+add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"")
+
+set(VERSION 0.5.10)
+add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"")
+string(REPLACE "." ";" VERSION_LIST ${VERSION})
+LIST(GET VERSION_LIST 0 MIDORI_MAJOR_VERSION)
+add_definitions("-DMIDORI_MAJOR_VERSION=${MIDORI_MAJOR_VERSION}")
+LIST(GET VERSION_LIST 1 MIDORI_MINOR_VERSION)
+add_definitions("-DMIDORI_MINOR_VERSION=${MIDORI_MINOR_VERSION}")
+LIST(GET VERSION_LIST 2 MIDORI_MICRO_VERSION)
+add_definitions("-DMIDORI_MICRO_VERSION=${MIDORI_MICRO_VERSION}")
+
+execute_process(COMMAND "bzr" "revno"
+                OUTPUT_VARIABLE REVISION
+                ERROR_QUIET
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (REVISION)
+    set(VERSION "${VERSION}~r${REVISION}")
+    # All warnings are errors in development builds
+    set(VALAFLAGS ${VALAFLAGS} --fatal-warnings)
+    set(CFLAGS "${CFLAGS}")
+endif ()
+add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+# Disallow building during install to avoid permission problems
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
+
+find_package(Vala REQUIRED)
+vala_require("0.16.0")
+set(VALAFLAGS ${VALAFLAGS}
+    --enable-deprecated
+    --debug
+    )
+
+include(GNUInstallDirs)
+set(DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
+add_definitions("-DMDATADIR=\"${DATADIR}\"")
+add_definitions("-DSYSCONFDIR=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}\"")
+add_definitions("-DLIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\"")
+add_definitions("-DDOCDIR=\"${CMAKE_INSTALL_FULL_DOCDIR}\"")
+
+add_definitions("-DENABLE_NLS=1")
+add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\"")
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "/* # generated file (stub) */")
+add_definitions("-DHAVE_CONFIG_H=1")
+
+find_file (UNISTD unistd.h)
+if (UNISTD)
+    add_definitions("-DHAVE_UNISTD_H")
+endif ()
+
+if (UNIX)
+    find_file (SIGNAL signal.h)
+    if (SIGNAL)
+        add_definitions("-DHAVE_SIGNAL_H")
+    endif ()
+endif ()
+
+find_library (X11 X11)
+if (X11)
+    # Pass /usr/X11R6/include for OpenBSD
+    find_file (SCRNSAVER X11/extensions/scrnsaver.h /usr/X11R6/include)
+    find_library (XSS Xss /usr/lib/X11R6/lib)
+    if (SCRNSAVER AND XSS)
+        add_definitions("-DHAVE_X11_EXTENSIONS_SCRNSAVER_H")
+        set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11}")
+    endif ()
+endif ()
+
+if (WIN32)
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_WIN32)
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_FREEBSD)
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_DRAGONFLY)
+    set(DFLY 1)
+endif ()
+
+if (APPLE)
+    add_definitions("-DHAVE_OSX=1")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_OSX)
+else ()
+    add_definitions("-DHAVE_OSX=0")
+endif ()
+
+# Check if execinfo.h header exists
+string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+if (${BEGIN} GREATER 0)
+    string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+else()
+    set(BSD 0)
+endif()
+if (UNIX AND NOT BSD AND NOT DFLY)
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_EXECINFO_H)
+endif ()
+
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED
+                  libxml-2.0>=2.6
+                  sqlite3>=3.6.19
+                  gmodule-2.0
+                  gio-2.0>=2.32.3
+                  libsoup-gnome-2.4>=2.27.90
+                  )
+add_definitions("-DHAVE_LIBXML")
+add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
+add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
+set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.29.91")
+    add_definitions("-DHAVE_LIBSOUP_2_29_91")
+endif ()
+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
+    add_definitions("-DHAVE_LIBSOUP_2_34_0")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_34_0)
+endif ()
+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.37.1")
+    add_definitions("-DHAVE_LIBSOUP_2_37_1")
+endif ()
+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
+    # valac 0.16 didn't have the bindings yet
+    # For consistency we need to ensure C code makes the same assumptions
+    if (${VALA_VERSION} VERSION_GREATER "0.17.0")
+        add_definitions("-DHAVE_LIBSOUP_2_40_0")
+        set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
+    endif ()
+endif ()
+
+if (${DEPS_gio-2.0_VERSION} VERSION_GREATER "2.40.0" OR WIN32)
+    add_definitions("-DLIBNOTIFY_VERSION=\"No\"")
+else ()
+    pkg_check_modules(NOTIFY REQUIRED libnotify)
+    add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"")
+    add_definitions("-DHAVE_LIBNOTIFY")
+    set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}")
+    set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}")
+    set(PKGS ${PKGS} libnotify)
+endif ()
+
+option(USE_GTK3 "Use GTK+3" OFF)
+option(HALF_BRO_INCOM_WEBKIT2 "Serve as a guniea pig" OFF)
+option(USE_ZEITGEIST "Zeitgeist history integration" ON)
+option(USE_GRANITE "Fancy notebook and pop-overs" OFF)
+option(USE_APIDOCS "API documentation" OFF)
+option(USE_GIR "Generate GObject Introspection bindings" OFF)
+option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
+
+# GTK+3 is implied here, whether set or not
+if (USE_GRANITE OR HALF_BRO_INCOM_WEBKIT2)
+    set(USE_GTK3 ON)
+endif ()
+
+if (USE_GRANITE)
+    pkg_check_modules(GRANITE granite>=0.2)
+    set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${GRANITE_INCLUDE_DIRS}")
+    set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${GRANITE_LIBRARIES}")
+    add_definitions("-DHAVE_GRANITE")
+    add_definitions("-DGRANITE_VERSION=\"${GRANITE_VERSION}\"")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_GRANITE)
+    set(PKGS ${PKGS} granite)
+else ()
+    add_definitions("-DGRANITE_VERSION=\"No\"")
+endif()
+
+if (USE_ZEITGEIST)
+    pkg_check_modules(ZEITGEIST zeitgeist-1.0>=0.3.14)
+    set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${ZEITGEIST_INCLUDE_DIRS}")
+    set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${ZEITGEIST_LIBRARIES}")
+    add_definitions("-DHAVE_ZEITGEIST")
+    set(PKGS ${PKGS} zeitgeist-1.0)
+endif()
+
+if (WIN32)
+    add_definitions("-DGCR_VERSION=\"No\"")
+elseif (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
+    if (USE_GTK3)
+        pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
+    else ()
+        pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
+    endif ()
+    add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
+    add_definitions("-DHAVE_GCR")
+    set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
+    set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
+else ()
+    add_definitions("-DGCR_VERSION=\"No\"")
+endif ()
+
+if (HALF_BRO_INCOM_WEBKIT2)
+    # Note: WebKitGTK+ 2.0.0 matches 1.11.91; 1.11.92 > 2.0.0
+    pkg_check_modules(DEPS_GTK REQUIRED
+                      gtk+-3.0>=3.0.0
+                      webkit2gtk-3.0>=1.11.91
+                      javascriptcoregtk-3.0
+                      )
+    add_definitions("-DHAVE_WEBKIT2")
+    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
+    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit2gtk-3.0_VERSION}\"")
+    set(PKGS ${PKGS} gtk+-3.0)
+    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-3.0.vapi")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2)
+    if (${DEPS_GTK_webkit2gtk-3.0_VERSION} VERSION_GREATER "2.3.90")
+        set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2_3_91)
+    endif ()
+elseif (USE_GTK3)
+    pkg_check_modules(DEPS_GTK REQUIRED
+                      gtk+-3.0>=3.0.0
+                      webkitgtk-3.0>=1.8.1
+                      javascriptcoregtk-3.0
+                      )
+    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
+    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"")
+    set(PKGS ${PKGS} gtk+-3.0)
+    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
+else ()
+    pkg_check_modules(DEPS_GTK REQUIRED
+                      gtk+-2.0>=2.24.0
+                      webkit-1.0>=1.8.1
+                      javascriptcoregtk-1.0
+                      )
+    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-2.0_VERSION}\"")
+    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit-1.0_VERSION}\"")
+    set(PKGS ${PKGS} gtk+-2.0)
+    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
+endif ()
+set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/katze/katze.vapi")
+
+# dh_translations detects this if there's no variable used
+set (GETTEXT_PACKAGE "midori")
+add_definitions("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
+
+set(CFLAGS "${CFLAGS} -Wall -Wundef -Wno-deprecated-declarations -g")
+
+if (EXTRA_WARNINGS)
+    LIST(APPEND EXTRA_CFLAGS_LIST
+        -Wextra
+        -Wno-unused-parameter
+        -Wno-missing-field-initializers
+        -Wno-comment
+        -Waggregate-return
+        -Wredundant-decls
+        -Wshadow -Wpointer-arith -Wcast-align
+        -Winline -Wformat-security -fno-common
+        -Winit-self -Wundef
+        -Wnested-externs
+    )
+    string(REPLACE ";" " " EXTRA_CFLAGS "${EXTRA_CFLAGS_LIST}")
+    set(CFLAGS "${CFLAGS} ${EXTRA_CFLAGS}")
+else ()
+    if (REVISION)
+        set(CFLAGS "${CFLAGS} -Werror")
+    endif()
+endif ()
+
+# Explicitly add -fPIC for older toolchains
+set(VALA_CFLAGS "-w -g -fPIC")
+
+set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
+
+# CMake provides no uninstall target by design
+add_custom_target (uninstall
+    COMMAND "xargs" "rm" "-v" "<" "install_manifest.txt")
+
+install(FILES AUTHORS COPYING ChangeLog EXPAT README DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+add_subdirectory (midori)
+add_subdirectory (extensions)
+enable_testing()
+add_subdirectory (tests)
+add_subdirectory (po)
+add_subdirectory (icons)
+add_subdirectory (data)
+add_subdirectory (config)
+
+if (USE_APIDOCS)
+    add_subdirectory (docs/api)
+endif ()
+if (USE_GIR)
+    add_subdirectory (gir)
+endif ()
index 7e2a94f06521c4a85945b61da66dbe858511cc37..64b03179d3faa376fc75a6ff9a783d9b1ae5f510 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,362 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.5.10
+ use exit instead of return in license script
+ Fix HAVE_GCR guards after GtkPopover port
+ Remove example app and .desktop before creating it in the unit test
+ Fix cache dir path in Adblock and always mkdir tmp
+ Port location action from Granite.PopOver to Gtk.Popover
+ Match https site when user-style is using domain syntax
+ Always disable developer tools on Win32
+ Reimplement Midori.URI.unescape and add various tests
+ Make the inspector resizable with GTK3 by packing into a GtkScrolledWindow
+ Don't build tabs2one in release builds
+ Don't assume GNotification works on Win32
+ update copyright date in About dialog
+ Don't entity-escape history and bookmark results in location completion
+ Only set tabs' error state if errors come from the main frame
+ Implement Paste and Proceed as an action
+ No Gcr on Win for the moment
+ Yet another Speed Dial CSS update:
+ Port bookmark popover from Granite to Gtk.Popover
+ Make application choosers resizable with a sane default size
+ Use GNotification >= 2.40 and use Midori.App API in webmedia
+ Rework mouse button handling in KatzeArrayAction
+ Don't bind :day in HistoryDatabase.query
+ Make GCR mandatory for all builds
+ Update coub support in mediaHerald
+ history-list: Fix gtk+3 build caused by dropping "using Gtk;"
+ Drop all remaining usages of "using *;"
+ Don't open search engines menu when clearing search action
+ Only remove apps in the sidepanel when left-clicking the delete icon
+ Improve robustness of GTK3-compatibility placeholder text fallback
+ Clean up vapi dependency
+ tls_flags from webkit_web_view_get_tls_info need to be 0
+ Don't add failed pages to history
+ Throw error for wrong paramter in Statement.bind
+ Replace NoJS "allow all pages" setting with "allow local pages"
+ Avoid bugs due to race condition in addons delete dialog
+ Calculate transfer progress at regular intervals to fix 0B/s bug and recalcitrant progess bars
+ Fix warnings occurring with EXTRA_WARNINGS
+ Escape parentheses in adblock_fixup_regexp()
+ Use File.query_exist() on win32 when checking for db to attach
+ Handle _NEW_WINDOW_ACTION explicitly to make _blank targets work
+ Fix undefined behavior uint in mouse gestures
+ fix JavaScript keyup event by calling inherited key-release-event handler in MidoriBrowser
+ Inline renaming of speed dials
+ Handle current_size and last_size of Download being equal
+ Add proper copyright headers to element_hider and autosuggestcontrol
+ Add X-GNOME-UsesNotifications to indicate the use of notifications
+ Fix typo in Bookmarks menu UI definition
+
+v0.5.9
+ Remove dead code from browser and preferences
+ Build-fix: Make PanedAction's Child.widget public
+ fixes tab history undo
+ Set a placeholder text on the URL entry
+ Add "Add Bookmark" to menu
+ Show search menu upon left icon click in location bar
+ Fix crash when saving with associated resources
+ Fix webkit2 downloads based on older branch
+ don't hide window decorations for Midori-Granite
+ Connect bookmarks-db singleton correctly to fix menus
+ Fix some symbol names and transfer annotations in doc comments
+ Use correct signature for window-state-event handler
+ Do not overescape page titles in view completion
+ Make adblock skip non-standard last update metadata strings
+ Drop deprecated Granite LightWindow used for the Clear Private Data dialog
+ Keep storing the last web media tab played.
+ Allocate CookiePermissionManagerModalInfobar correctly
+ Make middle clicking reload button duplicate the current tab, similar to other browsers
+ Use network-changed of GNetworkMonitor to reload all tabs if network becomes available
+ Show different messages based on network connectivity.
+ Fix crash when activating the edit menu
+ Fix "open all in tabs" for bookmarks
+ Fix a few simple leaks
+ Don't focus the locationaction when leaving blank pages
+ Fix leaks of two references to the MidoriApp in Tabby
+ Compile with valac 0.16 again
+ Never display about:new in the urlbar
+ fix crash right-clicking forms on local pages
+ Share 'youtube, vimeo, dailymotion' that you are playing in Midori using org.midori.mediaHerald
+ Give the SoupURI a path when checking cookie relevance
+ Resolve ellipsis and title stripping in completion
+ Add www. and .com/.country_domain and proceed with Ctrl+Enter/Shift+Enter with (readable code)
+ Clean up browser tab/ uri/ title notify
+ Drop pseudo Granite distinction in completion layout
+ Fix visibility of SpeedDial, Toolbar, Bookmarkbar context menu items
+ Distinguish between desc file missing and other parsing issues
+ Use dependencies to clear test folders before execution
+ win32: Drop dropbox usage from win release script, rename resulting output files
+
+v0.5.8
+ Use png icon instead of svg in set_status
+ We must not pass a Cancellable to FaviconDatabase.get_favicon_pixbuf
+ Retain spelling suggestion menu items from WebKit
+ Properly guard usage of gtk3 get_style_context
+ Mimic the look of Granite.DynamicNotebook when compiled with --enable-granite.
+ Fix X11 lib underlink in midori-core
+ Fix bookmarkbar bookmark click not opening links
+ Use sanitized app URI as wm_classname/ StartupWMClass
+ Make trunk build with WebKit2 again
+ Fix for incorrect tstamp for background tabs
+ Don't declare sorting doubles are nullable and print values when database tracing is enabled
+ Correctly apply saved entry state and treat urlbar as a regular editable item
+ Add missing conditional includes for granite flavoured build
+ Open URIs dragged on tab label or new tab button
+ Small adblock bugfixes
+ Work around GTK3's hard-coded minimum stackswitcher button width
+ Fix building with mingw packages from fedora 18
+ Set page title as basis for print filename
+ Rename notes inline
+ Use EXTRA_WARNINGS option when building for windows
+ Drop forgotten clutter init and obsolete header declarations
+ Rework history-step handling and make it work again
+ Port Tabby to DatabaseStatement API
+ Replace bookmark stracing with generic profiling in Midori.Database
+ Port autocompleter test to async job
+ Finishing touches for Adblock
+ Add filters and defaults
+ Implement and use ContextAction.escaped
+ printf URI in show_message_dialog for download error
+ Improve docs and GIR annotations for KatzeItem, KatzeArray, and MidoriWebSettings
+ Drop redundant TabNew from compact menu and put button in Tab Panel
+ Fix loading file:// pages
+ Implement Send Page Link by Email
+ Use GtkStackSwitcher with GTK+ >= 3.10
+ Implements context popup menu on menu entries of bookmark bar and bookmark menu.
+ Fix building with newer mingw versions
+ Display locationbar suggestions in the correct order
+ Don't bother adblocking internal pages and favicons
+ Don't use trailing comma on last list element in Adblock tests
+ Rewrite Adblock more modularly, add Whitelist support
+ Add support of DragonFlyBSD
+ Change tooltips of Reload and ReloadStop actions while shift modifier is pressed
+ Implement Midori.Database.attach method
+ Allow :memory: as folder to make schema detection work
+ More robust app/ profile creation
+ Add helper callbacks to modify bookmark's tree store with unneded access to bookmarks db
+ Implement more flexible fallback behavior for Cookie Permissions
+
+v0.5.7:
+ Modify actions and internal items in browser without changing settings
+ Delay tab loading after Midori crashed
+ Uncomment failing assertions about view_source in tab test
+ Fallback to about:home if startup is anything but blank
+ Don't try to create formhistory database if config_dir is NULL
+ Handle url arguments for blank sessions
+ Execute commands given at start time
+ Introduce high-level prepare/ DatabaseStatement API
+ Drop unused GraniteClutter-based animation support
+ Drop uncommented contractor support
+ Drop deprecated StaticNotebook used in KatzePreferences
+ Introduce notebook class converging separate implementations
+ Work around symbol relocation issue old version of gcc present on Ubuntu LTS
+ NULL-check treeview in midori_search_action_get_editor
+ Adjust CMakeList .ico check to not skip nojs icons
+ Enable sidepanel in private mode
+ Move Preferences menu entry above About
+ Set minimum value of 0 on spin button for maximum cache size
+ Give NextForward its own label for toolbar editor
+ Correctly disable favicon database in app and private mode
+ Change preferences to refer to proxy address as a "URI" (not "hostname")
+ Add close tabs to right feature
+ Allow printing without confirmation dialog on kiosk setups
+
+v0.5.6:
+ instead of creating devpet status icon on extension load, create it only to show new messages
+ Open speed dial or homepage according to preference
+ handle tab duplication
+ Add copyright note to appdata file
+ Tweak searching for resources when running from build folder
+ Swap NULL-check with main frame check
+ Use correct signal when clearing the trash
+ Hide WEbGL preference if it is unavailable
+ Remove stored popup sessions from the database
+ Check all browsers for opened sessions and whether they're popups
+ removed unused preference dialog and related code
+ Fix check for found valac and mention VALAC variable
+ Fix autoscrolling if page contains a frame with our custom error page
+ Don't use context-menu signal in WebKitGTK+ < 1.10.0
+ Fix building on Ubuntu 12.04
+ Reset item ids when re-importing bookmarks
+ Check path being NULL in export before trying to inspect it
+ restore the last closed sessions if no session is opened
+ Cast WebKitDOMHtmlElement for getting source content
+ Use font-set signal and font family for GTK+ 3.2 font chooser
+ add function to view dom source
+ remove unused variable
+ Resolve compiler warnings in current trunk
+ Update win32-release script for cmake, move unused docs/scripts to old folder
+ Try to handle previous runs of cmake in configure wrapper
+ Correct view source assertions in tab unit test
+ Build fix: found undeclared in midori_bookmarks_db_remove_item_recursive
+ Cache bookmark items to avoid their recreation on database reads
+ allow "view source" on about pages
+ Enable old target policy on cmake < 2.8.8
+ Re-arrange data file installing to be more explicit
+ option to modify the number of tabs which will be restored in each idle callback
+ Implement MidoriBookmarksDatabase class by inheritence from MidoriDatabase
+ Ensure tab spinners update as often as the menubar spinner to avoid desync
+ Use tabby sorting increment when importing session.xbel tabs
+ Only install config files to /etc if prefix equals /usr
+ handle urls as argument when starting midori
+ Make tabby compile with Webkit2
+ Drop waf build system and provide cmake-based "configure" script
+ midori_panel_action_activate_cb forgot to update the action group
+ Fixes bug where certificate Security overlay failed to close
+ handle tab movement
+ add tab sorting
+ Untangle implicit GTK+3 for Granite and WebKit2
+ Allow running test under debug tools with cmake
+ Install config files to /etc when install prefix is /usr
+ Add missing PO_FILES argument to GETTEXT_PROCESS_PO_FILES
+ Add USE_APIDOCS to build API docs with CMake
+ Rasterize SVG to PNG with rsvg-convert
+ fix bookmarks test regression after fix-1179200-4
+ Add CMakeLists.txt for config directory
+ Install mo files in locale dir
+ don't change uri/title if the tab isn't loaded
+ use a separate signal to store the tab title
+ Check if execinfo.h header exists on BSD
+ fix endless loop in Midori.Database.init
+ Use destructive-action style class in ClearPrivateData
+ Initialize priv->element to avoid crash when freeing
+ Introduces KatzeArray::update-item to handle metadata changes
+ Refactor excuting schema from file into a function
+ Use stock as string in liststore
+ Drop needless (and wrong) HAVE_LIBNOTIFY in preferences
+ Flip horizontal position of the overlay when hit by the mouse
+ Add Midori.URI.get_base_domain and use it in NoJS
+ Introduce Midori.Database and use for history and tabby
+ ctrl+shift+w should trigger a delete-event
+ Implement dialog windows opened via javascript
+ Make get_res_filename work with different hierarchies
+ fix check for new database
+ Speed up session import
+ Import tab title from old sessions
+ Separate CFLAGS for C and add missing HAVE_
+ Install top-level text files and FAQ html/ css to doc dir
+ Provide and install .appdata.xml file for app stores
+ Move bookmarks db handling to midori-bookmarks-db
+ Add XSS to OPTS_LIBRARIES
+ Update condition for UBUNTU_MENUPROXY to work on Saucy
+ Introduce tabby, the new session manager
+ Fix typo in katze_item_set_meta_integer call
+ Allow bookmark bar update on additions resulting from imports
+ Re-work midori_array_query_recursive to not include folder items twice
+ Fix syntax of icon sizes passed to foreach
+ Add bzr revision number to version if available
+ Unify nojs and cookie policy dialogs, make policy changeable within the list
+ Drop all G_ENABLE_DEBUG guards
+ Add -g to CFLAGS to enable debugging symbols
+ Adjust cmake build for Win32
+ Implement CMake build setup
+ Port MidoriApp from Unique/ sockets to GApplication
+ New signal about-content to provide content for about uris
+ Check if browser is NULL in midori_view_get_tab_menu to prevent a crash. Fixes bug #1215652.
+ Ensure proxy setting widgets callbacks don't outlive the widgets themselves
+ Fix webkit2 build error
+ Show the bookmarks import location combobox.
+ Rename internal completion URLs to avoid confusion
+
+v0.5.5:
+ Fix name and text fields inversion in XBEL folder import
+ Correct packing of cookie and nojs permission dialog.
+ Don't set tab title/special when a non-main frame displays an error
+ Revise "cookies" debug output, merge expiry check and disallow revival of old cookies
+ Drop now unused cgit module.xml file
+ Use SoupProxyResolverGnome unconditionally and disable prefetching if proxy is active
+ win32: Hide gui for profiles in webapp manager, as they are currently broken on Windows
+ win32: support additional mouse buttons for going back/forward in history
+ Enrich app error messages with filenames
+ Fix segfault if url contains " %00"
+ Replace 'Run as app' in bookmark dialog with 'Create launcher'
+ Split config files and install from folders recursively
+ Implement GTK+ theme switching via Preferences (Win32)
+ Enable set_disk_cache_directory with WebKit2
+ Introduce Midori.ContextAction and refactor page menu from scratch
+ Define large dialog icon size relative to dialog icon size
+ Extension Devpet which shows error messages and backtraces in systray
+ WebKit2 cookie support
+ Check the hit test result for editable to see if , should search
+ Use SoupCookieJarSqlite and drop KatzeHttpCookies(Sqlite)
+ Show folder tree when editing bookmarks
+ Handle double value in _midori_browser_activate_action
+ Add privacy preferences in web app mode
+ Escape parentheses in adblock_fixup_regexp
+ Introduce object oriented API for access to History Database
+ Allow rss feeds with version 0.92
+ Rename History completion to Bookmarks and History
+ Don't show rss feed icon on twitter, underlying API was retired
+ Read apps/ profiles from folder, leave launchers separate
+ Fill in bookmark folder attributes in bookmarkbar populate
+
+v0.5.4:
+ Refactor history step and allow multiple title updates
+ Call midori_browser_connect_tab with correct type
+ Don't add HistoryCompletion if there's no history
+ Restore reload button icon in error pages
+ Don't insert folders into the log
+ If an url is specified the fallback url should not be loaded
+ Fixed crashes when closing a loading tab + granite's tab moving
+ Test if plugins are redundant instead of skipping them all
+ Avoid selecting bookmark uris that begin by 'javascript:' for completion
+ Set FOREIGN_KEYS pragma on db initialization
+ Implement a default zoom level preference
+ Fix tautological use of G_MAXINT with enum
+ Take current selection into account for bookmark folders when adding/editing bookmark
+ Improve error page visuals, show suggestions on network errors
+ Bump vala to 0.16.0
+ Downgrade glib requirement to 2.32.3 to re-enable building under Ubuntu 12.04 (LTS)
+ Bump glib2 version to 2.32.4
+ Improve and unify thumbnail generation
+ Omit speed dial and blank pages from view completion
+ Makes the elements of the speed dial non-selectable
+ Use NULL-safe comparison in katze_item_icon_loaded_cb
+ Drop non-DOM style sheet injection code path
+ Clean small leftovers from GTK and WebKit version bumps
+ Bump GTK+ requirement to 2.24 and drop support for earlier versions
+ Check for app mode to set browser icon instead of readonly
+ Escape square brackets in adblock_fixup_regexp
+ Fix showing (sub)folders in bookmarkbar
+ Bump WebKit requirement to 1.8.3 and drop support for earlier versions
+ Set menu on dynamic notebook tab
+ Do not run toolbar editor's GtkDialog in its own main loop by prevent calling gtk_dialog_run(). Instead just set the GtkDialog modal and show it.
+ Remove unnecesary harmful code from tab_switched_cb
+ Fix segfault when deleteing tabs with history list
+ Specify int64 id item as a string in bookmark remove/update queries
+ Distinguish between box and event box in the tab label when colouring tabs
+ Show visual feedback when hovering over items in bookmark panel
+ Replace INSTALL/ HACKING with exported Contribute wiki page
+ Delete tabs from history list with Del
+ Check brightness of backgroung color when deciding foreground color of given tab
+ Clean launcher filenames, double-click to open and delete button
+ Avoid declaring browser twice within the same function
+ Add ./waf --update-pot
+ Fix memory leak introduced in r6184
+ Use old function name g_dbus_generate_guid for old valac
+ Move Import and Export into menu Bookmarks
+ Collect multiple download notifications within a minute
+ Fix segfault when right clicking on a web view.
+ Make libnotify mandatory except on Windows
+ Remove the rather unnecessary ./waf --run feature
+ Send a notification after creating a launcher
+ Ambiguous 'Open as App' context menu item was removed
+ Apply label color to label rather than event box
+ Store data of app mode based on URL in ~/.local/share/midori/apps
+ Split colorful tabs code into helper functions and add unit tests
+ Fix History List memory leak  when closing Midori window.
+ Replace .gitignore with a .bzrignore
+ Always define GCR_VERSION in GTK+2 build
+ Fix bookmarks dialog rename regression introduced in r6167.
+ Drop check for gcr-3-gtk2 which isn't being maintained.
+ Scrap unneeded background variables in location renderer callbacks
+ Title case and proper packing in bookmark dialog
+ Delete PO files Launchpad spewed into root directory when it couldn't find po/*.pot file.
+ Issue a warning when trying to use MIDORI_DEBUG while running
+ Update dates to 2013 to fix bug #1167075.
+
 v0.5.2:
  Re-release with a proper version number and changelog
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
new file mode 100644 (file)
index 0000000..b1459a5
--- /dev/null
@@ -0,0 +1,27 @@
+# Based on "http://iany.me/wiki/Makefile/" by "Ian Yang" licensed under "CC by 3.0"
+
+BUILD_FOLDER := _build
+
+CUSTOM_TARGETS := cmake
+
+# Do not try to use custom target when invoking external makefile
+EXTERNAL_TARGETS := $(filter-out $(CUSTOM_TARGETS), $(MAKECMDGOALS))
+
+# Call all targets using `Makefile` in build directory in one `make` command.
+$(or $(lastword $(EXTERNAL_TARGETS)),all):
+       $(MAKE) -C $(BUILD_FOLDER) $(EXTERNAL_TARGETS)
+
+# If no targets are specified, use the dummy `all` target
+.PHONY: $(EXTERNAL_TARGETS) all
+
+# Do nothing for all targets but last. Also quiet the message "Noting to be done on xxx"
+$(filter-out $(lastword $(EXTERNAL_TARGETS)), $(EXTERNAL_TARGETS)):
+       @cd .
+
+cmake: $(BUILD_FOLDER)
+       cd $(BUILD_FOLDER) && cmake ..
+
+$(BUILD_FOLDER):
+       mkdir $(BUILD_FOLDER)
+
+.PHONY: cmake
diff --git a/HACKING b/HACKING
index 0a184795db2e41f5410080a25a193cb50d3eca0d..eafdcc365649269024ae97fd25aee5a5fe966bc9 100644 (file)
--- a/HACKING
+++ b/HACKING
-This file is licensed under the terms of the expat license, see the file EXPAT.
+====== Midori - Contribute ======
 
-+ Hacking guide for Midori +
+**This document is licensed under the LGPL 2.1.**
 
-- How to contribute
-- Coding style
-- Source files in the project
-- Examplary source code
-
-+++ How to contribute +++
+====== Check out the sources ======
 
-There are several ways to contribute to the project:
-
-For translating, have a look at the file TRANSLATE.
-
-For helping with testing and triaging bug reports, you should register with the bug tracker at https://bugs.launchpad.net/midori and join #midori on irc.freenode.net where a lot of problems are discussed. You can start right away by trying to reproduce bug reports and comment with your findings.
-
-If you are interested in contributing code, there are a few options. You can join #midori to discuss a particular problem you would like to look into, or a feature you would want to implement. Opening a bug report or feature request if there isn't already one is the next step. To attract some attention, if you attached a patch or have questions, ask in #midori.
-
-+++ Coding style +++
-
-Indentation is 4 spaces, no tabs, preferrably at 80 to 120 columns per line to
-avoid automated line-breaks. Trailing whitespace is not desirable.
-
-Declarations go to the beginning of a block, not inline. Variables of one plain
-type may be grouped in one declaration, pointer types may not be grouped. The
-asterisk goes next to the type.
-Variables should be ordered in the order they are used.
-
-Comments explain functionality, they should not state facts. The appropriate
-style is always C style /* */, not C++ style.
-
-Variable and function names should be animal, animal_shelter or animalsc in
-case it would otherwise be very long. Loop counters may be single letters.
-Type names should be Animal, AnimalShelter or AnimalSC. No prefixes from third
-party projects should be used, such as GTK or WebKit, while underlines may be
-used but do not have a particular meaning.
-
-There is a space between functions or keywords and round brackets, and curly
-brackets always go on separate lines, at the indentation level of the
-function, conditional or loop expression. Curly brackets are left out for single
-statement conditionals and loops unless they notably help readability.
-The type of a function goes on a separate line before the function.
-Preprocessor instructions are indented with the code they relate to.
-
-Code history is precious, so one should avoid renaming a lot of functions at
-once or moving whole paragraphs only to add or remove a level of indentation.
-Moving blocks of code around is also undesriable because it makes patches less
-readable since the result looks like new code.
-
-
-+++ Source files in the project +++
-
-Core:
-    Files prefixed with "midori-" in the folder "midori" make up the core. They
-    are essential to running the browser and mostly tailored to the browser.
-    All header files prefixed with "midori-" are considered supported API and
-    can be used to implement extensions.
-    "sokoke" is a collection of very specialized helper functions which change
-    from time to time as needed. In the past some of the code was moved to
-    "katze" when it was considered generally useful.
-    "socket" is a socket implementation with no dependency on other parts of
-    the core, which is used if Midori is built without an external single
-    instance support library.
-Panels:
-    Files in the "panels" folder are classes that implement MidoriViewable and
-    which are loaded into the MidoriPanel at startup. These panels are in
-    principle optional.
-Katze:
-    Re-usable classes and utility functions that don't depend on the core and
-    some of that code indeed found its way into other projects.
-Extensions:
-    These are extensions, written in C, which are loaded optionally if the user
-    so chooses. Extensions can use API from "midori-" and "katze-" headers. Each
-    module consists of either a single .c file or a folder with .c files.
-Tests:
-    Unit tests are run regularly to verify possible regressions or measure
-    performance of implementations. Except for select cases code changes should
-    not cause failure of unit tests.
-
-
-+++ Examplary source code +++
-
-    /*
-       Copyright
-       LICENSE TEXT
-    */
-
-    #include "foo.h"
-
-    #include "bar.h"
-
-    #include <glib.h>
-
-    void
-    foobar (FooEnum bar, const gchar* foo)
-    {
-        gint n, i;
-
-        if (!foo)
-            return;
-
-        #ifdef BAR_STRICT
-        if (bar == FOO_N)
-        {
-            g_print ("illegal value for 'bar'.\n");
-            return;
-        }
-        #endif
-
-        /* this is an example */
-        switch (bar)
-        {
-        case FOO_FOO:
-            n = bar + 1;
-            break;
-        case FOO_BAR:
-            n = bar + 10;
-            break;
-        default:
-            n = 1;
-        }
-
-        for (i = 0; i < n; i++)
-        {
-            g_print ("%s\n", foo);
-        }
-    }
-
-Header file example:
-
-    /*
-       Copyright
-       LICENSE TEXT
-    */
-
-    #ifndef __FOO_H__
-    #define __FOO_H__ 1
-
-    #ifdef HAVE_BAR_H
-        #define BAR_STRICT
-    #endif
-
-    /* Types */
-
-    typedef enum
-    {
-        FOO_FOO,
-        FOO_BAR,
-        FOO_N
-    } FooEnum;
-
-    typedef struct
-    {
-        FooEnum foo_bar;
-    } FooStruct;
-
-    /* Declarations */
-
-    void
-    foo_bar           (FooEnum      bar,
-                       const gchar* foo);
-
-    const gchar*
-    foo_foo           (FooStruct foo_struct,
-                       guint     number,
-                       gboolean  flag);
-
-    #endif /* !__FOO_H__ */
+bzr branch lp:midori
+
+The development **trunk** (master, tip) is the latest iteration of the next release. Browse it online and look for other branches at http://code.launchpad.net/midori or http://bazaar.launchpad.net/~midori/midori/trunk/tarball download a tarball of the latest revision.
+
+//The code used to be hosted in git.xfce.org/apps/midori.//
+
+Keep your copy updated:
+
+bzr merge --pull
+====== Join IRC chat rooms ======
+
+Join irc://irc.freenode.net/midori #midori on Freenode https://kiwiirc.com/client/irc.freenode.net/midori or use webchat to talk about Midori, discuss bugs and new ideas.
+====== Contribute other than touching code ======
+
+  * http://bugs.launchpad.net/midori Go through problem reports and check Unconfirmed bugs or those lacking information and mark any duplicates you spot
+  * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support
+  * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language
+  * https://github.com/eustasy/midori-browser.org/issues Report website bugs
+  * Write http://wiki.xfce.org/midori/tutorial your own extension - granted that's code, too, but maybe a little easier than hacking the core.
+
+====== Documentation resources ======
+
+  * https://wiki.gnome.org/Projects/Vala/Tutorial Vala Tutorial
+  * http://midori-browser.org/docs/api/vala/midori/ Midori Vala Docs
+  * http://midori-browser.org/docs/api/c/html/ Midori C Docs
+
+====== Build the code ======
+
+mkdir _build
+cd _build
+cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+make
+sudo make install
+
+//Advanced Tip: Pass "-G Ninja" to cmake to use http://martine.github.io/ninja/ Ninja instead of make (usually packaged as ninja or ninja-build).//
+
+If using GTK+3 you'll want to add -DUSE_GTK3=1 to the cmake command line.
+
+You can build Midori using another C Compiler for example Clang. Just
+add -DCMAKE_C_COMPILER=/path/to/compiler to the cmake arguments.
+Then you can build following your normal procedure. Like this:
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_COMPILER=/usr/bin/clang ..
+make
+
+Midori can be **run without being installed**.
+
+_build/midori/midori
+
+You can use a **temporary folder for testing** without affecting normal settings
+
+_build/midori/midori -c /tmp/midoridev
+
+You'll want to **unit test** the code if you're testing a new version or contributed your own changes:
+
+xvfb-run make check
+
+Automated daily builds in Launchpad (https://launchpad.net/~elementary-os/+archive/daily ppa:elementary-os/daily and https://launchpad.net/~midori/+archive/midori-dev ppa:midori/midori-dev) run these tests as well.
+====== Debugging issues ======
+
+Testing an installed release may reveal crashers or memory corruption which require investigating from a local build and obtaining a stacktrace (backtrace, crash log).
+
+_build/midori/midori -g [OPTIONAL ARGUMENTS]
+
+If the problem is a warning, not a crash GLib has a handy feature
+
+env G_DEBUG=all _build/midori/midori -g
+
+For more specific debugging output, depending on the feature in question you may use
+
+env MIDORI_DEBUG=help _build/midori/midori
+
+Whilst -g is convenient you may want to use proper gdb:
+
+gdb
+file _build/midori/midori
+run
+…
+bt
+
+On Windows you can open the folder where Midori is installed and double-click gdb.exe. A black command line window should appear.
+
+file midori.exe
+run
+…
+bt
+
+To verify a regression you might need to revert a particular change:
+
+
+# Revert only r6304
+bzr merge . -r 6304..6303
+
+====== Coding style and quality ======
+
+Midori code should in general have:
+
+  * 4 space indentation, no tabs
+  * Between 80 to 120 columns
+  * Prefer /* */ style comments
+  * Call variables //animal// and //animal_shelter// instead of <del>camelCase</del>
+  * Keep a space between functions/ keywords and round parentheses
+
+For Vala:
+
+  * Prefer //new Gtk.Widget ()// over //using Gtk; new Widget ()//
+  * Stick to standard Vala-style curly parentheses on the same line
+  * Cuddled //} else {// and //} catch (Error error) {//
+
+For C:
+
+  * Always keep { and } on their own line
+
+//Extensions may historically diverge from the standard styling on a case-by-case basis//
+
+====== Committing code ======
+
+Tell Bazaar your name if you haven't yet
+    bzr whoami "Real Name <email@address>"
+
+See what you did so far
+    bzr diff
+
+Get an overview of changed and new files
+    bzr status
+
+Add new files, move/ rename or delete
+    bzr add FILENAME
+    bzr mv OLDFILE NEWFILE
+    bzr rm FILENAME
+
+Commit all current changes - Bazaar automatically picks up edited files. //If you're used to git, think of an implicit staging area.//
+    bzr commit -p
+
+If you have one or more related bug reports you should pass them as arguments. Once these commits are merged the bug will automatically be closed and the commit log shows clickable links to the reports.
+    bzr commit -p --fixes=lp:1111999
+
+If you've done several commits
+    bzr log | less
+    bzr log -p | less
+
+In the case you committed something wrong or want to ammend it:
+    bzr uncommit
+
+If you end up with unrelated debugging code or other patches in the current changes, it's sometimes handy to temporarily clean up. //This may be seen as bzr's version of git stash.//
+    bzr shelve
+    bzr commit -p
+    bzr unshelve
+
+Remember to keep your branch updated:
+    bzr merge --pull
+
+As a general rule of thumb, ''bzr help COMMAND'' gives you an explanation of any command and ''bzr help commands'' lists all available commands.
+
+//If you're a die-hard git user, http://zyga.github.io/git-lp/ checkout git-lp to use git commands with the Bazaar repository.//
+====== Push proposed changes ======
+
+If you haven't yet, https://launchpad.net/~/+editsshkeys check that Launchpad has your SSH key - you can create an SSH key with **Passwords and Keys** aka **Seahorse** or ''ssh-keygen -t rsa'' - and use ''bzr launchpad-login'' to make youself known to bzr locally.
+
+If you checked out trunk, and added your patch(es), just **push it under your username** in Launchpad and you can **propose it for merging into trunk**. This will automatically request a **review from other developers** who can then comment on it and provide feedback.
+
+bzr push --remember lp:~USERNAME/midori/fix-bug1120383 && bzr lp-propose-merge lp:midori
+
+lp-propose-merge command may not be working on some distributions like Arch or Fedora.
+In case you get error like //bzr: ERROR: Unable to import library "launchpadlib": No module named launchpadlib// just use Launchpad's Web UI to propose a merge.
+
+
+**What happens to all the branches?**
+
+Leave the branches alone, **approved branches are cleared automatically** by Launchpad.
+
+For larger feature branches, **use the team** in Launchpad to allow other developers to work on the code with you.
+
+bzr push --remember lp:~midori/midori/featuritis && bzr lp-propose-merge lp:midori
+
+What if I want to help out on an **existing merge request** that I can't push to?
+
+
+bzr branch ~OTHERPERSON/midori/fix-bug1120383
+cd fix-bug1120383
+# make commits
+bzr push lp:USERNAME~/midori/fix-bug1120383
+bzr lp-propose-merge ~OTHERPERSON/midori/fix-bug1120383
+
+
+Updating a branch that may be out of sync with trunk:
+
+
+bzr pull
+bzr: ERROR: These branches have diverged
+bzr merge lp:midori
+# Hand-edit conflicting changes
+bzr resolve FILENAME
+# If any conflicts remain continue fixing
+bzr commit -m 'Merge lp:midori'
+
+
+Save a little bandwidth, **branch from an existing local copy** that you keep around:
+
+
+bzr branch lp:midori midori
+bzr branch midori midori.fix-bug1120383
+cd midori.fix-bug1120383
+bzr pull lp:midori
+
+
+====== Backwards compatibility ======
+As of Midori 0.5.4 the formula is:
+  * Required dependencies need to be available on the previous stable https://apps.fedoraproject.org/packages/s/webkit Fedora and http://packages.ubuntu.com/search?suite=quantal&keywords=webkit&searchon=names Ubuntu
+  * For reference http://openports.se/www/webkit OpenBSD
+  * Windows XP through 8 are to date ABI compatible, all dependencies are included
+
+^ package ^ F17 (2012-05-29) ^ U 12.10 (2012-10-18) ^
+| glib2 | 2.32.4 | 2.34.0 |
+| vala | 0.16.1 | 0.16 |
+| gtk3 | 3.4.4 | 3.6.0 |
+| gtk2 | 2.24.13 | 2.24.13 |
+| soup | 2.38.1 | 2.40 |
+| webkit | 1.8.3-1.fc17 | 1.10.0-0ubuntu1 |
+====== Midori with(out) Granite ======
+When built with Granite (-DUSE_GRANITE=1 or --enable-granite) there're a few key differences:
+  * Preferences uses a http://valadoc.elementaryos.org/Granite/Granite.Widgets.StaticNotebook.html Granite.Widgets.StaticNotebook
+  * URL completion styling is slightly different
+  * Clear Private Data uses **Granite.Widgets.LightWindow**
+  * Edit Bookmark and Security Details use http://valadoc.elementaryos.org/Granite/Granite.Widgets.PopOver.html Granite.Widgets.PopOver instead of Gtk.Window
+
+====== Midori for Windows ======
+
+===== For Linux developers =====
+==== Dependencies ====
+Midori for Windows is compiled on a Linux host and MinGW stack. For the current build Fedora 18 packages are used. Packages needed are listed below:
+
+yum install gcc vala intltool
+
+For a native build
+yum install libsoup-devel webkitgtk3-devel sqlite-devel
+
+For cross-compilation
+yum install mingw{32,64}-webkitgtk3 mingw{32,64}-glib-networking mingw{32,64}-gdb mingw{32,64}-gstreamer-plugins-good
+
+Packages needed when assembling the archive
+ yum install faenza-icon-theme p7zip mingw32-nsis greybird-gtk3-theme
+
+Installing those should get you the packages needed to successfully build and develop Midori for Win32.
+==== Building ====
+For 32-bit builds:
+
+mkdir _mingw32
+cd _mingw32
+mingw32-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0
+make
+sudo make install
+
+For 64-bit builds:
+
+mkdir _mingw64
+cd _mingw64
+mingw64-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0
+make
+sudo make install
+
+Once built and tested you can assemble the Midori archive with a helper script
+32-bit build:
+env MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw" ./win32/makedist/makedist.midori
+64-bit build:
+env MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw/" ./win32/makedist/makedist.midori x64
+===== Testing =====
+For testing your changes unfortuantely a real system is needed because Midori and WebKitGTK+ don't work properly under Wine. Even if it works some problems are not visible when using Wine, but are present when running under a real Windows system and vice versa.
+
+One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder.
+
+===== For Windows developers =====
+Rough list of prerequisites for building with MinGW on Windows
+
+If in doubt whether to get 32 or 64 bit versions use 32 bit ones, they are more 
+universal and tend to be less broken.
+
+
+==== MinGW compiler ====
+Compiler should match the one that was used to build packages ideally.
+
+  * We will user *mingw64 rubenvb* release
+  * Lastest stable release is gcc 4.8.0
+
+[[http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting
+%20Win64/Personal%20Builds/rubenvb/gcc-4.8-release/|Releases]]
+
+[[http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting
+%20Win64/Personal%20Builds/rubenvb/gcc-4.8-release/x86_64-w64-mingw32-gcc-4.8.0-
+win32_rubenvb.7z/download|Download]]
+
+
+==== 7zip ====
+We will need 7zip to extract various archives
+
+http://www.7-zip.org/download.html Homepage
+
+
+http://downloads.sourceforge.net/sevenzip/7z920.exe 32bit Installer
+
+
+==== Python3 (to extract rpms) ====
+We will need python3 to use download-mingw-rpm.py script. 
+If you don't plan to use it you can safely skip this step.
+
+We get python3, whatever is the lastes stable release.
+
+http://www.python.org/download/releases/3.3.5 Releases
+
+http://www.python.org/downloads/release/python-335/ Download
+
+http://www.python.org/ftp/python/3.3.5/python-3.3.5.amd64.msi Installer
+
+Install Python and be sure to check "addd python.exe to path" installer checkbox.
+
+==== download-mingw-rpm.py ====
+We get download-mingw-rpm.py script from github. It uses Python3 and should fetch and 
+unpack rpm files for us.
+
+[[https://github.com/mkbosmans/download-mingw-rpm/blob/master/download-
+mingw-rpm.py|View Script]]
+
+[[https://github.com/mkbosmans/download-mingw-rpm/raw/master/download-
+mingw-rpm.py|Download Script]]
+
+Usage:
+
+  * Launch cmd.exe
+  * Navigate to folder where the script was saved
+  * Make sure that python can access 7z.exe
+  * Run command and wait, it should extract the packages into your current directory
+
+c:\Python33\python.exe download-mingw-rpm.py -u http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/updates/18/i386/ --deps mingw32-webkitgtk mingw32-glib-networking mingw32-gdb mingw32-gstreamer-plugins-good
+
+[[http://dl.fedoraproject.org/pub/fedora/linux/releases/18/Everything/i386/os/Packages
+/m/|Fedora 18 packages]]
+
+The above URL for some reason does not work with the script.
+
+==== MSYS ====
+Msys contains shell and some small utilities
+
+[[http://sourceforge.net/projects/mingw-w64/files/External%20binary
+%20packages%20%28Win64%20hosted%29/MSYS%20%2832-bit%29/MSYS-20111123.zip/download|Download]]
+
+
+==== CMake ====
+http://www.cmake.org/cmake/resources/software.html Homepage
+http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe Installer
+
+When installing check the installer checkbox "add to path"
+
+
+==== Bazaar ====
+http://wiki.bazaar.canonical.com/WindowsDownloads Homepage
+
+We will get 2.4 Stable Release (standalone) 
+
+http://launchpad.net/bzr/2.4/2.4.2/+download/bzr-2.4.2-1-setup.exe Installer
+
+When installing check the installer checkbox "add to path"
+
+==== Vala ====
+http://ftp.gnome.org/pub/gnome/sources/vala/0.20/vala-0.20.0.tar.xz Source
+
+==== Globbing it all together ====
+
+Extracted rpms msys and mingw packages should form uniform unix like folder.
+You use msys.bat to launch a shell
+
+====== Jargon ======
+    * freeze: a period of bug fixes only eg. 4/2 cycle means 4 weeks of features and 2 weeks to focus on resolving existing problems
+    * MR: merge request, a branch proposed for review
+    * ninja: an internal tab, usually empty label, used for taking screenshots
+    * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu
+    * katze, sokoke, tabby: API names and coincidentally cat breeds
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index 99a310a..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,82 +0,0 @@
-This file is licensed under the terms of the expat license, see the file EXPAT.
-
-+++ Installing Midori +++
-
-Building and installing Midori is straightforward.
-
-Make sure you have Python 2.4 or higher installed.
-
-Change to the Midori folder on your hard disk in a terminal.
-
-Run './waf configure'
-
-Run './waf build'
-
-You can now run Midori from the build folder like so
-
-'_build/default/midori/midori'
-
-Midori will pick up extensions and resources from the build folder;
-it will NOT use localizations.
-
-You can install it with './waf install'
-
-If you need to do a clean rebuild, you can do either './waf clean'
-in order to remove binaries or './waf distclean' which deletes generated
-configuration files as well.
-
-For further options run './waf --help'
-
-+++ Debugging Midori +++
-
-Midori is by default built with debugging symbols, make sure you have
-installed 'gdb', the GNU Debugger.
-
-It's a good idea to execute all unit test cases and see that they pass.
-
-'xvfb-run ./waf check'
-
-In this example, Xvfb is used to avoid relying on the local user setup.
-
-You can also run Midori proper as 'gdb _build/default/midori/midori'.
-
-Inside gdb, type 'run'.
-
-Try to reproduce a crash that you experienced earlier,
-this time Midori will freeze at the point of the crash.
-Switch to your terminal, type bt ('backtrace') and hit Return.
-What you obtained now is a backtrace that should include
-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'
-
-If you are interested in HTTP communication, try this:
-
-'MIDORI_DEBUG=headers _build/default/midori/midori'
-
-Where 'headers' can be replaced with 'body' to get full message contents.
-
-If you are interested in (non-) touchscreen behaviour, try this:
-
-'MIDORI_TOUCHSCREEN=1 _build/default/midori/midori', or
-
-'MIDORI_TOUCHSCREEN=0 _build/default/midori/midori'
-
-If you want to "dry run" without WebKitGTK+ rendering, try this:
-
-'MIDORI_DEBUG=unarmed _build/default/midori/midori'
-
-If you want to test bookmarks, you can enable database tracing:
-
-'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).
-
-For further information a tutorial for gdb and
-reading up on how you can install debugging
-symbols for libraries used by Midori are recommended.
diff --git a/README b/README
index 3940baea7695665ffad5343cba67579e0d893ad6..8894f94a7770798904a30767dcb8002546af43f4 100644 (file)
--- a/README
+++ b/README
@@ -1,22 +1,25 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
-Midori is a lightweight web browser.
+Midori is a fast little WebKit browser with support for HTML5. It can manage
+many open tabs and windows. The URL bar completes history, bookmarks, search
+engines and open tabs out of the box. Web developers can use the powerful
+web inspector that is a part of WebKit. Individual pages can easily be turned
+into web apps and new profiles can be created on demand.
 
-* Full integration with GTK+2 and GTK+3.
-* Fast rendering with WebKit and HTML5 video with GStreamer.
-* Tabs, windows and session management.
-* History completion and 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.
+A number of extensions are included by default:
 
-Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.1.17, libXML2,
-              libsoup 2.27.90, sqlite 3.0, Vala 0.14
+* Adblock with support for ABP filter lists and custom rules is built-in.
+* You can download files with Aria2 or SteadyFlow.
+* User scripts and styles support a la Greasemonkey.
+* Managing cookies and scripts via NoJS and Cookie Security Manager.
+* Switching open tabs in a vertical panel or a popup window.
 
-Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0
+Requirements: GLib 2.32.3, GTK+ 2.24, WebkitGTK+ 1.8.1, libXML2,
+              libsoup 2.27.90, sqlite 3.0, Vala 0.16, libnotify
 
-For installation instructions read INSTALL.
+Optional: GTK+ 3.0, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0
+
+For installation instructions read the file HACKING.
 
 Please report comments, suggestions and bugs to:
     https://bugs.launchpad.net/midori
@@ -24,4 +27,4 @@ Please report comments, suggestions and bugs to:
 And join the IRC channel #midori on irc.freenode.net
 
 Check for new versions at:
-    http://www.twotoasts.de
+    http://www.midori-browser.org
diff --git a/cmake/ContainTest.cmake b/cmake/ContainTest.cmake
new file mode 100644 (file)
index 0000000..1646020
--- /dev/null
@@ -0,0 +1,55 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+include(ParseArguments)
+
+macro(contain_test test_name executable)
+    parse_arguments(ARGS "test_name;executable" "" ${ARGN})
+    set(TEST_ENV "")
+    foreach(VARIABLE XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR TMPDIR)
+        set(CONTAINER "${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/${VARIABLE}")
+        set(TEST_ENV "${TEST_ENV}${VARIABLE}=${CONTAINER};")
+    endforeach()
+
+    add_dependencies(check contain-${test_name})
+
+    set_tests_properties(${test_name} PROPERTIES
+                         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                         TIMEOUT 42
+                         ENVIRONMENT "${TEST_ENV}"
+                         )
+    add_custom_target("contain-${test_name}"
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_CACHE_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_CONFIG_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_DATA_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_RUNTIME_DIR
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/TMPDIR
+        )
+
+    string(REPLACE ${executable} ";" " " executable)
+    add_custom_target("gdb-${test_name}"
+        COMMAND env ${TEST_ENV} gdb
+        --batch -ex 'set print thread-events off'
+        -ex 'run' -ex 'bt'
+        --args ${executable}
+        DEPENDS "contain-${test_name}"
+        )
+
+    add_custom_target("valgrind-${test_name}"
+        COMMAND env ${TEST_ENV} valgrind
+        -q --leak-check=no --num-callers=4
+        --show-possibly-lost=no
+        --undef-value-errors=yes
+        --track-origins=yes
+        ${executable}
+        DEPENDS "contain-${test_name}"
+        )
+
+    add_custom_target("callgrind-${test_name}"
+        COMMAND env ${TEST_ENV} valgrind
+        --tool=callgrind
+        --callgrind-out-file=${UNIT}.callgrind
+        ${executable}
+        DEPENDS "contain-${test_name}"
+        )
+endmacro(contain_test)
diff --git a/cmake/FindConvert.cmake b/cmake/FindConvert.cmake
new file mode 100644 (file)
index 0000000..8f53670
--- /dev/null
@@ -0,0 +1,19 @@
+# Copyright (C) 2013 Christian Dywan
+# Copyright (C) 2013 Olivier Duchateau
+
+find_program (RSVG_CONVERT rsvg-convert)
+
+if (RSVG_CONVERT)
+    set (CONVERT_FOUND TRUE)
+    macro (SVG2PNG filename install_destination)
+        string(REPLACE "/" "_" target ${filename})
+        file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${filename}")
+        add_custom_target ("${target}.png" ALL
+            ${RSVG_CONVERT} --keep-aspect-ratio --format=png "${CMAKE_CURRENT_SOURCE_DIR}/${filename}.svg"
+                --output "${CMAKE_CURRENT_BINARY_DIR}/${filename}.png"
+        )
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${filename}.png"
+            DESTINATION ${install_destination})
+    endmacro (SVG2PNG filename)
+endif ()
+
diff --git a/cmake/FindIntltool.cmake b/cmake/FindIntltool.cmake
new file mode 100644 (file)
index 0000000..bba2177
--- /dev/null
@@ -0,0 +1,38 @@
+# FindIntltool.cmake
+#
+# Jim Nelson <jim@yorba.org>
+# Copyright 2012-2013 Yorba Foundation
+# Copyright (C) 2013 Christian Dywan
+
+find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+find_program (INTLTOOL_UPDATE_EXECUTABLE intltool-update)
+
+if (INTLTOOL_MERGE_EXECUTABLE)
+    set (INTLTOOL_MERGE_FOUND TRUE)
+    macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+        add_custom_target ("${desktop_id}.desktop" ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop
+        )
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${desktop_id}.desktop"
+                 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+    endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
+    macro (INTLTOOL_MERGE_APPDATA desktop_id po_dir)
+        add_custom_target ("${desktop_id}.appdata.xml" ALL
+            ${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir}
+                ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.appdata.xml.in ${desktop_id}.appdata.xml
+        )
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${desktop_id}.appdata.xml"
+                 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+         endmacro (INTLTOOL_MERGE_APPDATA desktop_id po_dir)
+endif ()
+
+if (INTLTOOL_UPDATE_EXECUTABLE)
+    set (INTLTOOL_UPDATE_FOUND TRUE)
+    add_custom_target (pot
+        COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} "-p" "-g" ${GETTEXT_PACKAGE}
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/po"
+        )
+endif ()
+
+
diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake
new file mode 100644 (file)
index 0000000..d6c9ca1
--- /dev/null
@@ -0,0 +1,18 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+find_program(VALA_EXECUTABLE NAMES $ENV{VALAC} valac)
+if (VALA_EXECUTABLE)
+    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" OUTPUT_VARIABLE "VALA_VERSION")
+    string(REPLACE "Vala " "" VALA_VERSION ${VALA_VERSION})
+    string(STRIP ${VALA_VERSION} VALA_VERSION)
+else ()
+    message(FATAL_ERROR "valac not found - install Vala compiler or specify compiler name eg. VALAC=valac-0.20")
+endif ()
+
+macro(vala_require VALA_REQUIRED)
+    if (${VALA_VERSION} VERSION_GREATER ${VALA_REQUIRED} OR ${VALA_VERSION} VERSION_EQUAL ${VALA_REQUIRED})
+        message(STATUS "valac ${VALA_VERSION} found")
+    else ()
+        message(FATAL_ERROR "valac >= ${VALA_REQUIRED} or later required")
+    endif ()
+endmacro(vala_require)
diff --git a/cmake/GIR.cmake b/cmake/GIR.cmake
new file mode 100644 (file)
index 0000000..659e865
--- /dev/null
@@ -0,0 +1,31 @@
+# GIR.cmake
+#
+# Macros for building Gobject Introspection bindings for Midori API
+find_program (GIR_SCANNER_BIN g-ir-scanner)
+find_program (GIR_COMPILER_BIN g-ir-compiler)
+
+if (GIR_SCANNER_BIN AND GIR_COMPILER_BIN)
+
+    set (GIR_FOUND TRUE)
+    set (GIR_VERSION "${MIDORI_MAJOR_VERSION}.${MIDORI_MINOR_VERSION}")
+    macro (gir_build module namespace)
+        add_custom_target ("g-ir-scanner_${module}" ALL
+            ${GIR_SCANNER_BIN} -Imidori -I${CMAKE_SOURCE_DIR}/ -I${CMAKE_BINARY_DIR}/midori -I${CMAKE_SOURCE_DIR}/${module} -I${CMAKE_SOURCE_DIR}/toolbars -I.
+                --header-only -n ${namespace} --identifier-prefix ${namespace}
+                ${CMAKE_SOURCE_DIR}/${module}/${module}-*.c ${CMAKE_SOURCE_DIR}/${module}/${module}-*.h
+                --pkg gtk+-2.0 --pkg webkit-1.0 --pkg gio-2.0 --pkg gobject-2.0
+                --warn-all -iGObject-2.0 -iGLib-2.0 -iGtk-2.0
+                --nsversion ${GIR_VERSION}
+                -o ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir
+                WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                DEPENDS ${CMAKE_PROJECT_NAME})
+
+    endmacro (gir_build module namespace)
+
+    macro (gir module namespace)
+        gir_build (${module} ${namespace})
+
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gir-1.0/")
+    endmacro (gir module)
+endif ()
diff --git a/cmake/GLibHelpers.cmake b/cmake/GLibHelpers.cmake
new file mode 100644 (file)
index 0000000..f777dd5
--- /dev/null
@@ -0,0 +1,71 @@
+# Copyright (C) 2010 David Sansome <me@davidsansome.com>
+cmake_minimum_required(VERSION 2.6)
+if(POLICY CMP0011)
+  cmake_policy(SET CMP0011 NEW)
+endif(POLICY CMP0011)
+
+find_program(GLIB_MKENUMS glib-mkenums)
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+
+macro(add_glib_marshal outfiles name prefix otherinclude)
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    COMMAND ${GLIB_GENMARSHAL} --header "--prefix=${prefix}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            > "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+  )
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"${otherinclude}\\\"" > "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"glib-object.h\\\"" >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"${name}.h\\\"" >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND ${GLIB_GENMARSHAL} --body "--prefix=${prefix}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+  )
+  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+endmacro(add_glib_marshal)
+
+macro(add_glib_enumtypes_t outfiles name htemplate ctemplate)
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    COMMAND ${GLIB_MKENUMS}
+            --template "${htemplate}"
+            ${ARGN} > "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${ARGN} "${htemplate}"
+  )
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND ${GLIB_MKENUMS}
+            --template "${ctemplate}"
+            ${ARGN} > "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${ARGN} ${ctemplate}
+            "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+  )
+  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+endmacro(add_glib_enumtypes_t)
+
+macro(add_glib_enumtypes outfiles name includeguard)
+  set(htemplate "${CMAKE_CURRENT_BINARY_DIR}/${name}.h.template")
+  set(ctemplate "${CMAKE_CURRENT_BINARY_DIR}/${name}.c.template")
+
+  # Write the .h template
+  add_custom_command(
+    OUTPUT ${htemplate} ${ctemplate}
+    COMMAND ${CMAKE_COMMAND}
+        "-Dctemplate=${ctemplate}"
+        "-Dhtemplate=${htemplate}"
+        "-Dname=${name}"
+        "-Dincludeguard=${includeguard}"
+        "\"-Dheaders=${ARGN}\""
+        -P "${CMAKE_SOURCE_DIR}/CMake/MakeGLibEnumTemplates.cmake"
+    DEPENDS "${CMAKE_SOURCE_DIR}/CMake/MakeGLibEnumTemplates.cmake" ${headers}
+  )
+
+  add_glib_enumtypes_t(${outfiles} ${name} ${htemplate} ${ctemplate} ${ARGN})
+endmacro(add_glib_enumtypes)
diff --git a/cmake/GtkDoc.cmake b/cmake/GtkDoc.cmake
new file mode 100644 (file)
index 0000000..d6e8cf4
--- /dev/null
@@ -0,0 +1,61 @@
+# GtkDoc.cmake
+#
+# Macros for building Midori API documentation.
+# Copyright (C) 2013 Olivier Duchateau
+
+find_program (GTKDOC_SCAN_BIN gtkdoc-scan)
+find_program (GTKDOC_MKDB_BIN gtkdoc-mkdb)
+find_program (GTKDOC_MKHTML_BIN gtkdoc-mkhtml)
+find_program (GTKDOC_MKTMPL_BIN gtkdoc-mktmpl)
+
+if (GTKDOC_SCAN_BIN AND GTKDOC_MKTMPL_BIN AND GTKDOC_MKDB_BIN
+        AND GTKDOC_MKHTML_BIN)
+
+    set (GTKDOC_FOUND TRUE)
+
+    macro (gtkdoc_build module)
+        message("gtkdoc: module ${module}")
+        # file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}")
+        add_custom_target ("gtkdoc-scan_${module}" ALL
+            ${GTKDOC_SCAN_BIN} --module=${module}
+                --source-dir="${CMAKE_SOURCE_DIR}/${module}"
+                --output-dir="${CMAKE_CURRENT_BINARY_DIR}/${module}"
+                --rebuild-sections --rebuild-types
+                WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+        add_custom_target ("gtkdoc-tmpl_${module}" ALL
+            ${GTKDOC_MKTMPL_BIN} --module=${module}
+            --output-dir="${CMAKE_CURRENT_BINARY_DIR}"
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}"
+            DEPENDS "gtkdoc-scan_${module}")
+
+        add_custom_target ("gtkdoc-docbook_${module}" ALL
+            ${GTKDOC_MKDB_BIN} --module=${module}
+                --output-dir="xml"
+                --source-dir="${CMAKE_SOURCE_DIR}/${module}"
+                --source-suffixes=c,h --output-format=xml
+                --default-includes=${module}/${module}.h
+                --sgml-mode --main-sgml-file=${module}.sgml
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}"
+            DEPENDS "gtkdoc-tmpl_${module}")
+
+        # Keep this target alone, otherwise build fails
+        add_custom_target ("gtkdoc-html_${module}" ALL
+            ${GTKDOC_MKHTML_BIN} ${module}
+            "${CMAKE_CURRENT_BINARY_DIR}/${module}/${module}.sgml"
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}/html"
+            DEPENDS "gtkdoc-docbook_${module}")
+
+    endmacro (gtkdoc_build module)
+
+    macro (gtkdoc module)
+        file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}/html")
+        gtkdoc_build (${module})
+
+        set (DOC_DIR "html/midori-${MIDORI_MAJOR_VERSION}-${MIDORI_MINOR_VERSION}")
+        install (DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}/html/"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/${DOC_DIR}/${module}"
+            PATTERN "html/*"
+            PATTERN "index.sgml" EXCLUDE)
+    endmacro (gtkdoc module)
+endif ()
diff --git a/cmake/ParseArguments.cmake b/cmake/ParseArguments.cmake
new file mode 100644 (file)
index 0000000..717c0f5
--- /dev/null
@@ -0,0 +1,36 @@
+##
+# This is a helper Macro to parse optional arguments in Macros/Functions
+# It has been taken from the public CMake wiki.  
+# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
+# licensing.
+##
+macro(parse_arguments prefix arg_names option_names)
+  set(DEFAULT_ARGS)
+  foreach(arg_name ${arg_names})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+  foreach(option ${option_names})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(current_arg_name DEFAULT_ARGS)
+  set(current_arg_list)
+  foreach(arg ${ARGN})
+    set(larg_names ${arg_names})
+    list(FIND larg_names "${arg}" is_arg_name)
+    if(is_arg_name GREATER -1)
+      set(${prefix}_${current_arg_name} ${current_arg_list})
+      set(current_arg_name ${arg})
+      set(current_arg_list)
+    else(is_arg_name GREATER -1)
+      set(loption_names ${option_names})
+      list(FIND loption_names "${arg}" is_option)
+      if(is_option GREATER -1)
+           set(${prefix}_${arg} TRUE)
+      else(is_option GREATER -1)
+           set(current_arg_list ${current_arg_list} ${arg})
+      endif(is_option GREATER -1)
+    endif(is_arg_name GREATER -1)
+  endforeach(arg)
+  set(${prefix}_${current_arg_name} ${current_arg_list})
+endmacro(parse_arguments)
diff --git a/cmake/ValaPrecompile.cmake b/cmake/ValaPrecompile.cmake
new file mode 100644 (file)
index 0000000..d5ba5a9
--- /dev/null
@@ -0,0 +1,236 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012 elementary.
+# 
+# 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.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``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 JAKOB WESTHOFF OR CONTRIBUTORS 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.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+include(ParseArguments)
+find_package(Vala REQUIRED)
+
+##
+# Compile vala files to their c equivalents for further processing. 
+#
+# The "vala_precompile" macro takes care of calling the valac executable on the
+# given source to produce c files which can then be processed further using
+# default cmake functions.
+# 
+# The first parameter provided is a variable, which will be filled with a list
+# of c files outputted by the vala compiler. This list can than be used in
+# conjuction with functions like "add_executable" or others to create the
+# neccessary compile rules with CMake.
+# 
+# The initial variable is followed by a list of .vala files to be compiled.
+# Please take care to add every vala file belonging to the currently compiled
+# project or library as Vala will otherwise not be able to resolve all
+# dependencies.
+# 
+# The following sections may be specified afterwards to provide certain options
+# to the vala compiler:
+# 
+# PACKAGES
+#   A list of vala packages/libraries to be used during the compile cycle. The
+#   package names are exactly the same, as they would be passed to the valac
+#   "--pkg=" option.
+# 
+# OPTIONS
+#   A list of optional options to be passed to the valac executable. This can be
+#   used to pass "--thread" for example to enable multi-threading support.
+#
+# CUSTOM_VAPIS
+#   A list of custom vapi files to be included for compilation. This can be
+#   useful to include freshly created vala libraries without having to install
+#   them in the system.
+#
+# GENERATE_VAPI
+#   Pass all the needed flags to the compiler to create an internal vapi for
+#   the compiled library. The provided name will be used for this and a
+#   <provided_name>.vapi file will be created.
+# 
+# GENERATE_HEADER
+#   Let the compiler generate a header file for the compiled code. There will
+#   be a header file as well as an internal header file being generated called
+#   <provided_name>.h and <provided_name>_internal.h
+#
+# GENERATE_GIR
+#   Have the compiler generate a GObject-Introspection repository file with
+#   name: <provided_name>.gir. This can be later used to create a binary typelib
+#   using the GI compiler.
+#
+# GENERATE_SYMBOLS
+#   Output a <provided_name>.symbols file containing all the exported symbols.
+# 
+# The following call is a simple example to the vala_precompile macro showing
+# an example to every of the optional sections:
+#
+#   vala_precompile(VALA_C mytargetname
+#       source1.vala
+#       source2.vala
+#       source3.vala
+#   PACKAGES
+#       gtk+-2.0
+#       gio-1.0
+#       posix
+#   DIRECTORY
+#       gen
+#   OPTIONS
+#       --thread
+#   CUSTOM_VAPIS
+#       some_vapi.vapi
+#   GENERATE_VAPI
+#       myvapi
+#   GENERATE_HEADER
+#       myheader
+#   GENERATE_GIR
+#       mygir
+#   GENERATE_SYMBOLS
+#       mysymbols
+#   )
+#
+# Most important is the variable VALA_C which will contain all the generated c
+# file names after the call.
+##
+
+macro(vala_precompile output target_name)
+    parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+
+    if(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
+    else(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif(ARGS_DIRECTORY)
+    include_directories(${DIRECTORY})
+    set(vala_pkg_opts "")
+    foreach(pkg ${ARGS_PACKAGES})
+        list(APPEND vala_pkg_opts "--pkg=${pkg}")
+    endforeach(pkg ${ARGS_PACKAGES})
+    set(in_files "")
+    set(out_files "")
+    set(out_files_display "")
+    set(${output} "")
+
+    foreach(src ${ARGS_DEFAULT_ARGS})
+        string(REGEX MATCH "^/" IS_MATCHED ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            set(src_file_path ${src})
+        else()
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
+        endif()
+        list(APPEND in_files ${src_file_path})
+        string(REPLACE ".vala" ".c" src ${src})
+        string(REPLACE ".gs" ".c" src ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            get_filename_component(VALA_FILE_NAME ${src} NAME)
+            set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+            list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+        else()
+            set(out_file "${DIRECTORY}/${src}")
+            list(APPEND out_files "${DIRECTORY}/${src}")
+        endif()
+        list(APPEND ${output} ${out_file})
+        list(APPEND out_files_display "${src}")
+    endforeach(src ${ARGS_DEFAULT_ARGS})
+
+    set(custom_vapi_arguments "")
+    if(ARGS_CUSTOM_VAPIS)
+        foreach(vapi ${ARGS_CUSTOM_VAPIS})
+            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${vapi})
+            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
+            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
+    endif(ARGS_CUSTOM_VAPIS)
+
+    set(vapi_arguments "")
+    if(ARGS_GENERATE_VAPI)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
+        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
+
+        # Header and internal header is needed to generate internal vapi
+        if (NOT ARGS_GENERATE_HEADER)
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        endif(NOT ARGS_GENERATE_HEADER)
+    endif(ARGS_GENERATE_VAPI)
+
+    set(header_arguments "")
+    if(ARGS_GENERATE_HEADER)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
+        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
+    endif(ARGS_GENERATE_HEADER)
+
+    set(gir_arguments "")
+    if(ARGS_GENERATE_GIR)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
+        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
+        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+    endif(ARGS_GENERATE_GIR)
+
+    set(symbols_arguments "")
+    if(ARGS_GENERATE_SYMBOLS)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
+        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
+        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
+    endif(ARGS_GENERATE_SYMBOLS)
+
+    # Workaround for a bug that would make valac run twice. This file is written
+    # after the vala compiler generates C source code.
+    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
+
+    add_custom_command(
+    OUTPUT
+        ${OUTPUT_STAMP}
+    COMMAND 
+        ${VALA_EXECUTABLE} 
+    ARGS 
+        "-C" 
+        ${header_arguments} 
+        ${vapi_arguments} 
+        ${gir_arguments} 
+        ${symbols_arguments} 
+        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
+        "-d" ${DIRECTORY} 
+        ${vala_pkg_opts} 
+        ${ARGS_OPTIONS} 
+        ${in_files} 
+        ${custom_vapi_arguments}
+    COMMAND
+        touch
+    ARGS
+        ${OUTPUT_STAMP}
+    DEPENDS 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    COMMENT
+        "Generating ${out_files_display}"
+    )
+
+    # This command will be run twice for some reason (pass a non-empty string to COMMENT
+    # in order to see it). Since valac is not executed from here, this won't be a problem.
+    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
+endmacro(vala_precompile)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cf59514
--- /dev/null
@@ -0,0 +1,23 @@
+# Copyright (C) 2013 Olivier Duchateau
+
+set (SYSCONFDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
+set (XDG_CONFIG_DIR "xdg/${CMAKE_PROJECT_NAME}")
+
+file (GLOB_RECURSE CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
+list (REMOVE_ITEM CONFIG_FILES "CMakeLists.txt")
+
+if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
+endif()
+
+foreach (FILE ${CONFIG_FILES})
+    string (FIND ${FILE} "adblock" ADBLOCK_CONF)
+    if (ADBLOCK_CONF GREATER -1)
+        string (REPLACE "config" "" dirname ${FILE})
+        install (FILES ${FILE}
+            DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}/${dirname}")
+    else ()
+        install (FILES ${FILE}
+            DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}")
+    endif ()
+endforeach ()
diff --git a/config/extensions/adblock/config b/config/extensions/adblock/config
new file mode 100644 (file)
index 0000000..4f73557
--- /dev/null
@@ -0,0 +1,2 @@
+[settings]
+filters=https://easylist-downloads.adblockplus.org/easylist.txt;https://easylist-downloads.adblockplus.org/easyprivacy.txt
diff --git a/config/search b/config/search
new file mode 100644 (file)
index 0000000..1a0aebe
--- /dev/null
@@ -0,0 +1,36 @@
+[Duck Duck Go]
+name=Duck Duck Go
+text=Privacy-aware Web Search
+uri=https://duckduckgo.com/?q=%s
+token=dd
+
+[Yahoo]
+name=Yahoo
+text=Yahoo Web Search
+uri=http://search.yahoo.com/search?p=
+token=y
+
+[Google]
+name=Google
+text=Web Search
+uri=http://www.google.com/search?q=%s
+token=g
+
+[Wikipedia]
+name=Wikipedia
+text=The free encyclopedia
+uri=http://en.wikipedia.org/wiki/Special:Search/%s
+token=wp
+
+[TheFreeDictionary]
+name=The Free Dictionary
+text=Dictionary, Encyclopedia and Thesaurus
+uri=http://www.thefreedictionary.com/%s
+token=fd
+
+[Google Translate]
+name=Google Translate
+text=Localize text or URL
+uri=http://translate.google.com/?q=
+token=gt
+
index f5e9d8fa18bf1e88e39feb73744c5ccee487062f..17021accdb9a22f1716059793e326cd62fef1ed9 100755 (executable)
--- a/configure
+++ b/configure
 #! /bin/sh
-
-# waf configure wrapper
-
-# Fancy colors used to beautify the output a bit.
 #
-if [ "$NOCOLOR" ] ; then
-    NORMAL=""
-    BOLD=""
-    RED=""
-    YELLOW=""
-    GREEN=""
-else
-    NORMAL="\033[0m"
-    BOLD="\033[1m"
-    RED="\033[91m"
-    YELLOW="\033[01;93m"
-    GREEN="\033[92m"
-fi
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_ERROR=2
-EXIT_BUG=10
-
-CUR_DIR=$PWD
-
-#possible relative path
-WORKINGDIR=`dirname $0`
-cd $WORKINGDIR
-#abs path
-WORKINGDIR=`pwd`
-cd $CUR_DIR
-
-# Checks for Python interpreter. Honours $PYTHON if set. Stores path to
-# interpreter in $PYTHON.
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
 #
-checkPython()
-{
-       if [ -z "$PYTHON" ] ; then
-           PYTHON=`which python2 2>/dev/null`
-       fi
-       if [ -z "$PYTHON" ] ; then
-           PYTHON=`which python 2>/dev/null`
-       fi
-       printf "Checking for Python\t\t\t:  "
-       if [ ! -x "$PYTHON" ] ; then
-         printf $RED"not found!"$NORMAL"\n"
-         echo "Please make sure that the Python interpreter is available in your PATH"
-         echo "or invoke configure using the PYTHON flag, e.g."
-         echo "$ PYTHON=/usr/local/bin/python configure"
-         exit $EXIT_FAILURE
-       fi
-       printf $GREEN"$PYTHON"$NORMAL"\n"
-}
-
-# Checks for WAF. Honours $WAF if set. Stores path to 'waf' in $WAF.
-# Requires that $PYTHON is set.
+# 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.
 #
-checkWAF()
-{
-       printf "Checking for WAF\t\t\t:  "
-       #installed miniwaf in sourcedir
-       if [ -z "$WAF" ] ; then
-           if [ -f "${WORKINGDIR}/waf" ] ; then
-               WAF="${WORKINGDIR}/waf"
-               if [ ! -x "$WAF" ] ; then
-                   chmod +x $WAF
-               fi
-           fi
-       fi
-       if [ -z "$WAF" ] ; then
-           if [ -f "${WORKINGDIR}/waf-light" ] ; then
-               ${WORKINGDIR}/waf-light --make-waf
-               WAF="${WORKINGDIR}/waf"
-           fi
-       fi
-       #global installed waf with waf->waf.py link
-       if [ -z "$WAF" ] ; then
-           WAF=`which waf 2>/dev/null`
-       fi
-       # neither waf nor miniwaf could be found
-       if [ ! -x "$WAF" ] ; then
-           printf $RED"not found"$NORMAL"\n"
-           echo "Go to http://code.google.com/p/waf/"
-           echo "and download a waf version"
-           exit $EXIT_FAILURE
-       else
-         printf $GREEN"$WAF"$NORMAL"\n"
-       fi
-       WAF="$PYTHON $WAF"
-}
-
-# Generates a Makefile. Requires that $WAF is set.
+# See the file COPYING for the full license text.
+#
+#~  Usage:
+#~    ./configure [OPTIONS]
+#~  Options:
+#~    --prefix=PREFIX        Installation prefix
+#~    --enable-gtk3          Use GTK+3
+#~    --disable-zeitgeist    Disable Zeitgeist history integration
+#~    --enable-granite       Fancy notebook and pop-overs
+#~    --enable-apidocs       API documentation
+#~
+#~  Environment:
+#~    VALAC if defined the valac executable to use, for example valac-0.16
 #
-generateMakefile()
-{
-       cat > Makefile << EOF
-#!/usr/bin/make -f
-# Waf Makefile wrapper
-WAF_HOME=$CUR_DIR
-
-all:
-       @$WAF build
-
-all-debug:
-       @$WAF -v build
-
-all-progress:
-       @$WAF -p build
-
-install:
-       @if test -n "\$(DESTDIR)"; then \\
-           $WAF install --destdir="\$(DESTDIR)"; \\
-       else \\
-           $WAF install; \\
-       fi;
-
-.PHONY: install
-
-uninstall:
-       @if test -n "\$(DESTDIR)"; then \\
-           $WAF uninstall --destdir="\$(DESTDIR)"; \\
-       else \\
-           $WAF uninstall; \\
-       fi;
-
-clean:
-       @$WAF clean
-
-distclean:
-       @$WAF distclean
-       @-rm -rf _build
-       @-rm -f Makefile
-
-check:
-       @$WAF check
-
-dist:
-       @$WAF dist
-
-EOF
-}
 
-checkPython
-checkWAF
+if [ -z `command -v cmake` ]; then
+    echo Fatal: cmake not installed
+    exit 1
+fi
 
-echo "calling waf configure with parameters"
-$WAF configure $* || exit $EXIT_ERROR
+while [ $# != 0 ]; do
+    case $1 in
+        --enable-gtk3)
+            ARGS="$ARGS -DUSE_GTK3=1";;
+        --disable-zeitgeist)
+            ARGS="$ARGS -DUSE_ZEITGEIST=0";;
+        --enable-granite)
+            ARGS="$ARGS -DUSE_GRANITE=1";;
+        --enable-apidocs)
+            ARGS="$ARGS -DUSE_APIDOCS=1";;
+        --extra-warnings)
+            ARGS="$ARGS -DEXTRA_WARNINGS=1";;
+        --prefix=*)
+            ARGS="$ARGS -DCMAKE_INSTALL_PREFIX=${1#*=}";;
+        *)
+            grep -e '^#~' $0 | sed s/#~//
+            exit
+    esac
+    shift
+done
+
+BUILD_DIR="_build"
+
+if [ ! -f GNUmakefile ]; then
+    cp -v GNUmakefile.in GNUmakefile || exit 1
+fi
 
-if [ -f "Makefile" ] ; then
-    echo ""
-else
-    generateMakefile
+# cmake was invoked in toplevel folder before
+# clean up cmake generated build files to prevent conflicts
+if [ -f CMakeCache.txt ]; then
+    echo
+    echo '####################################################################################'
+    echo 'CMake build files detected in toplevel folder !!'
+    echo 'Please always run "cmake" command from distinct folder when you use cmake yourself.'
+    echo '####################################################################################'
+    echo
+    echo 'Cleaning up...'
+    echo
+
+    rm -fr $BUILD_DIR
+    rm CMakeCache.txt config.h Makefile
+    find . -iname CMakeFiles -type d|xargs rm -fr
+    find . -iname cmake_install.cmake -exec rm {} \;
+    find . -iname CTestTestfile.cmake -exec rm {} \;
+
+    find . -iname *-folders -type d|xargs rm -fr
+    rm -fr data/logo-shade
 fi
 
-exit $EXIT_SUCCESS
+mkdir -p $BUILD_DIR && cd $BUILD_DIR || exit 1
+cmake $ARGS .. || exit 1
+
+echo
+echo "Configuring done, run \"make\" to compile"
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644 (file)
index 0000000..50859cf
--- /dev/null
@@ -0,0 +1,58 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+include(FindConvert)
+if (NOT CONVERT_FOUND)
+    message(FATAL_ERROR "rsvg-convert not found")
+endif ()
+
+include(FindIntltool)
+if (NOT INTLTOOL_MERGE_FOUND)
+    message(FATAL_ERROR "intltool-merge not found")
+elseif (NOT INTLTOOL_UPDATE_FOUND)
+    message(FATAL_ERROR "intltool-update not found")
+endif ()
+
+file(GLOB_RECURSE DATA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
+list(REMOVE_ITEM DATA_FILES "CMakeLists.txt")
+
+foreach(FILE ${DATA_FILES})
+    if (${FILE} MATCHES "faq.")
+        install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+    elseif (${FILE} MATCHES ".desktop")
+        if (NOT WIN32)
+            string(REPLACE ".desktop.in" "" DESKTOP_ID ${FILE})
+            INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po)
+        endif ()
+    elseif (${FILE} MATCHES ".appdata.xml")
+        if (NOT WIN32)
+            string(REPLACE ".appdata.xml.in" "" DESKTOP_ID ${FILE})
+            INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po)
+        endif ()
+    elseif (${FILE} MATCHES "\\.svg$")
+        string(REPLACE ".svg" "" IMG_ID ${FILE})
+        string (FIND ${FILE} "/" IS_DIR)
+        if (IS_DIR GREATER -1)
+            string(REPLACE "/" ";" DIR_LIST ${FILE})
+            LIST(GET DIR_LIST 0 S_DIR)
+            SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/${S_DIR}")
+        else ()
+            SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/")
+        endif()
+    # These are being handled in add_executable for the "midori" binary
+    elseif (${FILE} MATCHES "\\.ico$")
+    elseif (${FILE} MATCHES "\\.rc$")
+    # This is only meant for testing, and not used in production
+    elseif (${FILE} MATCHES "\\.swf$")
+    else()
+        string(FIND ${FILE} "/" IS_DIR)
+        if (IS_DIR GREATER -1)
+            string(REPLACE "/" ";" DIR_LIST ${FILE})
+            LIST(GET DIR_LIST 0 S_DIR)
+            LIST(GET DIR_LIST 1 S_FILE)
+            install(FILES ${S_DIR}/${S_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/midori/res/${S_DIR})
+        else ()
+            install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/midori/res/)
+        endif()
+    endif()
+
+endforeach()
index 138ef0abd73961ddbf40f60824839715fabef11d..61a767d0861ed442ce88ecfec98c0e8c54b7b1ec 100644 (file)
@@ -3,48 +3,53 @@
  This file is licensed under the terms of the expat license, see the file EXPAT.
  */
 body {
-   background-color: #eee;
-   margin: 0;
-   padding: 0;
+   background-color: #dedede;
+    color: #222222;
+    font-family: 'Open Sans', 'Droid Sans', Arial, sans-serif;
+    font-size: 14px;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: normal;
+    margin-top: 100px;
 }
 
-#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%;
 }
 
-html[dir="rtl"] #icon {
-   float: right;
-   padding-right: 1%;
+.indent {
+    margin-left: 5%;
 }
 
 #main {
-   float: right;
-   width: 75%;
+    max-width: 50%;
+    margin-left: auto;
+    margin-right: auto;
+    min-width: 480px;
+    background-repeat: no-repeat;
+    background-color: #ffffff;
+    border: 1px solid rgba(0, 0, 0, .3);
+    padding: 25px;
+    -webkit-border-radius: 4px;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
+    background-position-x: 22px;
+    background-position-y: 54px;
 }
 
-h1 {
-   font-size: 1.4em;
-   font-weight: bold;
-   white-space: nowrap;
-   overflow: hidden;
-   text-overflow: ellipsis;
+#text {
+    margin-left: 15%;
 }
 
-#logo {
-   position: absolute; bottom: 15px;
-   z-index: -1;
+h1 {
+    font-family: 'Open Sans', 'Droid Sans', arial, sans-serif;
+    font-size: 32px;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: 300;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 html[dir="ltr"] #logo {
@@ -61,11 +66,35 @@ button img {
     padding: 2px 1px;
 }
 
-#message {
-   font-size: 1.1em;
-   word-wrap: break-word;
+button {
+       font-size: 14px;
+}
+
+.message {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.description {
+    font-size: 1em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#suggestions {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#button {
+    text-align: right;
+}
+
+#logo {
+   position: absolute; bottom: 15px;
+   z-index: -1;
 }
 
-#description {
-   font-size: 1em;
+form {
+       margin-bottom: 0px;
 }
diff --git a/data/adblock.list b/data/adblock.list
new file mode 100644 (file)
index 0000000..ba8d4bb
--- /dev/null
@@ -0,0 +1,55 @@
+[Adblock Plus 2.0]
+! Version: 201402142200
+! Title: Exercise
+! Last modified: 11 Feb 2014 22:00 UTC
+! Expires: 3 days (update frequency)
+! Homepage: http://www.midori-browser.org
+! Licence: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+! Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+!
+! Some freeform text:
+! Yadayada http://example.com/ e-mail (somebody@example.com).
+!
+!-----Spam eggs--------!
+! *** la:le/lu_foo_bar.txt ***
+|/http://ads.blub.boing/*$domain=xxx.com
+|/http://ads.blub.boing/*$domain=xxx.com,foo.fr,coco.at
+/market.php?$domain=adf.ly|foo.com
+/?placement=$script,domain=putlocker.com|sockshare.com
+
+! Some basic filters
+*ads.foo.bar*
+*ads.bogus.name*
+||^http://ads.bla.blub/*
+engine.adct.ru/*?
+/addyn|*|adtech;
+doubleclick.net/pfadx/*.mtvi
+objects.tremormedia.com/embed/xml/*.xml?r=
+videostrip.com^*/admatcherclient.
+test.dom/test?var
+/adpage.
+br.gcl.ru/cgi-bin/br/
+_300x600.
+_rectangle_ads.
++adverts/
+-2/ads/
+
+! CSS elements
+old.tv,delicio.us,longc.at###box
+##.zRightAdNote
+###advertisingModule160x600
+##a[href$="/vghd.shtml"]
+imagetwist.com###left[align="center"] > center > a[target="_blank"]
+
+! Options
+||videobox.com/?tid=$popup
+||sexsearchcom.com^$popup,third-party
+||206.217.206.137^$third-party
+/spopunder^$popup
+||putlocker.com^*.php?*title$subdocument
+://ads.$popup
+
+! Whitelist
+@@||hortifor.com/images/*120x60$~third-party
+@@||stickam.com/wb/www/category/300x250/$image
+@@||adultadworld.com/adhandler/$subdocument
diff --git a/data/adblock/blocked.svg b/data/adblock/blocked.svg
new file mode 100644 (file)
index 0000000..ec75b54
--- /dev/null
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#ffa500;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/data/adblock/disabled.svg b/data/adblock/disabled.svg
new file mode 100644 (file)
index 0000000..4aac8fc
--- /dev/null
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/data/adblock/element_hider.js b/data/adblock/element_hider.js
new file mode 100644 (file)
index 0000000..c9ad4bd
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2014 Alexander V. Butenko <a.butenka@gmail.com>
+
+ 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.
+ */
+function getElementsByAttribute (strTagName, strAttributeName, arrAttributeValue) {
+    var arrElements = document.getElementsByTagName (strTagName);
+    var arrReturnElements = new Array();
+    for (var j=0; j<arrAttributeValue.length; j++) {
+        var strAttributeValue = arrAttributeValue[j];
+        for (var i=0; i<arrElements.length; i++) {
+             var oCurrent = arrElements[i];
+             var oAttribute = oCurrent.getAttribute && oCurrent.getAttribute (strAttributeName);
+             if (oAttribute && oAttribute.length > 0 && strAttributeValue.indexOf (oAttribute) != -1)
+                 arrReturnElements.push (oCurrent);
+        }
+    }
+    return arrReturnElements;
+};
+
+function hideElementBySrc (uris) {
+    var oElements = getElementsByAttribute('img', 'src', uris);
+    if (oElements.length == 0)
+        oElements = getElementsByAttribute ('iframe', 'src', uris);
+    for (var i=0; i<oElements.length; i++) {
+        oElements[i].style.visibility = 'hidden !important';
+        oElements[i].style.width = '0';
+        oElements[i].style.height = '0';
+    }
+};
diff --git a/data/adblock/enabled.svg b/data/adblock/enabled.svg
new file mode 100644 (file)
index 0000000..9243ce6
--- /dev/null
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="adblock-enabled.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="fill:#000000;fill-opacity:0"
+     d="M 3.8914706,8.8841635 C 3.4103263,8.1221753 3.0583616,6.8749414 3.003735,5.7383534 2.9786317,5.2160416 2.9904131,4.8722447 3.036357,4.7863976 3.0800139,4.7048241 3.2418563,4.6177843 3.4482218,4.5648944 3.8914458,4.4512995 4.5265161,4.1442388 5.8961843,3.3812883 L 7.0127075,2.7593478 7.7697676,2.7353155 C 8.6627475,2.7069685 9.052772,2.7983017 9.8276868,3.2172249 10.1089,3.3692502 10.375652,3.52161 10.420468,3.5558023 10.491273,3.609822 8.8213493,5.090833 4.1912034,9.0803713 4.0886836,9.1687069 4.0587803,9.149132 3.8914706,8.8841635 l 0,0 z"
+     id="path2987"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:0"
+     d="M 7.5676774,12.795393 C 7.0256619,12.469009 6.4290755,11.979639 5.8305085,11.370422 5.33023,10.861243 5.3242581,10.851054 5.4600194,10.738315 5.5359114,10.675293 7.1641368,9.2661017 9.0782981,7.6067797 11.684369,5.3476641 12.594872,4.5953246 12.703024,4.6117025 c 0.291451,0.044135 0.329784,0.1886522 0.290923,1.0967721 -0.07204,1.6834953 -0.589725,2.9526655 -1.866622,4.5762714 -0.495094,0.629525 -1.366327,1.526375 -1.8854314,1.94087 C 8.8466967,12.541173 8.091686,13.030508 8,13.030508 c -0.023031,0 -0.2175765,-0.105802 -0.4323226,-0.235115 z"
+     id="path2989"
+     inkscape:connector-curvature="0" />
+</svg>
index 389bfd47b55df45113991ea5746ff8b679d901e7..9c65d16d32c5f69b98e146a9e47d5fa5673ae0f4 100644 (file)
@@ -1,7 +1,15 @@
-/**
- * An autosuggest textbox control.
- * from Nicholas C. Zakas (Author) example: http://www.nczonline.net/
- * Adopted for Midori by Alexander V. Butenko <a.butenka@gmail.com>
+/*
+ An autosuggest textbox control.
+ Copyright (C) 2012 Nicholas C. Zakas (Author) example: http://www.nczonline.net/
+ Adopted for Midori by Alexander V. Butenko <a.butenka@gmail.com>
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 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.
+ Neither the name of the Nicholas C. Zakas nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
  */
 
 function AutoSuggestControl(oTextbox /*:HTMLInputElement*/,
diff --git a/data/bookmarks/Create.sql b/data/bookmarks/Create.sql
new file mode 100644 (file)
index 0000000..7500fc2
--- /dev/null
@@ -0,0 +1,91 @@
+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
+); 
+
+/* 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;
diff --git a/data/bookmarks/Import_old_db_bookmarks.sql b/data/bookmarks/Import_old_db_bookmarks.sql
new file mode 100644 (file)
index 0000000..5e023cd
--- /dev/null
@@ -0,0 +1,6 @@
+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));
diff --git a/data/com.nokia.midori.service b/data/com.nokia.midori.service
deleted file mode 100644 (file)
index f8d1df0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.midori
-Exec=/usr/bin/midori
index 8de2f75457a609044e5f63de72b378c881b81024..73cae7a42804769fc711f5eea605f4a3f48fd48a 100644 (file)
@@ -9,21 +9,22 @@
 <link rel="stylesheet" type="text/css" href="res://about.css" />
 </head>
 <body>
-    <div id="container">
-        <img id="logo" src="res://logo-shade.png" />
-        <img id="icon" src="stock://gtk-dialog-error" />
-        <div id="main">
-            <h1>{title}</h1>
-            <p id="message">{message}</p>
-            <p id="description">{description}</p>
-            <form method="GET" action="{uri}">
-                <button type="submit" onclick="location.reload(); return false;">
+<img id="logo" src="res://logo-shade.png" />
+<div id="main" style="background-image: url({error_icon});">
+            <div id="text">
+                <h1>{title}</h1>
+                <p class="message">{message}<br><i>{description}</i></p>
+                {suggestions}
+            </div>
+            <form method="GET" action="{uri}" id="button">
+                <button type="submit" onclick="location.reload(); return false;" {autofocus}>
                     <img style="{hide-button-images}" src="stock://gtk-refresh"/>
                     <span>{tryagain}</span>
                 </button>
             </form>
         </div>
-        <br style="clear: both;"/>
-    </div>
-  </body>
+    
+<br style="clear: both;"/>
+</div>
+</body>
 </html>
diff --git a/data/extensions/adblock/config b/data/extensions/adblock/config
deleted file mode 100644 (file)
index 4f73557..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[settings]
-filters=https://easylist-downloads.adblockplus.org/easylist.txt;https://easylist-downloads.adblockplus.org/easyprivacy.txt
index 3f44a7d660aceffb3d5761bc0f0d65cda26efad4..e92ab8964a0f16a25d8c26b097d96b6261f58bfe 100644 (file)
@@ -4,21 +4,21 @@
   <meta charset="utf-8" />
   <title>midori:faq</title>
 <meta name="generator" content="DokuWiki"/>
-<meta name="robots" content="noindex,nofollow"/>
-<meta name="date" content="2013-05-13T12:47:33+0200"/>
+<meta name="robots" content="index,follow"/>
+<meta name="date" content="2014-06-05T00:44:58+0200"/>
 <meta name="keywords" content="midori,faq"/>
 <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/>
 <link rel="start" href="/"/>
 <link rel="contents" href="/midori/faq?do=index" title="Sitemap"/>
-<link rel="alternate" type="application/rss+xml" title="Recent Changes" href="/feed.php"/>
-<link rel="alternate" type="application/rss+xml" title="Current Namespace" href="/feed.php?mode=list&amp;ns=midori"/>
+<link rel="alternate" type="application/rss+xml" title="Recent changes" href="/feed.php"/>
+<link rel="alternate" type="application/rss+xml" title="Current namespace" href="/feed.php?mode=list&amp;ns=midori"/>
 <link rel="alternate" type="text/html" title="Plain HTML" href="/_export/xhtml/midori/faq"/>
 <link rel="alternate" type="text/plain" title="Wiki Markup" href="/_export/raw/midori/faq"/>
 <link rel="canonical" href="http://wiki.xfce.org/midori/faq"/>
 <link rel="stylesheet" href="faq.css" />
 <script type="text/javascript">/*<![CDATA[*/var NS='midori';var JSINFO = {"id":"midori:faq","namespace":"midori"};
 /*!]]>*/</script>
-<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=1358197876"></script>
+<script type="text/javascript" charset="utf-8" src="/lib/exe/js.php?tseed=34912f2e1a4daa1bfa9afb3096df0197"></script>
 </head>
 <body>
 <div class="dokuwiki export">
@@ -29,7 +29,7 @@
 
 <ul class="toc">
 <li class="level1"><div class="li"><a href="#midori_-_frequently_asked_questions">Midori - Frequently asked questions</a></div></li>
-<li class="level1"><div class="li"><a href="#getting_started">Getting started</a></div></li>
+<li class="level1"><div class="li"><a href="#about_midori">About Midori</a></div></li>
 <li class="level1"><div class="li"><a href="#common_problems">Common problems</a></div>
 <ul class="toc">
 <li class="level2"><div class="li"><a href="#security_features">Security features</a></div></li>
 <li class="level1"><div class="li"><a href="#user_scripts_and_styles">User scripts and styles</a></div>
 <ul class="toc">
 <li class="level2"><div class="li"><a href="#user_styles">User styles</a></div></li>
-</ul></li>
+</ul>
+</li>
+<li class="level1"><div class="li"><a href="#midori_architecture">Midori Architecture</a></div>
+<ul class="toc">
+<li class="level2"><div class="li"><a href="#webkit_version_numbers">WebKit Version Numbers</a></div></li>
+</ul>
+</li>
+<li class="level1"><div class="li"><a href="#midori_and_mediaherald">Midori and mediaHerald</a></div></li>
 </ul>
 </div>
 </div>
 </p>
 
 <p>
-This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a> about the Midori Web Browser. Anyone feel free to improve and/ or extend this page, but keep it clean and easy to read for other Xfce users.
+This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a> about the Midori Web Browser. Anyone should feel free to improve or extend this page, but keep it clean and easy to read for other users.
 </p>
 
 </div>
-<!-- EDIT1 SECTION "Midori - Frequently asked questions" [1-289] -->
-<h1 class="sectionedit2" id="getting_started">Getting started</h1>
+<!-- EDIT1 SECTION "Midori - Frequently asked questions" [1-286] -->
+<h1 class="sectionedit2" id="about_midori">About Midori</h1>
 <div class="level1">
 
 </div>
@@ -86,7 +93,7 @@ This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</
 <div class="level4">
 
 <p>
-Midori is a Web Browser, that aims to be lightweight and fast. It aligns well with the Xfce philosophy of making the most out of available resources.
+Midori is a Web browser that aims to be lightweight and fast. It aligns well with the Xfce philosophy of making the most out of available resources. It has a customizable interface using the GTK+ toolkit.
 </p>
 
 </div>
@@ -113,7 +120,7 @@ The paw of a green cat. Obviously. Also it resembles the letter “M” in “Mi
 <div class="level4">
 
 <p>
-Midori is basically very portable and should run on all platforms that its dependencies support.
+Midori is portable and should run on all platforms that its dependencies support. Releases exist on various Linux distributions, for Windows versions prior to 8.1 (for now), and BSD.
 </p>
 
 </div>
@@ -126,7 +133,7 @@ Midori and all delivered artwork are licensed under the LGPL2.
 </p>
 
 </div>
-<!-- EDIT2 SECTION "Getting started" [290-1188] -->
+<!-- EDIT2 SECTION "About Midori" [287-1323] -->
 <h1 class="sectionedit3" id="common_problems">Common problems</h1>
 <div class="level1">
 
@@ -136,19 +143,15 @@ Midori and all delivered artwork are licensed under the LGPL2.
 <div class="level4">
 
 <p>
-Some websites discriminate against your browser.
-</p>
-
-<p>
-If you have Midori older than 0.3.5, go to Preferences &gt; Network &gt; Identify As, and choose Custom. Paste this into the entry:
+Some websites give up if they don&#039;t recognize your browser as Chrome, Firefox, <abbr title="Internet Explorer">IE</abbr>, etc.
 </p>
 
 <p>
-Mozilla/5.0 (X11; Linux) AppleWebKit/531.2+ Midori/0.3
+You can change the browser name sent to web sites at Preferences &gt; Network &gt; Identify As
 </p>
 
 <p>
-If this doesn&#039;t do the trick, try choosing Safari or Firefox.
+Either choose a predefined user-agent or choose Custom and find a suitable string in <a href="http://useragentstring.com/pages/useragentstring.php" class="urlextern" title="http://useragentstring.com/pages/useragentstring.php"  rel="nofollow">a list</a>.
 </p>
 
 <p>
@@ -156,7 +159,7 @@ Many other websites use similar means of detecting the browser.
 </p>
 
 <p>
-Ideally Google would follow <a href="http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ#UserAgent_Detection" class="urlextern" title="http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ#UserAgent_Detection"  rel="nofollow">their own recommendation</a> at some point.
+Google <a href="http://web.archive.org/web/20100625211333/http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ" class="urlextern" title="http://web.archive.org/web/20100625211333/http://code.google.com/p/doctype/wiki/ArticleGoogleChromeCompatFAQ"  rel="nofollow">previously recommended</a> the superior practice for website creators of checking which features are present rather than browser name/version, but has since weakened this stance with their browser&#039;s growing market share.
 </p>
 
 </div>
@@ -165,7 +168,28 @@ Ideally Google would follow <a href="http://code.google.com/p/doctype/wiki/Artic
 <div class="level4">
 
 <p>
-The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org <abbr title="specification">spec</abbr> compliant icon theme, such as Elementary, Faenza, Buuf or GNOME.
+Midori uses a wide variety of icons which may not be present in all themes. For instance icons for a new tab, to represent scripts, or the throbber may not available. To fix this, install a Freedesktop.org <abbr title="specification">spec</abbr> compliant icon theme, such as Elementary, Faenza, Buuf or GNOME.
+</p>
+
+<p>
+if you need to set a custom path for these to be “searched in” (Kiosks and embedded devices for example):
+</p>
+
+<p>
+XDG_DATA_HOME=/path/to/location  
+</p>
+
+<p>
+will add an extra path for the icons/… directory
+</p>
+
+<p>
+In addition, GTK3 may remove icons from menus. This may be changed by placing 
+</p>
+<pre class="code">gtk-menu-images=true</pre>
+
+<p>
+ in the file ~/.config/gtk-3.0/settings.ini
 </p>
 
 </div>
@@ -201,6 +225,21 @@ Enable changing hotkeys while hovering menu items:
 
 </div>
 
+<h4 id="disable_middle_click_pasting">Disable middle click pasting</h4>
+<div class="level4">
+
+<p>
+As of GTK+ &gt;= 3.4 one can disable it globally in ~/.gtkrc-2.0
+</p>
+<pre class="code">gtk-enable-primary-paste = 0</pre>
+
+<p>
+Otherwise by adding a line to ~/.config/midori/config
+</p>
+<pre class="code">middle-click-opens-selection=false</pre>
+
+</div>
+
 <h4 id="midori_crashes_shortly_before_pages_are_loaded">Midori crashes shortly before pages are loaded</h4>
 <div class="level4">
 
@@ -222,7 +261,7 @@ export XDG_CACHE_HOME=/dev/shm
 </p>
 
 </div>
-<!-- EDIT3 SECTION "Common problems" [1189-3300] -->
+<!-- EDIT3 SECTION "Common problems" [1324-4267] -->
 <h2 class="sectionedit4" id="security_features">Security features</h2>
 <div class="level2">
 
@@ -240,6 +279,10 @@ Midori &gt;= 0.4.7 automatically picks up the Strict-Transport-Security header a
 <h4 id="certificate_handling">Certificate Handling</h4>
 <div class="level4">
 
+<p>
+Midori uses the system&#039;s ca-certificates, the exact locations depend on the distribution.
+</p>
+
 <p>
 Midori &gt;= 0.4.7 supports <a href="http://git.gnome.org/browse/gcr/tree/gcr" class="urlextern" title="http://git.gnome.org/browse/gcr/tree/gcr"  rel="nofollow">gcr</a> 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.
 </p>
@@ -250,7 +293,7 @@ Midori &gt;= 0.4.7 supports <a href="http://git.gnome.org/browse/gcr/tree/gcr" c
 <div class="level5">
 
 <p>
-No key store is available or it&#039;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&#039;t correctly send the output of “gnome-keyring –startup” to the environment.
+No key store is available or it&#039;s incorrectly setup. By default GNOME keyring can do this. Under Xfce it is recommended to enable “GNOME services” under “Session and Startup settings”. To make sure, that the output of “gnome-keyring –startup” is correctly sent to the environment, you can add “export `gnome-keyring-daemon –start`” to .xinitrc.
 </p>
 
 </div>
@@ -263,7 +306,7 @@ No key store is available or it&#039;s incorrectly setup. By default GNOME keyri
 </p>
 
 </div>
-<!-- EDIT4 SECTION "Security features" [3301-4386] -->
+<!-- EDIT4 SECTION "Security features" [4268-5485] -->
 <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn&#039;t work</h2>
 <div class="level2">
 
@@ -302,10 +345,15 @@ You can either run that above line and run Midori in the same terminal afterward
 <p>
 nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can&#039;t crash the whole browser and Flash, which is GTK+2 can run in GTK+3.
 </p>
-<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer
-<span class="kw2">sudo</span> <span class="kw2">apt-get install</span> nspluginwrapper
-<span class="kw2">sudo</span> nspluginwrapper <span class="re5">-i</span> <span class="sy0">/</span>usr<span class="sy0">/</span>lib<span class="sy0">/</span>flashplugin-installer<span class="sy0">/</span>libflashplayer.so
-nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span></pre>
+<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> nspluginwrapper
+<span class="co0"># On Debian/ Ubuntu - on other systems http://get.adobe.com/de/flashplayer/</span>
+<span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer
+<span class="co0"># cd into the folder where the plugin was installed</span>
+nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span> libflashplayer.so</pre>
+
+<p>
+~/.mozilla can also be used with Adobe&#039;s tarball if system-wide install is not an option. The approach is confirmed to work with x86-64 as well.
+</p>
 
 <p>
 Another remedy is using WebKit2 - starting with Midori 0.4.9 experimental support is available, <a href="https://trac.webkit.org/wiki/WebKitGTK/WebKit2Roadmap" class="urlextern" title="https://trac.webkit.org/wiki/WebKitGTK/WebKit2Roadmap"  rel="nofollow">progress on WebKit2GTK+ can be seen in the WebKit wiki</a>.
@@ -335,6 +383,10 @@ There&#039;s no official support right now. It&#039;s possible to <a href="https
 <h4 id="scroll_with_middle_mouse_buttonpan-scrolling">Scroll with middle mouse button/ pan-scrolling</h4>
 <div class="level4">
 
+<p>
+Windows-style middle-click behavior is 
+</p>
+
 <p>
 <a href="http://ubuntuforums.org/showthread.php?t=478418" class="urlextern" title="http://ubuntuforums.org/showthread.php?t=478418"  rel="nofollow">http://ubuntuforums.org/showthread.php?t=478418</a>
 </p>
@@ -347,24 +399,24 @@ Upstream Bug: <a href="https://bugs.webkit.org/show_bug.cgi?id=50561" class="url
 
 </div>
 
-<h4 id="html5_video_doesn_t_play">HTML5 Video doesn&#039;t play</h4>
+<h4 id="html5_videoaudio_doesn_t_play">HTML5 Video/ Audio doesn&#039;t play</h4>
 <div class="level4">
 
 <p>
-You need to have GStreamer plugins installed which implement the codecs.
+<a href="#midori_architecture" title="midori:faq ↵" class="wikilink1">Midori uses GStreamer</a> for HTML5 audio and video support. Codecs, which handle particular formats of audio or video, are provided by GStreamer plugins which may need to be installed separately. Midori may be built with GTK+2 or GTK+3 (visit about:version to check), which correspond to GStreamer versions of 0.10 or 1.0 respectively.
 </p>
 <ol>
-<li class="level1"><div class="li"> You need gstreamer0.10-pulse if you&#039;re using PulseAudio.</div>
+<li class="level1"><div class="li"> You need gstreamer(0.10/1.0)-pulse if you&#039;re using PulseAudio.</div>
 </li>
-<li class="level1"><div class="li"> You may need gstreamer0.10-alsa for ALSA, depending on your distribution.</div>
+<li class="level1"><div class="li"> You may need gstreamer(0.10/1.0)-alsa for ALSA, depending on your distribution.</div>
 </li>
-<li class="level1"><div class="li"> You need plugins for Theora, gstreamer0.10-base and <abbr title="Motion Picture Experts Group">MPEG</abbr>-4 incluing aac (e.g. gst-plugins-faad), gstreamer0.10-bad. For WebM, you&#039;ll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at <a href="http://www.gstreamer.net/documentation/plugins.html" class="urlextern" title="http://www.gstreamer.net/documentation/plugins.html"  rel="nofollow">http://www.gstreamer.net/documentation/plugins.html</a> for details.</div>
+<li class="level1"><div class="li"> You need plugins for Theora, gstreamer(0.10/1.0)-base and <abbr title="Moving Picture Experts Group">MPEG</abbr>-4 incluing aac (e.g. gst-plugins-faad), gstreamer(0.10/1.0)-bad. For WebM, you&#039;ll need plugins for vorbis (-base), matroska (-good), and vp8 (-bad). Have a look at <a href="http://www.gstreamer.net/documentation/plugins.html" class="urlextern" title="http://www.gstreamer.net/documentation/plugins.html"  rel="nofollow">http://www.gstreamer.net/documentation/plugins.html</a> for details.</div>
 </li>
 <li class="level1"><div class="li"> For Youtube or Vimeo, you need WebKitGTK+ 1.1.20 or newer.</div>
 </li>
 <li class="level1"><div class="li"> You can <a href="http://ie.microsoft.com/testdrive/Graphics/VideoFormatSupport/Default.html" class="urlextern" title="http://ie.microsoft.com/testdrive/Graphics/VideoFormatSupport/Default.html"  rel="nofollow">test your installed codecs here</a>..</div>
 </li>
-<li class="level1"><div class="li"> Since Midori 0.3.5 you can look at “about:version” to see which video codecs you have installed.</div>
+<li class="level1"><div class="li"> You can look at about:version to see which video codecs you have installed.</div>
 </li>
 </ol>
 
@@ -589,12 +641,12 @@ Most settings listed at <a href="http://webkitgtk.org/reference/webkitgtk/stable
 </p>
 
 </div>
-<!-- EDIT5 SECTION "Flash doesn't work" [4387-12724] -->
+<!-- EDIT5 SECTION "Flash doesn't work" [5486-14378] -->
 <h1 class="sectionedit6" id="privacy">Privacy</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT6 SECTION "Privacy" [12725-12747] -->
+<!-- EDIT6 SECTION "Privacy" [14379-14401] -->
 <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2>
 <div class="level2">
 
@@ -620,7 +672,7 @@ The feature is currently experimental and will change in future versions.
 </p>
 
 </div>
-<!-- EDIT7 SECTION "Blacklist cookies" [12748-13284] -->
+<!-- EDIT7 SECTION "Blacklist cookies" [14402-14938] -->
 <h2 class="sectionedit8" id="adblock">Adblock</h2>
 <div class="level2">
 
@@ -629,12 +681,12 @@ The Advertisement Blocker can be activated under Extensions. It uses the same li
 </p>
 
 </div>
-<!-- EDIT8 SECTION "Adblock" [13285-13540] -->
+<!-- EDIT8 SECTION "Adblock" [14939-15194] -->
 <h1 class="sectionedit9" id="modes">Modes</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT9 SECTION "Modes" [13541-13561] -->
+<!-- EDIT9 SECTION "Modes" [15195-15215] -->
 <h2 class="sectionedit10" id="web_applications">Web Applications</h2>
 <div class="level2">
 
@@ -655,7 +707,7 @@ There are two closely related features to open websites as dedicated windows of
 </p>
 
 </div>
-<!-- EDIT10 SECTION "Web Applications" [13562-14078] -->
+<!-- EDIT10 SECTION "Web Applications" [15216-15732] -->
 <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2>
 <div class="level2">
 
@@ -681,7 +733,7 @@ The same options available to -a/ –app can be used for private browsing mode.
 </p>
 
 </div>
-<!-- EDIT11 SECTION "Private Browsing" [14079-14998] -->
+<!-- EDIT11 SECTION "Private Browsing" [15733-16652] -->
 <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2>
 <div class="level2">
 
@@ -690,7 +742,7 @@ On Windows builds, -P/ –portable causes all data to be written to the “profi
 </p>
 
 </div>
-<!-- EDIT12 SECTION "Portable mode/ Win32" [14999-15312] -->
+<!-- EDIT12 SECTION "Portable mode/ Win32" [16653-16966] -->
 <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2>
 <div class="level2">
 
@@ -722,7 +774,7 @@ Any links outside end up in an error page. All images and other files won&#039;t
 </p>
 
 </div>
-<!-- EDIT13 SECTION "Kiosk mode" [15313-16350] -->
+<!-- EDIT13 SECTION "Kiosk mode" [16967-18004] -->
 <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2>
 <div class="level2">
 
@@ -755,7 +807,7 @@ If for whatever reason this isn&#039;t enough, <a href="https://live.gnome.org/D
 </p>
 
 </div>
-<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16351-16878] -->
+<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [18005-18532] -->
 <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2>
 <div class="level2">
 
@@ -772,7 +824,7 @@ As of Midori 0.5.0 the –execute command line switch got more powerful:
 </p>
 
 </div>
-<!-- EDIT15 SECTION "Overriding settings and loading extensions" [16879-17086] -->
+<!-- EDIT15 SECTION "Overriding settings and loading extensions" [18533-18740] -->
 <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1>
 <div class="level1">
 
@@ -856,7 +908,7 @@ server_port = 5555</pre>
 </ol>
 
 </div>
-<!-- EDIT16 SECTION "Proxy servers" [17087-18908] -->
+<!-- EDIT16 SECTION "Proxy servers" [18741-20562] -->
 <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1>
 <div class="level1">
 
@@ -938,7 +990,7 @@ When using Ctrl+f to bring up Find, use Ctrl+f again or ESC. When using ”/”
 </p>
 
 </div>
-<!-- EDIT17 SECTION "Keyboard Hotkeys" [18909-20241] -->
+<!-- EDIT17 SECTION "Keyboard Hotkeys" [20563-21895] -->
 <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1>
 <div class="level1">
 
@@ -947,10 +999,10 @@ By default the right mouse button initiates gestures.
 </p>
 
 <p>
-You can change the button using a hidden option:
+You can change the button (for example, to the middle mouse button) using a hidden option:
 </p>
 <ol>
-<li class="level1"><div class="li"> Create a text file ~/.config/midori/extensions/libmouse-gestures.so/config .</div>
+<li class="level1"><div class="li"> Create a text file ~/.config/midori/extensions/libmouse-gestures.so/<strong>config</strong> .</div>
 </li>
 <li class="level1"><div class="li"> Type the following in there:</div>
 </li>
@@ -959,23 +1011,20 @@ You can change the button using a hidden option:
   button=2</pre>
 
 <p>
-As of Midori 0.5.0 individual gestures can be configured freely, consult “midori –help-execute” for a list of available left-hand actions:
+As of Midori 0.5.0 individual gestures can be configured freely in the file ~/.config/midori/extensions/libmouse-gestures.so/<strong>gestures</strong> .
+Consult “midori –help-execute” for a list of available actions, which are placed on the left of the equals sign. On the right goes a sequence of directions, (W)est, (E)east, (N)orth, (S)outh, (S)outh(W)est, etc., with a semicolon (;) after each, as shown below:
 </p>
 <pre class="code">  [gestures]
   Quit=W;E;
   TabPrevious=SW;
   TabNext=SE;</pre>
 
-<p>
-Separated by ; the right-hand values are cardinal directions, (W)est, (E)east, (N)orth, (S)outh. You can also combine eg. WE for West East.
-</p>
-
 <p>
 Additionally, there are programs allowing mouse gestures system-wide, for example <a href="http://easystroke.wiki.sourceforge.net/" class="urlextern" title="http://easystroke.wiki.sourceforge.net/"  rel="nofollow">EasyStroke</a>.
 </p>
 
 </div>
-<!-- EDIT18 SECTION "Mouse Gestures" [20242-21006] -->
+<!-- EDIT18 SECTION "Mouse Gestures" [21896-22828] -->
 <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1>
 <div class="level1">
 
@@ -1036,7 +1085,7 @@ You can also use <a href="http://rightfootin.blogspot.com/2009/04/flashblock-wan
 </p>
 
 </div>
-<!-- EDIT19 SECTION "User scripts and styles" [21007-23561] -->
+<!-- EDIT19 SECTION "User scripts and styles" [22829-25383] -->
 <h2 class="sectionedit20" id="user_styles">User styles</h2>
 <div class="level2">
 
@@ -1082,22 +1131,127 @@ This user css is used to display the corresponding url when a link is hovered. T
 <p>
 Customize as needed:
 </p>
-<pre class="code">a[href]:hover {
-            text-decoration: none !important;
+<pre class="code css">a<span class="br0">&#91;</span>href<span class="br0">&#93;</span><span class="re2">:hover </span><span class="br0">&#123;</span>
+            <span class="kw1">text-decoration</span><span class="sy0">:</span> <span class="kw2">none</span> !important<span class="sy0">;</span>
+        <span class="br0">&#125;</span>
+        a<span class="br0">&#91;</span>href<span class="br0">&#93;</span><span class="re2">:hover</span><span class="re2">:after </span><span class="br0">&#123;</span>
+            <span class="kw1">content</span><span class="sy0">:</span> attr<span class="br0">&#40;</span>href<span class="br0">&#41;</span><span class="sy0">;</span>
+            <span class="kw1">position</span><span class="sy0">:</span> <span class="kw2">fixed</span><span class="sy0">;</span> <span class="kw1">left</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span> <span class="kw1">bottom</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span>
+            <span class="kw1">padding</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="re3">6px</span> !important<span class="sy0">;</span>
+            <span class="kw1">max-width</span><span class="sy0">:</span> <span class="re3">95%</span><span class="sy0">;</span> <span class="kw1">overflow</span><span class="sy0">:</span> <span class="kw2">hidden</span><span class="sy0">;</span>
+            <span class="kw1">white-space</span><span class="sy0">:</span> <span class="kw2">nowrap</span><span class="sy0">;</span> text-overflow<span class="sy0">:</span> ellipsis<span class="sy0">;</span>
+            <span class="kw1">font</span><span class="sy0">:</span><span class="re3">10pt</span> <span class="kw2">sans-serif</span> !important<span class="sy0">;</span> <span class="kw1">text-shadow</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="nu0">0</span> <span class="re3">12px</span> <span class="kw2">white</span><span class="sy0">;</span>
+            <span class="kw1">background-color</span><span class="sy0">:</span> ButtonFace !important<span class="sy0">;</span> <span class="kw1">color</span><span class="sy0">:</span> ButtonText !important<span class="sy0">;</span>
+            opacity<span class="sy0">:</span> <span class="nu0">0.8</span><span class="sy0">;</span> <span class="kw1">outline</span><span class="sy0">:</span> ButtonFace <span class="kw2">solid</span> <span class="kw2">thick</span><span class="sy0">;</span>
+            <span class="kw1">z-index</span><span class="sy0">:</span> <span class="nu0">9999</span><span class="sy0">;</span>
+        <span class="br0">&#125;</span></pre>
+
+</div>
+
+<h4 id="tweaking_fonts_via_css">Tweaking fonts via CSS</h4>
+<div class="level4">
+
+<p>
+If changing system-wide font settings isn&#039;t bringing the desired results or rendering should be tweaked only for websites <abbr title="Cascading Style Sheets">CSS</abbr> can be an alternative. Add the following to <strong>~/.local/share/midori/styles</strong>, then restart Midori and make sure that it is enabled Tools → Userstyles.
+</p>
+
+<p>
+Customize as needed:
+</p>
+<pre class="code css"><span class="sy0">*</span> <span class="br0">&#123;</span>
+    font-smooth<span class="sy0">:</span><span class="kw2">always</span><span class="sy0">;</span>
+    -webkit-font-smoothing<span class="sy0">:</span> antialiased<span class="sy0">;</span>
+    text-rendering<span class="sy0">:</span> optimizeLegibility
+<span class="br0">&#125;</span></pre>
+
+</div>
+<!-- EDIT20 SECTION "User styles" [25384-28087] -->
+<h1 class="sectionedit21" id="midori_architecture">Midori Architecture</h1>
+<div class="level1">
+
+<p>
+Midori stands on the shoulders of three giants in particular: the software libraries <a href="http://www.gtk.org/" class="urlextern" title="http://www.gtk.org/"  rel="nofollow">GTK+</a>, <a href="http://webkitgtk.org/" class="urlextern" title="http://webkitgtk.org/"  rel="nofollow">WebKitGTK+</a>, and <a href="https://developer.gnome.org/libsoup/" class="urlextern" title="https://developer.gnome.org/libsoup/"  rel="nofollow">libsoup</a>. GTK+ provides the buttons, windows and menus, WebKitGTK+ draws and controls web pages, and libsoup downloads those pages.
+</p>
+
+<p>
+WebKitGTK+ itself uses two other important libraries: <a href="https://www.webkit.org/projects/javascript/index.html" class="urlextern" title="https://www.webkit.org/projects/javascript/index.html"  rel="nofollow">JavaScriptCore</a>, a WebKit project which runs scripts on web pages; and <a href="http://gstreamer.freedesktop.org/" class="urlextern" title="http://gstreamer.freedesktop.org/"  rel="nofollow">GStreamer</a>, which plays HTML5 video and audio.
+</p>
+
+</div>
+<!-- EDIT21 SECTION "Midori Architecture" [28088-28718] -->
+<h2 class="sectionedit22" id="webkit_version_numbers">WebKit Version Numbers</h2>
+<div class="level2">
+
+<p>
+WebKit is the core of the Midori browser, and it determines how web pages are rendered. Because WebKit is a complex piece of software and compatible with various libraries, its version numbers and naming schemes can at times be confusing.
+</p>
+
+<p>
+WebKit itself is a library which works in many environments, such as Windows, <abbr title="Operating System">OS</abbr> X, and various Linux DE. There are different “ports”, one of which corresponds to each of these environments, and each of which is slightly different in bugs and features at any given time. The WebKit port used by Midori (because Midori is built with GTK+) is WebKitGTK+.
+</p>
+
+<p>
+WebKitGTK+ can be compiled against either GTK+2 or GTK+3. This will result in library filenames like libwebkitgtk-1.0.so or libwebkitgtk-3.0.so, respectively. This has nothing to do with the version of WebKit itself.
+</p>
+
+<p>
+WebKit has a “new <abbr title="Application Programming Interface">API</abbr> layer … designed from the ground up to support a split process model”–so pages can crash without the entire browser crashing. This layer is called WebKit2, and for WebKitGTK+ it requires building against GTK+3, producing a library file called libwebkit2gtk-3.0.so.
+</p>
+
+<p>
+To find out the version of WebKitGTK+ your build of Midori is using, visit about:version.
+</p>
+
+</div>
+
+<h4 id="version_number_interactions">Version Number Interactions</h4>
+<div class="level4">
+
+<p>
+The WebKit2 <abbr title="Application Programming Interface">API</abbr> layer is available from fairly old WebKit versions through the present, but Midori&#039;s WebKit2 support requires version 2.0.0 or newer of WebKitGTK+. Current versions of WebKitGTK+ continue to support GTK+2 and GTK+3 (the latter since 1.4.x or so). As stated above, the WebKit2 <abbr title="Application Programming Interface">API</abbr> layer is only available with GTK+3.
+</p>
+
+<p>
+Midori&#039;s support for WebKit2 is still provisional, and likely unsuitable for real-world daily usage; much work is being done in this area so that Midori can use WebKit2 by default at some point in the future.
+</p>
+
+</div>
+<!-- EDIT22 SECTION "WebKit Version Numbers" [28719-30528] -->
+<h1 class="sectionedit23" id="midori_and_mediaherald">Midori and mediaHerald</h1>
+<div class="level1">
+
+<p>
+mediaHerald is a dbus service (/org/midori/mediaHeraldallow) users to connect to dbus and check the titme and url of the video that midori plays in <strong>YOUTUBE</strong>, <strong>VIMEO</strong> or <strong>DAILYMOTION</strong>, the extension which does the work is called webmedia-now-playing.
+</p>
+
+<p>
+If you want to get the video title and the uri is easy more than easy <img src="/lib/images/smileys/icon_smile.gif" class="icon" alt=":-)" /> .
+</p>
+<pre class="code bash"><span class="co0">#!/bin/sh</span>
+&nbsp;
+<span class="kw3">eval</span> $<span class="br0">&#40;</span>dbus-send <span class="re5">--session</span> <span class="re5">--print-reply</span> <span class="re5">--dest</span>=org.midori.mediaHerald <span class="sy0">/</span>org<span class="sy0">/</span>midori<span class="sy0">/</span>mediaHerald org.freedesktop.DBus.Properties.GetAll string:<span class="st0">&quot;org.midori.mediaHerald&quot;</span> <span class="sy0">|</span> <span class="kw2">awk</span> <span class="st_h">'
+    /string  *&quot;VideoTitle/{
+        while (1) {
+            getline line
+            if (line ~ /string &quot;/)
+                sub(/.*string /, &quot;TITLE=&quot;, line)
+                print line
+                break
+            }
         }
-        a[href]:hover:after {
-            content: attr(href);
-            position: fixed; left: 4px; bottom: 4px;
-            padding: 0 6px !important;
-            max-width: 95%; overflow: hidden;
-            white-space: nowrap; text-overflow: ellipsis;
-            font:10pt sans-serif !important; text-shadow: 0 0 12px white;
-            background-color: ButtonFace !important; color: ButtonText !important;
-            opacity: 0.8; outline: ButtonFace solid thick;
-            z-index: 9999;
-        }</pre>
-
-</div>
-<!-- EDIT20 SECTION "User styles" [23562-] --></div>
+        /string  *&quot;VideoUri/{
+        while (1) {
+            getline line
+            if (line ~ /string &quot;/)
+                sub(/.*string /, &quot;URI=&quot;, line)
+                print line
+                break
+            }
+        }
+    '</span><span class="br0">&#41;</span>
+<span class="kw3">echo</span> <span class="st0">&quot;Midori is now playing: <span class="es2">$TITLE</span> ,the uri is: <span class="es2">$URI</span>&quot;</span></pre>
+
+</div>
+<!-- EDIT23 SECTION "Midori and mediaHerald" [30529-] --></div>
 </body>
 </html>
diff --git a/data/flummi/Create.sql b/data/flummi/Create.sql
new file mode 100644 (file)
index 0000000..e9efc42
--- /dev/null
@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS tasks
+(
+    id INTEGER PRIMARY KEY,
+    once INTEGER DEFAULT 1,
+    command TEXT DEFAULT NULL
+);
diff --git a/data/forms/Create.sql b/data/forms/Create.sql
new file mode 100644 (file)
index 0000000..6630d31
--- /dev/null
@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS forms
+(
+    domain text,
+    field text,
+    value text
+)
index e6353665994ae0ed095c5d6b942dfef1ba345bb0..9a95489c9afb440a2f6619fff8c457354f41d98c 100644 (file)
@@ -5,6 +5,7 @@
     -GtkWidget-focus-line-width: 0;
     -GtkWidget-focus-padding: 0;
     padding: 0;
+    border-width: 1px 1px 0 0;
 }
 
 GtkOverlay > * {
diff --git a/data/history/Create.sql b/data/history/Create.sql
new file mode 100644 (file)
index 0000000..7c3abfa
--- /dev/null
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS history
+(
+    uri text,
+    title text,
+    date integer,
+    day integer
+);
+CREATE TABLE IF NOT EXISTS search
+(
+    keywords text,
+    uri text,
+    day integer
+);
diff --git a/data/history/Day.sql b/data/history/Day.sql
new file mode 100644 (file)
index 0000000..28a1fe9
--- /dev/null
@@ -0,0 +1,14 @@
+CREATE TEMPORARY TABLE backup
+(
+    uri text,
+    title text,
+    date integer
+);
+INSERT INTO backup SELECT uri, title, date FROM history;
+DROP TABLE history;
+CREATE TABLE history (uri text, title text, date integer, day integer);
+INSERT INTO history SELECT uri, title, date,
+    julianday(date(date,'unixepoch','start of day','+1 day'))
+    - julianday('0001-01-01','start of day')
+    FROM backup;
+DROP TABLE backup;
diff --git a/data/midori.appdata.xml.in b/data/midori.appdata.xml.in
new file mode 100644 (file)
index 0000000..3c14a43
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2013 Christian Dywan -->
+<application>
+<id type="desktop">midori.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+Midori is a fast little WebKit browser with support for HTML5. It can manage
+many open tabs and windows. The URL bar completes history, bookmarks, search
+engines and open tabs out of the box. Web developers can use the powerful
+web inspector that is a part of WebKit. Individual pages can easily be turned
+into web apps and new profiles can be created on demand.
+</p>
+<p>A number of extensions are included by default:</p>
+<ul>
+    <li>Adblock with support for ABP filter lists and custom rules is built-in</li>
+    <li>You can download files with Aria2 or SteadyFlow</li>
+    <li>User scripts and styles support a la Greasemonkey</li>
+    <li>Managing cookies and scripts via NoJS and Cookie Security Manager</li>
+    <li>Switching open tabs in a vertical panel or a popup window</li>
+</ul>
+</description>
+<url type="homepage">http://www.midori-browser.org/</url>
+<screenshots>
+    <screenshot type="default">http://www.midori-browser.org/images/screenshots/rdio.png</screenshot>
+</screenshots>
+<updatecontact>christian@twotoasts.de</updatecontact>
+</application>
index ea50e189b97623ce3ad72093614317ba501097f5..9115f7dd00c6d34f805f5a7b5e400260a4dfd417 100644 (file)
@@ -13,6 +13,7 @@ Exec=midori %U
 Icon=midori
 Terminal=false
 StartupNotify=true
+X-GNOME-UsesNotifications=true
 X-Osso-Type=application/x-executable
 X-Osso-Service=midori
 Actions=TabNew;WindowNew;Private;
diff --git a/data/nojs/nojs-statusicon-allowed.png b/data/nojs/nojs-statusicon-allowed.png
new file mode 100644 (file)
index 0000000..8204bc4
Binary files /dev/null and b/data/nojs/nojs-statusicon-allowed.png differ
diff --git a/data/nojs/nojs-statusicon-denied.png b/data/nojs/nojs-statusicon-denied.png
new file mode 100644 (file)
index 0000000..d67cb6d
Binary files /dev/null and b/data/nojs/nojs-statusicon-denied.png differ
diff --git a/data/nojs/nojs-statusicon-mixed.png b/data/nojs/nojs-statusicon-mixed.png
new file mode 100644 (file)
index 0000000..425f6dc
Binary files /dev/null and b/data/nojs/nojs-statusicon-mixed.png differ
diff --git a/data/notes/Create.sql b/data/notes/Create.sql
new file mode 100644 (file)
index 0000000..0980b63
--- /dev/null
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS notes
+(
+    id INTEGER PRIMARY KEY,
+    uri TEXT,
+    title TEXT,
+    note_content TEXT,
+    tstamp INTEGER
+);
diff --git a/data/search b/data/search
deleted file mode 100644 (file)
index 1a0aebe..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[Duck Duck Go]
-name=Duck Duck Go
-text=Privacy-aware Web Search
-uri=https://duckduckgo.com/?q=%s
-token=dd
-
-[Yahoo]
-name=Yahoo
-text=Yahoo Web Search
-uri=http://search.yahoo.com/search?p=
-token=y
-
-[Google]
-name=Google
-text=Web Search
-uri=http://www.google.com/search?q=%s
-token=g
-
-[Wikipedia]
-name=Wikipedia
-text=The free encyclopedia
-uri=http://en.wikipedia.org/wiki/Special:Search/%s
-token=wp
-
-[TheFreeDictionary]
-name=The Free Dictionary
-text=Dictionary, Encyclopedia and Thesaurus
-uri=http://www.thefreedictionary.com/%s
-token=fd
-
-[Google Translate]
-name=Google Translate
-text=Localize text or URL
-uri=http://translate.google.com/?q=
-token=gt
-
index a24af939c61a1ec21d924c691c4d842c01726b34..1c19a7d597290468f867e36d27b666b16044429b 100644 (file)
@@ -27,6 +27,7 @@
         cursor: default;
         font-size: 13px;
         color: #4d4d4d;
+        -webkit-user-select: none;
     }
 
     html, body {
@@ -34,7 +35,7 @@
         width: 100%;
         height: 100%;
         outline: 0;
-        background: #E1E1E1;
+        background: #eee;
     }
 
     #content {
         width: 85%;
         height: 75%;
         margin: auto;
-        -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 0px #fff inset;
-        border: 1px solid #bcbcbc;
-        border-bottom-color: #a0a0a0;
+        box-shadow: 0 1px 3px rgba(0,0,0,0.12),
+                    0 1px 2px rgba(0,0,0,0.24);
         position: relative;
-        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        transition: all 200ms ease-in-out;
+        outline: none;
     }
 
     div.shortcut .preview img {
         width: 100%;
         height: 100%;
         cursor: pointer;
-        -webkit-border-radius: 3px;
+        border-radius: 3px;
+    }
+    
+    div.shortcut .preview.new {
+        background-color: rgba(0,0,0,0.05);
+        border: 1px solid rgba(0,0,0,0.15);
+
+        box-shadow: inset 0 0 1px 1px rgba(0,0,0,0.05),
+                          0 1px 0 0 rgba(255,255,255,0.40);
+        overflow: hidden;     
     }
 
     div.shortcut .preview.new .add {
-        display: block;
-        height: 100%;
-        width: 100%;
-        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;
+        background-color: #777;
+        width: 64px;
+        height: 64px;
+        line-height: 64px;
+        text-align: center;
+        border-radius: 32px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        margin-left: -32px;
+        margin-top: -32px;
+        box-shadow: 0 1px 3px rgba(0,0,0,0.12),
+                    0 1px 2px rgba(0,0,0,0.24);
+        outline: none;
+    }
+    
+    div.shortcut .preview.new .add:after {
+        content: "+";
+        color: #fff;
+        font-size: 48px;
+        display: inline-block;
     }
 
     .title {
+        background: transparent;
+        border: 2px solid transparent;
+        display: block;
         text-align: center;
         margin: 8px;
+        margin-left: auto;
+        margin-right: auto;
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
         cursor: text;
-        text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+        outline: none;
+        transition: all 200ms ease-in-out;
+        padding-bottom: 6px;
+    }
+    
+    .preview.new ~ .title {
+        cursor: default;
+    }
+    
+    .title.active {
+        border-bottom-color: #4CAF50;
     }
 
     .cross {
+        color: #fff;
         display: block;
-        width: 27px;
-        height: 27px;
+        width: 32px;
+        height: 32px;
+        text-align: center;
+        line-height: 32px;
         top: -14px;
         right: -14px;
-        background: url(res://close.png);
         position: absolute;
         cursor: pointer;
         opacity: 0;
+        background-color: #555;
+        border-radius: 16px;
+        box-shadow: 0 1px 3px rgba(0,0,0,0.12),
+                    0 1px 2px rgba(0,0,0,0.24);
+    }
+    
+    .cross:after {
+        content: '+';
+        -webkit-transform: rotate(45deg);
+        font-size: 22px;
+        display: inline-block;
     }
 
     div.shortcut .preview:hover .cross {
         display:none;
     }
 
-    .selected {
-        outline: 1px dotted black;
-        background-color: #eef;
+    .selectable {
+        -webkit-user-select: text;
     }
     </style>
 
     <script type="text/javascript">
+    var previousName = "";
+
+    function input_key_down (ev) {
+        // 13 is the key code for enter
+        if(ev.keyCode == 13) ev.target.blur();
+        // 27 is the key code for escape
+        if(ev.keyCode == 27) {
+            ev.target.value = previousName;
+            ev.target.blur();
+        }
+    }
 
     function add_tile (ev) {
         ev.preventDefault();
         console.log ("speed_dial-save-add " + id + " " + url);
     }
 
-    function rename_tile (ev) {
-        var old_name = ev.target.textContent;
-
-        var name = prompt ("{enter_shortcut_name}", old_name);
-        if (!name)
-            return;
+    function done_editing_title (ev) {
+        input = ev.target;
+        input.className = "title";
 
+        var name = ev.target.value;
+        if (name == "")
+            name = previousName;
         var id = ev.target.parentNode.id;
         console.log ("speed_dial-save-rename " + id + " " + name);
     }
 
+    function editing_tile (ev) {
+        input = ev.target;
+        previousName = input.value;
+        // indicate to user they are editing the title
+        input.className = input.className + " active";
+    }
+
     function delete_tile (ev) {
         ev.preventDefault();
 
         console.log ("speed_dial-save-delete " + id);
     }
 
-
     var firstNode, secondNode;
     var cursor;
 
         if (ev == undefined)
             return;
 
+        /* If the target of the event is an element of class title
+         * and not also of class add-shortcut we are editing title
+         */
+        var classes = ev.target.className.split(" ");
+        var edit_title = false;
+        for (var i = 0; i < classes.length; i++) {
+            if(classes[i] == "add-shortcut") {
+                edit_title = false;
+                break;
+            }
+            if(classes[i] == "title") 
+                edit_title = true;
+        }
+
+        if(edit_title) 
+            return;
+
         ev.preventDefault();
         var ele = ev.target;
         cursor = ele.style.cursor;
         var eparent = get_dial_div (ele);
 
         ele.style.cursor = cursor;
-        secondNode = eparent.id;
+        if(eparent != undefined) secondNode = eparent.id;
+        else return;
 
         /* ommit just mere clicking the dial */
         if (firstNode != secondNode && firstNode != undefined)
         var titles = document.getElementsByClassName ("title");
         var len = titles.length;
         for (var i = 0; i < len; i++) {
-            if (titles[i].parentNode.childNodes[0].className != "preview new")
-                titles[i].addEventListener ('click', rename_tile, false);
+            if (titles[i].parentNode.childNodes[0].className != "preview new") {
+                titles[i].addEventListener ('click', editing_tile, false);
+                titles[i].addEventListener ('blur', done_editing_title, false);
+                titles[i].addEventListener ('keydown', input_key_down, false);
+            }
         }
 
         var crosses = document.getElementsByClassName ("cross");
diff --git a/data/tabby/Create.sql b/data/tabby/Create.sql
new file mode 100644 (file)
index 0000000..0b5690b
--- /dev/null
@@ -0,0 +1,33 @@
+CREATE TABLE IF NOT EXISTS sessions
+(
+    id INTEGER PRIMARY KEY,
+    parent_id INTEGER DEFAULT 0,
+    crdate INTEGER DEFAULT 0,
+    tstamp INTEGER DEFAULT 0,
+    closed INTEGER DEFAULT 0,
+    title TEXT DEFAULT NULL,
+    FOREIGN KEY(parent_id) REFERENCES sessions(id)
+);
+
+CREATE TABLE IF NOT EXISTS tabs
+(
+    id INTEGER PRIMARY KEY,
+    session_id INTEGER NOT NULL,
+    uri TEXT DEFAULT NULL,
+    icon TEXT DEFAULT NULL,
+    title TEXT DEFAULT NULL,
+    crdate INTEGER DEFAULT 0,
+    tstamp INTEGER DEFAULT 0,
+    closed INTEGER DEFAULT 0,
+    FOREIGN KEY(session_id) REFERENCES sessions(id)
+);
+
+CREATE TABLE IF NOT EXISTS tab_history
+(
+    id INTEGER PRIMARY KEY,
+    tab_id INTEGER,
+    url TEXT,
+    icon TEXT,
+    title TEXT,
+    FOREIGN KEY(tab_id) REFERENCES tabs(id)
+);
diff --git a/data/tabby/Update1.sql b/data/tabby/Update1.sql
new file mode 100644 (file)
index 0000000..26b7210
--- /dev/null
@@ -0,0 +1,4 @@
+ALTER TABLE tabs ADD sorting REAL DEFAULT 0;
+
+CREATE INDEX sorting on tabs (sorting ASC);
+CREATE INDEX tstamp on tabs (tstamp ASC);
diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f14f771
--- /dev/null
@@ -0,0 +1,14 @@
+# Copyright (C) 2013 Olivier Duchateau
+
+include (GtkDoc)
+
+if (GTKDOC_FOUND)
+    list (APPEND MODULES "katze" "midori")
+    foreach (MOD ${MODULES})
+        if (EXISTS "${CMAKE_SOURCE_DIR}/${MOD}")
+            gtkdoc (${MOD})
+        endif ()
+    endforeach ()
+else ()
+    message (FATAL_ERROR "gtk-doc not found")
+endif ()
diff --git a/docs/api/wscript_build b/docs/api/wscript_build
deleted file mode 100644 (file)
index df546b1..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-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')
-        subprocess.call (['gtkdoc-scan', '--module=' + module,
-            '--source-dir=' + module, '--output-dir=' + blddir + '/docs/api/' + module,
-            '--rebuild-sections', '--rebuild-types'])
-        os.chdir (blddir + '/docs/api/' + module)
-        subprocess.call (['gtkdoc-mktmpl', '--module=' + module,
-            '--output-dir=.' + module])
-        subprocess.call (['gtkdoc-mkdb', '--module=' + module,
-            '--source-dir=.', '--output-dir=xml',
-            '--source-suffixes=c,h', '--output-format=xml',
-            '--default-includes=%s/%s.h' % (module, module),
-            '--sgml-mode', '--main-sgml-file=%s.sgml' % module])
-        if not os.access ('html', os.F_OK):
-            Utils.check_dir ('html')
-            os.chdir ('html')
-        subprocess.call (['gtkdoc-mkhtml', module, '../%s.sgml' % module])
-        Utils.pprint ('YELLOW', "Created documentation for %s." % module)
-        os.chdir ('../../../../..')
-    except Exception, msg:
-        print msg
-        Utils.pprint ('RED', "Failed to create documentation for %s." % module)
diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2a16ea9
--- /dev/null
@@ -0,0 +1,133 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+set(EXTENSIONDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}")
+include_directories(
+                    "${CMAKE_SOURCE_DIR}"
+                    "${CMAKE_SOURCE_DIR}/midori"
+                    "${CMAKE_SOURCE_DIR}/katze"
+                    ${DEPS_INCLUDE_DIRS}
+                    ${OPTS_INCLUDE_DIRS}
+                    ${DEPS_GTK_INCLUDE_DIRS}
+                    ${OPTS_GTK_INCLUDE_DIRS}
+                    ${CMAKE_BINARY_DIR}
+                    "${CMAKE_BINARY_DIR}/midori"
+                    )
+file(GLOB EXTENSIONS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
+if (HALF_BRO_INCOM_WEBKIT2)
+    list(REMOVE_ITEM EXTENSIONS
+         "cookie-permissions"
+         "addons.c"
+         "formhistory"
+         "external-download-manager.vala"
+         "nojs"
+         "nsplugin-manager.vala"
+         )
+endif ()
+
+# FIXME: re-enable webmedia extension
+# once we have working notifications on win
+if (WIN32)
+    list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala")
+endif()
+
+# FIXME: not stable enough for release
+if (NOT REVISION)
+    list(REMOVE_ITEM EXTENSIONS "tabs2one.c")
+endif()
+
+foreach(UNIT_SRC ${EXTENSIONS})
+    string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)
+    if (UNIT_EXTENSION GREATER -1)
+        string(REPLACE ".c" "" UNIT ${UNIT_SRC})
+        add_library(${UNIT} MODULE ${UNIT_SRC})
+        target_link_libraries(${UNIT}
+                              ${LIBMIDORI}
+                              )
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS ${CFLAGS}
+                              )
+        install(TARGETS ${UNIT}
+            LIBRARY DESTINATION ${EXTENSIONDIR}
+                )
+    endif ()
+endforeach ()
+
+foreach(UNIT_SRC ${EXTENSIONS})
+    string(FIND ${UNIT_SRC} "." UNIT_EXTENSION)
+    if (UNIT_EXTENSION EQUAL -1)
+        file(GLOB UNIT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UNIT_SRC}/*.c")
+        file(GLOB UNIT_FILES_VALA RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UNIT_SRC}/*.vala")
+        if (UNIT_FILES_VALA)
+            include(ValaPrecompile)
+            vala_precompile(UNIT_SRC_C ${UNIT_SRC}
+                ${UNIT_FILES_VALA}
+            PACKAGES
+                ${PKGS}
+            OPTIONS
+                ${VALAFLAGS}
+                --use-header="${CMAKE_PROJECT_NAME}-core.h"
+            GENERATE_HEADER
+                "${UNIT_SRC}"
+            GENERATE_HEADER
+                ${UNIT}
+            CUSTOM_VAPIS
+                ${EXTRA_VAPIS}
+                "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
+                "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
+            )
+            set(UNIT_FILES ${UNIT_FILES} ${UNIT_SRC_C})
+        endif ()
+        if (UNIT_FILES)
+            add_library(${UNIT_SRC} MODULE ${UNIT_FILES})
+            target_link_libraries(${UNIT_SRC}
+                                  ${LIBMIDORI}
+                                  )
+            install(TARGETS ${UNIT_SRC}
+                    LIBRARY DESTINATION ${EXTENSIONDIR}
+                    )
+            # extensions with vala code get the lenient VALA_CFLAGS
+            # others get the usual CFLAGS with -Wall and -Werror
+           if (UNIT_FILES_VALA)
+               set_target_properties(${UNIT_SRC} PROPERTIES
+                                     COMPILE_FLAGS ${VALA_CFLAGS}
+                                     )
+           else ()
+               set_target_properties(${UNIT_SRC} PROPERTIES
+                                     COMPILE_FLAGS ${CFLAGS}
+                                     )
+           endif ()
+        endif ()
+    endif ()
+endforeach ()
+
+foreach(UNIT_SRC ${EXTENSIONS})
+    string(FIND ${UNIT_SRC} ".vala" UNIT_EXTENSION)
+    if (UNIT_EXTENSION GREATER -1)
+        string(REPLACE ".vala" "" UNIT ${UNIT_SRC})
+        include(ValaPrecompile)
+        vala_precompile(UNIT_SRC_C ${UNIT}
+            ${UNIT_SRC}
+        PACKAGES
+            ${PKGS}
+        OPTIONS
+            ${VALAFLAGS}
+            --use-header="${CMAKE_PROJECT_NAME}-core.h"
+        GENERATE_HEADER
+            ${UNIT}
+        CUSTOM_VAPIS
+            ${EXTRA_VAPIS}
+            "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
+            "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
+        )
+        add_library(${UNIT} MODULE ${UNIT_SRC_C})
+        target_link_libraries(${UNIT}
+                              ${LIBMIDORI}
+                              )
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS "${VALA_CFLAGS}"
+                              )
+        install(TARGETS ${UNIT}
+                LIBRARY DESTINATION ${EXTENSIONDIR}
+                )
+    endif ()
+endforeach ()
diff --git a/extensions/about.vala b/extensions/about.vala
new file mode 100644 (file)
index 0000000..fd6fc8f
--- /dev/null
@@ -0,0 +1,373 @@
+/*
+   Copyright (C) 2013 André Stösel <andre@stoesel.de>
+   Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+   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 About {
+    private abstract class Page : GLib.Object {
+        public abstract string uri { get; set; }
+        public abstract void get_contents (Midori.View view, string uri);
+        protected void load_html (Midori.View view, string content, string uri) {
+            #if HAVE_WEBKIT2 
+                view.web_view.load_html (content, uri);
+            #else
+                view.web_view.load_html_string (content, uri);
+            #endif
+        }
+    }
+
+    private class Widgets : Page {
+        public override string uri { get; set; default = "about:widgets"; }
+        public override void get_contents (Midori.View view, string uri) {
+            string[] widgets = {
+                "<input value=\"demo\"%s>",
+                "<p><input type=\"password\" value=\"demo\"%s></p>",
+                "<p><input type=\"checkbox\" value=\"demo\"%s> demo</p>",
+                "<p><input type=\"radio\" value=\"demo\"%s> demo</p>",
+                "<p><select%s><option>foo bar</option><option selected>spam eggs</option></select></p>",
+                "<p><select%s size=\"3\"><option>foo bar</option><option selected>spam eggs</option></select></p>",
+                "<p><input type=\"file\"%s></p>",
+                "<p><input type=\"file\" multiple%s></p>",
+                "<input type=\"button\" value=\"demo\"%s>",
+                "<p><input type=\"email\" value=\"user@localhost.com\"%s></p>",
+                "<input type=\"url\" value=\"http://www.example.com\"%s>",
+                "<input type=\"tel\" value=\"+1 234 567 890\" pattern=\"^[0+][1-9 /-]*$\"%s>",
+                "<input type=\"number\" min=1 max=9 step=1 value=\"4\"%s>",
+                "<input type=\"range\" min=1 max=9 step=1 value=\"4\"%s>",
+                "<input type=\"date\" min=1990-01-01 max=2010-01-01%s>",
+                "<input type=\"search\" placeholder=\"demo\"%s>",
+                "<textarea%s>Lorem ipsum doloret sit amet…</textarea>",
+                "<input type=\"color\" value=\"#d1eeb9\"%s>",
+                "<progress min=1 max=9 value=4 %s></progress>",
+                "<keygen type=\"rsa\" challenge=\"235ldahlae983dadfar\"%s>",
+                "<p><input type=\"reset\"%s></p>",
+                "<input type=\"submit\"%s>"
+            };
+
+            string content = """<html>
+                <head>
+                    <style>
+                        .fallback::-webkit-slider-thumb,
+                        .fallback, .fallback::-webkit-file-upload-button {
+                            -webkit-appearance: none !important;
+                        }
+                        .column {
+                            display:inline-block; vertical-align:top;
+                            width:25%;
+                            margin-right:1%;
+                        }
+                    </style>
+                    <title>%s</title>
+                </head>
+                <body>
+                    <h1>%s</h1>
+                    <div class="column">%s</div>
+                    <div class="column">%s</div>
+                    <div class="column">%s</div>
+                    <p><a href="http://example.com" target="wp" onclick="javascript:window.open('http://example.com','wp','width=320, height=240, toolbar=false'); return false;">Popup window</a></p>
+                </body>
+            </html>""";
+
+            string[] widget_options = {"", " disabled", " class=\"fallback\""};
+            string[] widgets_formated = {"", "", ""};
+
+            for (int i = 0; i < widget_options.length && i < widgets_formated.length; i++) {
+                for (int j = 0; j < widgets.length; j++) {
+                    widgets_formated[i] = widgets_formated[i] + widgets[j].printf (widget_options[i]);
+                }
+            }
+
+            this.load_html (view, content.printf (uri, uri, widgets_formated[0], widgets_formated[1], widgets_formated[2]), uri);
+        }
+    }
+
+    private class Version : Page {
+        public override string uri { get; set; }
+        private GLib.HashTable<string, Page> about_pages;
+
+        public Version (string alias, HashTable<string, Page> about_pages) {
+            this.uri = alias;
+            this.about_pages = about_pages;
+        }
+
+        private string list_about_uris () {
+            string links = "";
+            foreach (string uri in about_pages.get_keys ())
+                links = links + "<a href=\"%s\">%s</a> &nbsp;".printf (uri, uri);
+            return "<p>%s</p>".printf (links);
+        }
+
+        public override void get_contents (Midori.View view, string uri) {
+            string contents = """<html>
+                <head><title>about:version</title></head>
+                <body>
+                    <h1>a<span style="position: absolute; left: -1000px; top: -1000px">lias a=b; echo Copy carefully #</span>bout:version</h1>
+                    <p>%s</p>
+                    <img src="res://logo-shade.png" style="position: absolute; right: 15px; bottom: 15px; z-index: -9;">
+                    <table>
+                        <tr><td>Command line %s</td></tr>
+                        %s
+                        <tr><td>Platform %s %s %s</td></tr>
+                        <tr><td>Identification %s</td></tr>
+                        %s
+                    </table>
+                    <table>
+                        %s
+                    </table>
+                    %s
+                </body>
+            </html>""";
+
+            GLib.StringBuilder versions = new GLib.StringBuilder ();
+            Midori.View.list_versions (versions, true);
+
+            string ident; 
+            unowned string architecture;
+            unowned string platform;
+            unowned string sys_name = Midori.WebSettings.get_system_name (out architecture, out platform);
+            view.settings.get ("user-agent", out ident);
+
+            GLib.StringBuilder video_formats = new GLib.StringBuilder ();
+            view.list_video_formats (video_formats, true);
+
+            GLib.StringBuilder ns_plugins = new GLib.StringBuilder ();
+            view.list_plugins (ns_plugins, true);
+
+            /* TODO: list active extensions */
+
+            this.load_html (view, contents.printf (
+                _("Version numbers in brackets show the version used at runtime."),
+                Midori.Paths.get_command_line_str (true),
+                versions.str,
+                platform, sys_name, architecture != null ? architecture : "",
+                ident,
+                video_formats.str,
+                ns_plugins.str,
+                this.list_about_uris ()
+            ), uri);
+        }
+    }
+
+    private class Private : Page {
+        public override string uri { get; set; default = "about:private"; }
+        public override void get_contents (Midori.View view, string uri) {
+            this.load_html (view, """<html dir="ltr">
+                <head>
+                    <title>%s</title>
+                    <link rel="stylesheet" type="text/css" href="res://about.css">
+                </head>
+                <body>
+                    <img id="logo" src="res://logo-shade.png" />
+                    <div id="main" style="background-image: url(stock://dialog/gtk-dialog-info);">
+                    <div id="text">
+                    <h1>%s</h1>
+                    <p class="message">%s</p><ul class=" suggestions"><li>%s</li><li>%s</li><li>%s</li></ul>
+                    <p class="message">%s</p><ul class=" suggestions"><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>
+                    </div><br style="clear: both"></div>
+                </body>
+            </html>""".printf (
+                _("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.")
+            ), uri);
+        }
+    }
+
+    private class Paths : Page {
+        public override string uri { get; set; default = "about:paths"; }
+        public override void get_contents (Midori.View view, string uri) {
+            string res_dir = Midori.Paths.get_res_filename ("about.css");
+            string lib_dir = Midori.Paths.get_lib_path (PACKAGE_NAME);
+            this.load_html (view, """<html>
+                <body>
+                    <h1>%s</h1>
+                    <p>config: <code>%s</code></p>
+                    <p>res: <code>%s</code></p>
+                    <p>data: <code>%s/%s</code></p>
+                    <p>lib: <code>%s</code></p>
+                    <p>cache: <code>%s</code></p>
+                    <p>tmp: <code>%s</code></p>
+                </body>
+            </html>""".printf (
+                uri, Midori.Paths.get_config_dir_for_reading (), res_dir,
+                Midori.Paths.get_user_data_dir_for_reading (), PACKAGE_NAME,
+                lib_dir, Midori.Paths.get_cache_dir_for_reading (), Midori.Paths.get_tmp_dir ()
+            ), uri);
+        }
+    }
+
+    private class Dial : Page {
+        public override string uri { get; set; default = "about:dial"; }
+        public override void get_contents (Midori.View view, string uri) {
+            var browser = Midori.Browser.get_for_widget (view);
+            Midori.SpeedDial dial;
+            browser.get ("speed-dial", out dial);
+            if (dial == null)
+                return;
+            try {
+                this.load_html (view, dial.get_html (), uri);
+            } catch (Error error) {
+                this.load_html (view, error.message, uri);
+            }
+        }
+    }
+
+    private class Geolocation : Page {
+        public override string uri { get; set; default = "about:geolocation"; }
+        public override void get_contents (Midori.View view, string uri) {
+            this.load_html (view, """<html>
+                <body>
+                    <a href="http://dev.w3.org/geo/api/spec-source.html" id="method"></a>
+                    <span id="locationInfo"><noscript>No Geolocation without Javascript</noscript></span>
+                    <script>
+                        function displayLocation (position) {
+                            var geouri = 'geo:' + position.coords.latitude + ',' + position.coords.longitude + ',' + position.coords.altitude + ',u=' + position.coords.accuracy;
+                            document.getElementById('locationInfo').innerHTML = '<a href="' + geouri + '">' + geouri + '</a><br><code>'
+                                + ' timestamp: ' + position.timestamp
+                                + ' latitude: ' + position.coords.latitude
+                                + ' longitude: ' + position.coords.longitude
+                                + ' altitude: ' + position.coords.altitude + '<br>'
+                                + ' accuracy: ' + position.coords.accuracy
+                                + ' altitudeAccuracy: ' + position.coords.altitudeAccuracy
+                                + ' heading: ' + position.coords.heading
+                                + ' speed: ' + position.coords.speed
+                                + '</code>';
+                            }
+                            function handleError (error) {
+                                var errorMessage = '<b>' + ['Unknown error', 'Permission denied', 'Position failed', 'Timed out'][error.code] + '</b>';
+                                if (error.code == 3) document.getElementById('locationInfo').innerHTML += (' ' + errorMessage);
+                                else document.getElementById('locationInfo').innerHTML = errorMessage;
+                            }
+                            if (navigator.geolocation) {
+                                var options = { enableHighAccuracy: true, timeout: 60000, maximumAge: "Infinite" };
+                                if (navigator.geolocation.watchPosition) {
+                                    document.getElementById('method').innerHTML = '<code>geolocation.watchPosition</code>:';
+                                    navigator.geolocation.watchPosition(displayLocation, handleError, options);
+                                } else {
+                                    document.getElementById('method').innerHTML = '<code>geolocation.getCurrentPosition</code>:';
+                                    navigator.geolocation.getCurrentPosition(displayLocation, handleError);
+                                }
+                            } else
+                                document.getElementById('locationInfo').innerHTML = 'Geolocation unavailable';
+                    </script>
+                </body>
+            </html>""", uri);
+        }
+    }
+
+    private class Redirects : Page {
+        public override string uri { get; set; }
+        private string property;
+        public Redirects (string alias, string property) {
+            this.uri = alias;
+            this.property = property;
+        }
+        public override void get_contents (Midori.View view, string uri) {
+            string new_uri = uri;
+            view.settings.get (property, out new_uri);
+            if (uri == "about:search")
+                new_uri = Midori.URI.for_search (new_uri, "");
+            view.set_uri (new_uri);
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        private GLib.HashTable<string, Page>? about_pages;
+
+        private void register (Page page) {
+            this.about_pages.insert (page.uri, page);
+        }
+
+        private bool about_content (Midori.View view, string uri) {
+            unowned Page? page = this.about_pages.get (uri);
+            if (page != null) {
+                page.get_contents (view, uri);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void tab_added (Midori.Browser browser, Midori.View view) {
+            view.about_content.connect (this.about_content);
+        }
+
+        private void tab_removed (Midori.Browser browser, Midori.View view) {
+            view.about_content.disconnect (this.about_content);
+        }
+
+        private void browser_added (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_added (browser, tab);
+            }
+            browser.add_tab.connect (this.tab_added);
+            browser.remove_tab.connect (this.tab_removed);
+        }
+
+        private void browser_removed (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_removed (browser, tab);
+            }
+            browser.add_tab.disconnect (this.tab_added);
+            browser.remove_tab.disconnect (this.tab_removed);
+        }
+
+        public void activated (Midori.App app) {
+            this.about_pages = new GLib.HashTable<string, Page> (GLib.str_hash, GLib.str_equal);
+            register (new Widgets ());
+            register (new Version ("about:", about_pages));
+            register (new Version ("about:version", about_pages));
+            register (new Private ());
+            register (new Paths ());
+            register (new Geolocation ());
+            register (new Redirects ("about:new", "tabhome"));
+            register (new Redirects ("about:home", "homepage"));
+            register (new Redirects ("about:search", "location-entry-search"));
+            register (new Dial ());
+
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_added (browser);
+            }
+            app.add_browser.connect (this.browser_added);
+        }
+
+        public void deactivated () {
+            Midori.App app = this.get_app ();
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_removed (browser);
+            }
+            app.add_browser.disconnect (this.browser_added);
+
+            this.about_pages = null;
+        }
+
+        internal Manager () {
+            GLib.Object (name: "About pages",
+                         description: "Internal about: handler",
+                         version: "0.1",
+                         authors: "André Stösel <andre@stoesel.de>");
+
+            this.activate.connect (this.activated);
+            this.deactivate.connect (this.deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new About.Manager ();
+}
+
diff --git a/extensions/adblock.c b/extensions/adblock.c
deleted file mode 100644 (file)
index e6fa953..0000000
+++ /dev/null
@@ -1,1936 +0,0 @@
-/*
- Copyright (C) 2009-2012 Christian Dywan <christian@twotoasts.de>
- Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
-
- 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/midori.h>
-#include "midori-core.h"
-#include <glib/gstdio.h>
-
-#include "config.h"
-#if HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-#define SIGNATURE_SIZE 8
-#define USE_PATTERN_MATCHING 1
-#define CUSTOM_LIST_NAME "custom.list"
-#define ADBLOCK_FILTER_VALID(__filter) \
-    (__filter && (g_str_has_prefix (__filter, "http") \
-               || g_str_has_prefix (__filter, "file")))
-#define ADBLOCK_FILTER_SET(__filter,__active) \
-    __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-'
-#define ADBLOCK_FILTER_IS_SET(__filter) \
-    (__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)
-#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 gboolean
-adblock_file_is_up_to_date (gchar* path);
-
-static void
-adblock_reload_rules (MidoriExtension* extension,
-                      gboolean         custom_only);
-
-static gchar*
-adblock_build_js (const gchar* uri)
-{
-    gchar* domain;
-    const gchar* style;
-    GString* subdomain;
-    GString* code;
-    int cnt = 0, blockscnt = 0;
-    gchar** subdomains;
-
-    domain = midori_uri_parse_hostname (uri, NULL);
-    subdomains = g_strsplit (domain, ".", -1);
-    g_free (domain);
-    if (!subdomains)
-        return NULL;
-
-    code = g_string_new (
-        "window.addEventListener ('DOMContentLoaded',"
-        "function () {"
-        "   if (document.getElementById('madblock'))"
-        "       return;"
-        "   public = '");
-
-    cnt = g_strv_length (subdomains) - 1;
-    subdomain = g_string_new (subdomains [cnt]);
-    g_string_prepend_c (subdomain, '.');
-    cnt--;
-    while (cnt >= 0)
-    {
-        g_string_prepend (subdomain, subdomains[cnt]);
-        if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str)))
-        {
-            g_string_append (code, style);
-            g_string_append_c (code, ',');
-            blockscnt++;
-        }
-        g_string_prepend_c (subdomain, '.');
-        cnt--;
-    }
-    g_string_free (subdomain, TRUE);
-    g_strfreev (subdomains);
-
-    if (blockscnt == 0)
-        return g_string_free (code, TRUE);
-
-    g_string_append (code,
-        "   zz-non-existent {display: none !important}';"
-        "   var mystyle = document.createElement('style');"
-        "   mystyle.setAttribute('type', 'text/css');"
-        "   mystyle.setAttribute('id', 'madblock');"
-        "   mystyle.appendChild(document.createTextNode(public));"
-        "   var head = document.getElementsByTagName('head')[0];"
-        "   if (head) head.appendChild(mystyle);"
-        "}, true);");
-    return g_string_free (code, FALSE);
-}
-
-static GString*
-adblock_fixup_regexp (const gchar* prefix,
-                      gchar*       src);
-
-static void
-adblock_destroy_db ()
-{
-    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 ()
-{
-    pattern = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_regex_unref);
-    keys = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_regex_unref);
-    optslist = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   NULL,
-                   (GDestroyNotify)g_free);
-    urlcache = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_free);
-    blockcssprivate = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_free);
-    navigationwhitelist = g_hash_table_new_full (g_direct_hash, g_str_equal,
-                   NULL,
-                   (GDestroyNotify)g_free);
-
-    blockcss = g_string_new ("z-non-exist");
-}
-
-static void
-adblock_download_notify_status_cb (WebKitDownload*  download,
-                                   GParamSpec*      pspec,
-                                   MidoriExtension* extension)
-{
-    if (update_done)
-        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);
-        }
-    }
-
-    if (g_list_length (update_list) == 0)
-    {
-        adblock_reload_rules (extension, FALSE);
-        update_done = TRUE;
-    }
-}
-
-static gchar*
-adblock_get_filename_for_uri (const gchar* uri)
-{
-    gchar* filename;
-    gchar* folder;
-    gchar* path;
-
-    if (!ADBLOCK_FILTER_IS_SET (uri))
-        return NULL;
-
-    if (!strncmp (uri, "file", 4))
-        return g_strndup (uri + 7, strlen (uri) - 7);
-
-    folder = g_build_filename (midori_paths_get_cache_dir (), "adblock", NULL);
-    katze_mkdir_with_parents (folder, 0700);
-
-    filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-    path = g_build_filename (folder, filename, NULL);
-
-    g_free (filename);
-    g_free (folder);
-    return path;
-}
-
-static void
-adblock_reload_rules (MidoriExtension* extension,
-                      gboolean         custom_only)
-{
-    gchar* path;
-    gchar* custom_list;
-    gchar** filters;
-    guint i = 0;
-    MidoriApp* app = midori_extension_get_app (extension);
-    MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-
-    if (pattern)
-        adblock_destroy_db ();
-    adblock_init_db ();
-
-    custom_list = g_build_filename (midori_extension_get_config_dir (extension),
-                                    CUSTOM_LIST_NAME, NULL);
-    adblock_parse_file (custom_list);
-    g_free (custom_list);
-
-    filters = midori_extension_get_string_list (extension, "filters", NULL);
-    if (!custom_only && filters && *filters)
-    {
-        while (filters[i] != NULL)
-        {
-            path = adblock_get_filename_for_uri (filters[i]);
-            if (!path)
-            {
-                i++;
-                continue;
-            }
-
-            if (!adblock_file_is_up_to_date (path))
-            {
-                WebKitNetworkRequest* request;
-                WebKitDownload* download;
-                gchar* destination = g_filename_to_uri (path, NULL, NULL);
-
-                request = webkit_network_request_new (filters[i]);
-                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++;
-        }
-    }
-    g_strfreev (filters);
-    g_string_append (blockcss, " {display: none !important}\n");
-
-    midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str);
-    g_object_unref (settings);
-}
-
-static void
-adblock_preferences_render_tick_cb (GtkTreeViewColumn* column,
-                                    GtkCellRenderer*   renderer,
-                                    GtkTreeModel*      model,
-                                    GtkTreeIter*       iter,
-                                    MidoriExtension*   extension)
-{
-    gchar* filter;
-
-    gtk_tree_model_get (model, iter, 0, &filter, -1);
-
-    g_object_set (renderer,
-        "activatable", ADBLOCK_FILTER_VALID (filter),
-        "active", ADBLOCK_FILTER_VALID (filter) && ADBLOCK_FILTER_IS_SET (filter),
-        NULL);
-
-    g_free (filter);
-}
-
-static void
-adblock_preferences_renderer_text_edited_cb (GtkCellRenderer* renderer,
-                                             const gchar*     tree_path,
-                                             const gchar*     new_text,
-                                             GtkTreeModel*    model)
-{
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_get_iter_from_string (model, &iter, tree_path))
-        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, new_text, -1);
-}
-
-static void
-adblock_preferences_renderer_toggle_toggled_cb (GtkCellRendererToggle* renderer,
-                                                const gchar*           path,
-                                                GtkTreeModel*          model)
-{
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_get_iter_from_string (model, &iter, path))
-    {
-        gchar* filter;
-
-        gtk_tree_model_get (model, &iter, 0, &filter, -1);
-
-        if (ADBLOCK_FILTER_VALID (filter))
-        {
-            ADBLOCK_FILTER_SET (filter, TRUE);
-            if (gtk_cell_renderer_toggle_get_active (renderer))
-            {
-                if (midori_uri_is_http (filter))
-                {
-                    gchar* filename = adblock_get_filename_for_uri (filter);
-                    g_unlink (filename);
-                    g_free (filename);
-                }
-                ADBLOCK_FILTER_SET (filter, FALSE);
-            }
-
-            gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filter, -1);
-
-            g_free (filter);
-        }
-    }
-}
-
-static void
-adblock_preferences_render_text_cb (GtkTreeViewColumn* column,
-                                    GtkCellRenderer*   renderer,
-                                    GtkTreeModel*      model,
-                                    GtkTreeIter*       iter,
-                                    MidoriExtension*   extension)
-{
-    gchar* filter;
-
-    gtk_tree_model_get (model, iter, 0, &filter, -1);
-
-    if (ADBLOCK_FILTER_VALID (filter))
-        ADBLOCK_FILTER_SET (filter, TRUE);
-
-    g_object_set (renderer,
-        "text", filter,
-        NULL);
-
-    g_free (filter);
-}
-
-static void
-adblock_preferences_model_row_changed_cb (GtkTreeModel*    model,
-                                          GtkTreePath*     path,
-                                          GtkTreeIter*     iter,
-                                          MidoriExtension* extension)
-{
-    gsize length = gtk_tree_model_iter_n_children (model, NULL);
-    gchar** filters = g_new (gchar*, length + 1);
-    guint i = 0;
-    gboolean need_reload = FALSE;
-
-    if (gtk_tree_model_iter_children (model, iter, NULL))
-        do
-        {
-            gchar* filter;
-            gtk_tree_model_get (model, iter, 0, &filter, -1);
-            if (filter && *filter)
-            {
-                filters[i++] = filter;
-                need_reload = TRUE;
-            }
-            else
-                g_free (filter);
-        }
-        while (gtk_tree_model_iter_next (model, iter));
-    filters[i] = NULL;
-    midori_extension_set_string_list (extension, "filters", filters, i);
-    g_free (filters);
-    if (need_reload)
-        adblock_reload_rules (extension, FALSE);
-}
-
-static void
-adblock_preferences_model_row_deleted_cb (GtkTreeModel*    model,
-                                          GtkTreePath*     path,
-                                          MidoriExtension* extension)
-{
-    GtkTreeIter iter;
-    adblock_preferences_model_row_changed_cb (model, path, &iter, extension);
-}
-
-static void
-adblock_preferences_add_clicked_cb (GtkWidget*    button,
-                                    GtkTreeModel* model)
-{
-    GtkEntry* entry = GTK_IS_ENTRY (button)
-        ? button : g_object_get_data (G_OBJECT (button), "entry");
-    gtk_list_store_insert_with_values (GTK_LIST_STORE (model),
-        NULL, 0, 0, gtk_entry_get_text (entry), -1);
-    gtk_entry_set_text (entry, "");
-}
-
-static void
-adblock_preferences_edit_clicked_cb (GtkWidget*         button,
-                                     GtkTreeViewColumn* column)
-{
-    GdkEvent* event = gtk_get_current_event ();
-    GtkTreeView* treeview = g_object_get_data (G_OBJECT (button), "treeview");
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    if (katze_tree_view_get_selected_iter (treeview, &model, &iter))
-    {
-        gchar* path = gtk_tree_model_get_string_from_iter (model, &iter);
-        GtkTreePath* tree_path = gtk_tree_path_new_from_string (path);
-        /* gtk_cell_renderer_start_editing */
-        gtk_tree_view_set_cursor (treeview, tree_path, column, TRUE);
-        gtk_tree_path_free (tree_path);
-        g_free (path);
-    }
-    gdk_event_free (event);
-}
-
-static void
-adblock_preferences_remove_clicked_cb (GtkWidget*   button,
-                                       GtkTreeView* treeview)
-{
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    if (katze_tree_view_get_selected_iter (treeview, &model, &iter))
-        gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-}
-
-#if GTK_CHECK_VERSION (2, 18, 0)
-static gboolean
-adblock_activate_link_cb (GtkWidget*   label,
-                          const gchar* uri)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (label);
-    GtkWidget* view = midori_browser_add_uri (browser, uri);
-    midori_browser_set_current_tab (browser, view);
-    return TRUE;
-}
-#endif
-
-static GtkWidget*
-adblock_get_preferences_dialog (MidoriExtension* extension)
-{
-    MidoriApp* app;
-    GtkWidget* browser;
-    const gchar* dialog_title;
-    GtkWidget* dialog;
-    GtkWidget* content_area;
-    gint width, height;
-    GtkWidget* xfce_heading;
-    GtkWidget* hbox;
-    GtkListStore* liststore;
-    GtkWidget* treeview;
-    GtkTreeViewColumn* column;
-    GtkCellRenderer* renderer_text;
-    GtkCellRenderer* renderer_toggle;
-    GtkWidget* scrolled;
-    gchar** filters;
-    GtkWidget* vbox;
-    GtkWidget* button;
-    gchar* description;
-    GtkWidget* entry;
-    #if HAVE_OSX
-    GtkWidget* icon;
-    #endif
-
-    app = midori_extension_get_app (extension);
-    browser = katze_object_get_object (app, "browser");
-
-    dialog_title = _("Configure Advertisement filters");
-    dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-        #if !HAVE_OSX
-        GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-        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));
-    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
-    /* TODO: Implement some kind of help function */
-    gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-                                       GTK_RESPONSE_HELP, FALSE);
-    sokoke_widget_get_text_size (dialog, "M", &width, &height);
-    gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
-    g_signal_connect_swapped (dialog, "response",
-                      G_CALLBACK (gtk_widget_destroy), dialog);
-    /* TODO: We need mnemonics */
-    if ((xfce_heading = sokoke_xfce_header_new (
-        gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title)))
-        gtk_box_pack_start (GTK_BOX (content_area), xfce_heading, FALSE, FALSE, 0);
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 12);
-    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 4);
-    button = gtk_label_new (NULL);
-    description = g_strdup_printf (_(
-        "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."),
-        #if GTK_CHECK_VERSION (2, 18, 0)
-        "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a> "
-        "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>");
-        #else
-        "<u>http://adblockplus.org/en/subscriptions</u> "
-        "<u>http://easylist.adblockplus.org/</u>");
-        #endif
-    #if GTK_CHECK_VERSION (2, 18, 0)
-    g_signal_connect (button, "activate-link",
-        G_CALLBACK (adblock_activate_link_cb), NULL);
-    #endif
-    gtk_label_set_markup (GTK_LABEL (button), description);
-    g_free (description);
-    gtk_label_set_line_wrap (GTK_LABEL (button), TRUE);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 4);
-    entry = katze_uri_entry_new (NULL);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 4);
-    liststore = gtk_list_store_new (1, G_TYPE_STRING);
-    treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore));
-    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
-    column = gtk_tree_view_column_new ();
-    renderer_toggle = gtk_cell_renderer_toggle_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer_toggle, FALSE);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer_toggle,
-        (GtkCellLayoutDataFunc)adblock_preferences_render_tick_cb,
-        extension, NULL);
-    g_signal_connect (renderer_toggle, "toggled",
-        G_CALLBACK (adblock_preferences_renderer_toggle_toggled_cb), liststore);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-    column = gtk_tree_view_column_new ();
-    renderer_text = gtk_cell_renderer_text_new ();
-    gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
-    g_object_set (renderer_text, "editable", TRUE, NULL);
-    g_signal_connect (renderer_text, "edited",
-        G_CALLBACK (adblock_preferences_renderer_text_edited_cb), liststore);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer_text,
-        (GtkCellLayoutDataFunc)adblock_preferences_render_text_cb,
-        extension, 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),
-                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_container_add (GTK_CONTAINER (scrolled), treeview);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
-                                         GTK_SHADOW_IN);
-    gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 5);
-
-    filters = midori_extension_get_string_list (extension, "filters", NULL);
-    if (filters != NULL)
-    {
-        gsize i = 0;
-        while (filters[i++] != NULL)
-            gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore),
-                                               NULL, i - 1, 0, filters[i -1], -1);
-    }
-    g_strfreev (filters);
-    g_object_connect (liststore,
-        "signal::row-inserted",
-        adblock_preferences_model_row_changed_cb, extension,
-        "signal::row-changed",
-        adblock_preferences_model_row_changed_cb, extension,
-        "signal::row-deleted",
-        adblock_preferences_model_row_deleted_cb, extension,
-        NULL);
-
-    g_object_unref (liststore);
-    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);
-    g_signal_connect (entry, "activate",
-        G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-    g_object_set_data (G_OBJECT (button), "treeview", treeview);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_edit_clicked_cb), column);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_remove_clicked_cb), treeview);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_label_new (""); /* This is an invisible separator */
-    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8);
-    gtk_widget_set_sensitive (button, FALSE);
-    button = gtk_label_new (""); /* This is an invisible separator */
-    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12);
-    button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
-    gtk_widget_set_sensitive (button, FALSE);
-    gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
-    gtk_widget_set_sensitive (button, FALSE);
-    gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-    #if HAVE_OSX
-    hbox = gtk_hbox_new (FALSE, 0);
-    button = gtk_button_new ();
-    icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
-    gtk_button_set_image (GTK_BUTTON (button), icon);
-    /* TODO: Implement some kind of help function */
-    gtk_widget_set_sensitive (button, FALSE);
-    /* g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_help_clicked_cb), dialog); */
-    gtk_box_pack_end (GTK_BOX (hbox),
-        button, FALSE, FALSE, 4);
-    gtk_box_pack_end (GTK_BOX (content_area),
-        hbox, FALSE, FALSE, 0);
-    #endif
-    gtk_widget_show_all (content_area);
-
-    g_object_unref (browser);
-
-    return dialog;
-}
-
-static GtkWidget*
-adblock_show_preferences_dialog (MidoriExtension* extension,
-                                 const gchar*     uri)
-{
-    static GtkWidget* dialog = NULL;
-
-    if (!dialog)
-    {
-        dialog = adblock_get_preferences_dialog (extension);
-        g_signal_connect (dialog, "destroy",
-            G_CALLBACK (gtk_widget_destroyed), &dialog);
-        gtk_widget_show (dialog);
-    }
-    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
-adblock_check_rule (GRegex*      regex,
-                    const gchar* patt,
-                    const gchar* req_uri,
-                    const gchar* page_uri)
-{
-    gchar* opts;
-
-    if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL))
-        return FALSE;
-
-    opts = g_hash_table_lookup (optslist, patt);
-    if (opts && g_regex_match_simple (",third-party", opts,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
-            return FALSE;
-    }
-    /* TODO: Domain opt check */
-    adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
-    return TRUE;
-}
-
-static inline gboolean
-adblock_is_matched_by_pattern (const gchar* req_uri,
-                               const gchar* page_uri)
-{
-    GHashTableIter iter;
-    gpointer patt, regex;
-
-    if (USE_PATTERN_MATCHING == 0)
-        return FALSE;
-
-    g_hash_table_iter_init (&iter, pattern);
-    while (g_hash_table_iter_next (&iter, &patt, &regex))
-    {
-        if (adblock_check_rule (regex, patt, req_uri, page_uri))
-            return TRUE;
-    }
-    return FALSE;
-}
-
-static inline gboolean
-adblock_is_matched_by_key (const gchar* req_uri,
-                           const gchar* page_uri)
-{
-    gchar* uri;
-    gint len;
-    int pos = 0;
-    GList* regex_bl = NULL;
-    GString* guri;
-    gboolean ret = FALSE;
-    gchar sig[SIGNATURE_SIZE + 1];
-
-    memset (&sig[0], 0, sizeof (sig));
-    /* Signatures are made on pattern, so we need to convert url to a pattern as well */
-    guri = adblock_fixup_regexp ("", (gchar*)req_uri);
-    uri = guri->str;
-    len = guri->len;
-
-    for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--)
-    {
-        GRegex* regex;
-        strncpy (sig, uri + pos, SIGNATURE_SIZE);
-        regex = g_hash_table_lookup (keys, sig);
-
-        /* Dont check if regex is already blacklisted */
-        if (!regex || g_list_find (regex_bl, regex))
-            continue;
-        ret = adblock_check_rule (regex, sig, req_uri, page_uri);
-        if (ret)
-            break;
-        regex_bl = g_list_prepend (regex_bl, regex);
-    }
-    g_string_free (guri, TRUE);
-    g_list_free (regex_bl);
-    return ret;
-}
-
-static gboolean
-adblock_is_matched (const gchar*  req_uri,
-                    const gchar*  page_uri)
-{
-    gchar* value;
-
-    if ((value = g_hash_table_lookup (urlcache, req_uri)))
-    {
-        if (value[0] == '0')
-            return FALSE;
-        else
-            return TRUE;
-    }
-
-    if (adblock_is_matched_by_key (req_uri, page_uri))
-    {
-        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
-        return TRUE;
-    }
-
-    if (adblock_is_matched_by_pattern (req_uri, page_uri))
-    {
-        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
-        return TRUE;
-    }
-    g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("0"));
-    return FALSE;
-}
-
-static gchar*
-adblock_prepare_urihider_js (GList* uris)
-{
-    GList* li = NULL;
-    GString* js = g_string_new (
-        "(function() {"
-        "function getElementsByAttribute (strTagName, strAttributeName, arrAttributeValue) {"
-        "    var arrElements = document.getElementsByTagName (strTagName);"
-        "    var arrReturnElements = new Array();"
-        "    for (var j=0; j<arrAttributeValue.length; j++) {"
-        "        var strAttributeValue = arrAttributeValue[j];"
-        "        for (var i=0; i<arrElements.length; i++) {"
-        "             var oCurrent = arrElements[i];"
-        "             var oAttribute = oCurrent.getAttribute && oCurrent.getAttribute (strAttributeName);"
-        "             if (oAttribute && oAttribute.length > 0 && strAttributeValue.indexOf (oAttribute) != -1)"
-        "                 arrReturnElements.push (oCurrent);"
-        "        }"
-        "    }"
-        "    return arrReturnElements;"
-        "};"
-        "function hideElementBySrc (uris) {"
-        "    var oElements = getElementsByAttribute('img', 'src', uris);"
-        "    if (oElements.length == 0)"
-        "        oElements = getElementsByAttribute ('iframe', 'src', uris);"
-        "    for (var i=0; i<oElements.length; i++) {"
-        "        oElements[i].style.visibility = 'hidden !important';"
-        "        oElements[i].style.width = '0';"
-        "        oElements[i].style.height = '0';"
-        "    }"
-        "};"
-        "var uris=new Array ();");
-
-    for (li = uris; li != NULL; li = g_list_next (li))
-        g_string_append_printf (js, "uris.push ('%s');", (gchar*)li->data);
-
-    g_string_append (js, "hideElementBySrc (uris);})();");
-
-    return g_string_free (js, FALSE);
-}
-
-static gboolean
-adblock_navigation_policy_decision_requested_cb (WebKitWebView*             web_view,
-                                                 WebKitWebFrame*            web_frame,
-                                                 WebKitNetworkRequest*      request,
-                                                 WebKitWebNavigationAction* action,
-                                                 WebKitWebPolicyDecision*   decision,
-                                                 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)
-{
-    SoupMessage* msg;
-    GList* blocked_uris;
-    const gchar* req_uri;
-    const char *page_uri;
-
-    page_uri = webkit_web_view_get_uri (web_view);
-    /* Skip checks on about: pages */
-    if (midori_uri_is_blank (page_uri))
-        return;
-
-    req_uri = webkit_network_request_get_uri (request);
-
-    if (!g_strcmp0 (req_uri, g_hash_table_lookup (navigationwhitelist, web_view)))
-        return;
-
-    if (!midori_uri_is_http (req_uri)
-     || g_str_has_suffix (req_uri, "favicon.ico"))
-        return;
-
-    msg = webkit_network_request_get_message (request);
-    if (!(msg && !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"))
-        g_test_timer_start ();
-    #endif
-    if (adblock_is_matched (req_uri, page_uri))
-    {
-        blocked_uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
-        blocked_uris = g_list_prepend (blocked_uris, g_strdup (req_uri));
-        webkit_network_request_set_uri (request, "about:blank");
-        g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
-    }
-    #ifdef G_ENABLE_DEBUG
-    if (midori_debug ("adblock:time"))
-        g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
-    #endif
-
-}
-
-static void
-adblock_custom_block_image_cb (GtkWidget*       widget,
-                               MidoriExtension* extension)
-{
-    gchar* custom_list;
-    FILE* list;
-    MidoriApp* app;
-    GtkWidget* browser;
-    GtkWidget* dialog;
-    GtkWidget* content_area;
-    GtkSizeGroup* sizegroup;
-    GtkWidget* hbox;
-    GtkWidget* label;
-    GtkWidget* entry;
-    gchar* title;
-
-    app = midori_extension_get_app (extension);
-    browser = katze_object_get_object (app, "browser");
-
-    title = _("Edit rule");
-    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,
-            GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
-            NULL);
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD);
-    gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-    gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
-    sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-    hbox = gtk_hbox_new (FALSE, 8);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-    label = gtk_label_new_with_mnemonic (_("_Rule:"));
-    gtk_size_group_add_widget (sizegroup, label);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    entry = gtk_entry_new ();
-    gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-    gtk_entry_set_text (GTK_ENTRY (entry),
-                        g_object_get_data (G_OBJECT (widget), "uri"));
-    gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (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)
-    {
-        gtk_widget_destroy (dialog);
-        return;
-    }
-
-    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+")))
-    {
-        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);
-    }
-    else
-        g_debug ("%s: Failed to open custom list %s\n", G_STRFUNC, custom_list);
-    g_free (custom_list);
-    gtk_widget_destroy (dialog);
-}
-
-static void
-adblock_populate_popup_cb (WebKitWebView*   web_view,
-                           GtkWidget*       menu,
-                           MidoriExtension* extension)
-{
-    GtkWidget* menuitem;
-    gchar *uri;
-    gint x, y;
-    GdkEventButton event;
-    WebKitHitTestResultContext context;
-    WebKitHitTestResult* hit_test;
-
-    gdk_window_get_pointer (gtk_widget_get_window(GTK_WIDGET (web_view)), &x, &y, NULL);
-    event.x = x;
-    event.y = y;
-    hit_test = webkit_web_view_get_hit_test_result (web_view, &event);
-    context = katze_object_get_int (hit_test, "context");
-    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE)
-    {
-        uri = katze_object_get_string (hit_test, "image-uri");
-        menuitem = gtk_menu_item_new_with_mnemonic (_("Bl_ock image"));
-    }
-    else if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
-    {
-        uri = katze_object_get_string (hit_test, "link-uri");
-        menuitem = gtk_menu_item_new_with_mnemonic (_("Bl_ock link"));
-    }
-    else
-        return;
-    gtk_widget_show (menuitem);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    g_object_set_data_full (G_OBJECT (menuitem), "uri", uri, (GDestroyNotify)g_free);
-    g_signal_connect (menuitem, "activate",
-        G_CALLBACK (adblock_custom_block_image_cb), extension);
-}
-
-static void
-adblock_load_finished_cb (WebKitWebView  *web_view,
-                          WebKitWebFrame *web_frame,
-                          gpointer        user_data)
-{
-    GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
-    gchar* script;
-    GList* li;
-
-    if (g_list_nth_data (uris, 0) == NULL)
-        return;
-
-    script = adblock_prepare_urihider_js (uris);
-    webkit_web_view_execute_script (web_view, script);
-    li = NULL;
-    for (li = uris; li != NULL; li = g_list_next (li))
-        uris = g_list_remove (uris, li->data);
-    g_free (script);
-    g_object_set_data (G_OBJECT (web_view), "blocked-uris", uris);
-}
-
-static void
-adblock_window_object_cleared_cb (WebKitWebView*  web_view,
-                                  WebKitWebFrame* web_frame,
-                                  JSContextRef    js_context,
-                                  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);
-}
-
-static void
-adblock_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 (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_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);
-}
-
-static void
-adblock_deactivate_cb (MidoriExtension* extension,
-                       MidoriBrowser*   browser);
-
-static void
-adblock_app_add_browser_cb (MidoriApp*       app,
-                            MidoriBrowser*   browser,
-                            MidoriExtension* extension)
-{
-    GtkWidget* statusbar;
-    GtkWidget* image;
-    GList* children;
-    GtkWidget* view;
-    gint i;
-
-    statusbar = katze_object_get_object (browser, "statusbar");
-    image = NULL;
-    /* image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
-    gtk_widget_show (image);
-    gtk_box_pack_start (GTK_BOX (statusbar), image, FALSE, FALSE, 3); */
-    g_object_set_data_full (G_OBJECT (browser), "status-image", image,
-                            (GDestroyNotify)gtk_widget_destroy);
-
-    children = midori_browser_get_tabs (MIDORI_BROWSER (browser));
-    for (; children; children = g_list_next (children))
-        adblock_add_tab_cb (browser, children->data, extension);
-    g_list_free (children);
-
-    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",
-        G_CALLBACK (adblock_deactivate_cb), browser);
-    g_object_unref (statusbar);
-}
-
-static GString*
-adblock_fixup_regexp (const gchar* prefix,
-                      gchar*       src)
-{
-    GString* str;
-    int len = 0;
-
-    if (!src)
-        return NULL;
-
-    str = g_string_new (prefix);
-
-    /* lets strip first .* */
-    if (src[0] == '*')
-    {
-        (void)*src++;
-    }
-
-    do
-    {
-        switch (*src)
-        {
-        case '*':
-            g_string_append (str, ".*");
-            break;
-        /*case '.':
-            g_string_append (str, "\\.");
-            break;*/
-        case '?':
-            g_string_append (str, "\\?");
-            break;
-        case '|':
-        /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means
-           "here could be port number or nothing". So bla.com^ will match
-           bla.com/ or bla.com:8080/ but not bla.com.au/ */
-        case '^':
-        case '+':
-            break;
-        default:
-            g_string_append_printf (str,"%c", *src);
-            break;
-        }
-        src++;
-    }
-    while (*src);
-
-    len = str->len;
-    /* We dont need .* in the end of url. Thats stupid */
-    if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.')
-        g_string_erase (str, len-2, 2);
-
-    return str;
-}
-
-static gboolean
-adblock_compile_regexp (GString* gpatt,
-                        gchar*   opts)
-{
-    GRegex* regex;
-    GError* error = NULL;
-    int pos = 0;
-    gchar *sig;
-    gchar *patt;
-    int len;
-
-    if (!gpatt)
-        return FALSE;
-
-    patt = gpatt->str;
-    len = gpatt->len;
-
-    /* TODO: Play with optimization flags */
-    regex = g_regex_new (patt, G_REGEX_OPTIMIZE,
-                         G_REGEX_MATCH_NOTEMPTY, &error);
-    if (error)
-    {
-        g_warning ("%s: %s", G_STRFUNC, error->message);
-        g_error_free (error);
-        return TRUE;
-    }
-
-    if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY))
-    {
-        int signature_count = 0;
-
-        for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
-            sig = g_strndup (patt + pos, SIGNATURE_SIZE);
-            if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
-                !g_hash_table_lookup (keys, sig))
-            {
-                adblock_debug ("sig: %s %s", sig, patt);
-                g_hash_table_insert (keys, sig, regex);
-                g_hash_table_insert (optslist, sig, g_strdup (opts));
-                signature_count++;
-            }
-            else
-            {
-                if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
-                    !g_hash_table_lookup (pattern, patt))
-                {
-                    adblock_debug ("patt2: %s %s", sig, patt);
-                    g_hash_table_insert (pattern, patt, regex);
-                    g_hash_table_insert (optslist, patt, g_strdup (opts));
-                }
-                g_free (sig);
-            }
-        }
-        if (signature_count > 1 && g_hash_table_lookup (pattern, patt))
-        {
-            g_hash_table_steal (pattern, patt);
-            return TRUE;
-        }
-        return FALSE;
-    }
-    else
-    {
-        adblock_debug ("patt: %s%s", patt, "");
-        /* Pattern is a regexp chars */
-        g_hash_table_insert (pattern, patt, regex);
-        g_hash_table_insert (optslist, patt, g_strdup (opts));
-        return FALSE;
-    }
-}
-
-static inline gchar*
-adblock_add_url_pattern (gchar* prefix,
-                         gchar* type,
-                         gchar* line)
-{
-    gchar** data;
-    gchar* patt;
-    GString* format_patt;
-    gchar* opts;
-    gboolean should_free;
-
-    data = g_strsplit (line, "$", -1);
-    if (!data || !data[0])
-    {
-        g_strfreev (data);
-        return NULL;
-    }
-
-    if (data[1] && data[2])
-    {
-        patt = g_strconcat (data[0], data[1], NULL);
-        opts = g_strconcat (type, ",", data[2], NULL);
-    }
-    else if (data[1])
-    {
-        patt = data[0];
-        opts = g_strconcat (type, ",", data[1], NULL);
-    }
-    else
-    {
-        patt = data[0];
-        opts = type;
-    }
-
-    if (g_regex_match_simple ("subdocument", opts,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        if (data[1] && data[2])
-            g_free (patt);
-        if (data[1])
-            g_free (opts);
-        g_strfreev (data);
-        return NULL;
-    }
-
-    format_patt = adblock_fixup_regexp (prefix, patt);
-
-    adblock_debug ("got: %s opts %s", format_patt->str, opts);
-    should_free = adblock_compile_regexp (format_patt, opts);
-
-    if (data[1] && data[2])
-        g_free (patt);
-    if (data[1])
-        g_free (opts);
-    g_strfreev (data);
-
-    return g_string_free (format_patt, should_free);
-}
-
-static inline void
-adblock_frame_add (gchar* line)
-{
-    const gchar* separator = " , ";
-
-    (void)*line++;
-    (void)*line++;
-    if (strchr (line, '\'')
-    || (strchr (line, ':')
-    && !g_regex_match_simple (".*\\[.*:.*\\].*", line,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
-    {
-        return;
-    }
-    g_string_append (blockcss, separator);
-    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)
-{
-    gchar** data;
-    data = g_strsplit (line, sep, 2);
-
-    if (!(data[1] && *data[1])
-     ||  strchr (data[1], '\'')
-     || (strchr (data[1], ':')
-     && !g_regex_match_simple (".*\\[.*:.*\\].*", data[1],
-                               G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
-    {
-        g_strfreev (data);
-        return;
-    }
-
-    if (strchr (data[0], ','))
-    {
-        gchar** domains;
-        gint i;
-
-        domains = g_strsplit (data[0], ",", -1);
-        for (i = 0; domains[i]; i++)
-        {
-            gchar* domain;
-
-            domain = domains[i];
-            /* Ignore Firefox-specific option */
-            if (!g_strcmp0 (domain, "~pregecko2"))
-                continue;
-            /* FIXME: ~ should negate match */
-            if (domain[0] == '~')
-                domain++;
-            adblock_update_css_hash (g_strstrip (domain), data[1]);
-        }
-        g_strfreev (domains);
-    }
-    else
-    {
-        adblock_update_css_hash (data[0], data[1]);
-    }
-    g_strfreev (data);
-}
-
-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]))
-        return NULL;
-
-    /* FIXME: No support for whitelisting */
-    if (line[0] == '@' && line[1] == '@')
-        return NULL;
-    /* FIXME: No support for [include] and [exclude] tags */
-    if (line[0] == '[')
-        return NULL;
-
-    g_strchomp (line);
-
-    /* Got CSS block hider */
-    if (line[0] == '#' && line[1] == '#' )
-    {
-        adblock_frame_add (line);
-        return NULL;
-    }
-    /* Got CSS block hider. Workaround */
-    if (line[0] == '#')
-        return NULL;
-
-    /* Got per domain CSS hider rule */
-    if (strstr (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] == '|' )
-    {
-        (void)*line++;
-        (void)*line++;
-        return adblock_add_url_pattern ("", "fulluri", line);
-    }
-    if (line[0] == '|')
-    {
-        (void)*line++;
-        return adblock_add_url_pattern ("^", "fulluri", 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 mod", line, 10) == 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 (strrchr (timestamp, '.'))
-            {
-                use_dots = TRUE;
-                /* In case of date like '20.08.2012 12:34'
-                 * we should also nuke the time part */
-                if (strrchr (timestamp, ' '))
-                {
-                    gchar** part = g_strsplit (timestamp, " ", 2);
-                    parts = g_strsplit (part[0], ".", 4);
-                    g_strfreev (part);
-                }
-                else
-                    parts = g_strsplit (timestamp, ".", 4);
-            }
-            else
-                parts = g_strsplit (timestamp, " ", 4);
-
-            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]));
-
-            /* check if first part is year 201(2) or day */
-            if (strncmp (parts[0], "201", 3) == 0)
-            {
-                g_date_set_day (mod_date, atoi (parts[2]));
-                g_date_set_year (mod_date, atoi (parts[0]));
-            }
-            else
-            {
-                g_date_set_day (mod_date, atoi (parts[0]));
-                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;
-    gchar line[2000];
-
-    if ((file = g_fopen (path, "r")))
-    {
-        while (fgets (line, 2000, file))
-            adblock_parse_line (line);
-        fclose (file);
-    }
-}
-
-static void
-adblock_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, 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);
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_navigation_policy_decision_requested_cb, extension);
-}
-
-static void
-adblock_deactivate_cb (MidoriExtension* extension,
-                       MidoriBrowser*   browser)
-{
-    GList* children;
-    GtkWidget* view;
-    MidoriApp* app = midori_extension_get_app (extension);
-    MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_open_preferences_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        extension, adblock_deactivate_cb, browser);
-    g_signal_handlers_disconnect_by_func (
-        app, adblock_app_add_browser_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_add_tab_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_remove_tab_cb, extension);
-
-    children = midori_browser_get_tabs (MIDORI_BROWSER (browser));
-    for (; children; children = g_list_next (children))
-        adblock_deactivate_tabs (children->data, browser, extension);
-    g_list_free (children);
-
-    adblock_destroy_db ();
-    midori_web_settings_remove_style (settings, "adblock-blockcss");
-    g_object_unref (settings);
-}
-
-static void
-adblock_activate_cb (MidoriExtension* extension,
-                     MidoriApp*       app)
-{
-    KatzeArray* browsers;
-    MidoriBrowser* browser;
-
-    adblock_reload_rules (extension, FALSE);
-
-    browsers = katze_object_get_object (app, "browsers");
-    KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
-        adblock_app_add_browser_cb (app, browser, extension);
-    g_signal_connect (app, "add-browser",
-        G_CALLBACK (adblock_app_add_browser_cb), extension);
-
-    g_object_unref (browsers);
-}
-
-static void
-test_adblock_parse (void)
-{
-    adblock_init_db ();
-    g_assert (!adblock_parse_line (NULL));
-    g_assert (!adblock_parse_line ("!"));
-    g_assert (!adblock_parse_line ("@@"));
-    g_assert (!adblock_parse_line ("##"));
-    g_assert (!adblock_parse_line ("["));
-
-    g_assert_cmpstr (adblock_parse_line ("+advert/"), ==, "advert/");
-    g_assert_cmpstr (adblock_parse_line ("*foo"), ==, "foo");
-    g_assert_cmpstr (adblock_parse_line ("f*oo"), ==, "f.*oo");
-    g_assert_cmpstr (adblock_parse_line ("?foo"), ==, "\\?foo");
-    g_assert_cmpstr (adblock_parse_line ("foo?"), ==, "foo\\?");
-
-    g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "..*foo/bar");
-    g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
-    adblock_destroy_db ();
-}
-
-static void
-test_subscription_update (void)
-{
-    gint temp;
-    gchar* filename;
-
-    adblock_init_db ();
-    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_file_set_contents (filename,
-        "[Adblock Plus 2.0]\n"
-        "! Checksum: S4reE8XaYTtAFxe2RjgBPg\n"
-        "! Last modification time (GMT): 2012.11.05 13:33\n"
-        "! Expires: 5 days (update frequency)\n",
-        -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 2.0]\n"
-        "! Checksum: S4reE8XaYTtAFxe2RjgBPg\n"
-        "! Last modification time (GMT): 2012.11.05 13:33\n",
-        -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_unlink (filename);
-    g_free (filename);
-    adblock_destroy_db ();
-}
-
-static void
-test_adblock_pattern (void)
-{
-    gint temp;
-    gchar* filename;
-
-    adblock_init_db ();
-    temp = g_file_open_tmp ("midori_adblock_match_test_XXXXXX", &filename, NULL);
-
-    /* TODO: Update some tests and add new ones. */
-    g_file_set_contents (filename,
-        "*ads.foo.bar*\n"
-        "*ads.bogus.name*\n"
-        "||^http://ads.bla.blub/*\n"
-        "|http://ads.blub.boing/*$domain=xxx.com\n"
-        "engine.adct.ru/*?\n"
-        "/addyn|*|adtech;\n"
-        "doubleclick.net/pfadx/*.mtvi\n"
-        "objects.tremormedia.com/embed/xml/*.xml?r=\n"
-        "videostrip.com^*/admatcherclient.\n"
-        "test.dom/test?var\n"
-        "/adpage.\n"
-        "br.gcl.ru/cgi-bin/br/",
-        -1, NULL);
-
-    adblock_parse_file (filename);
-
-    g_test_timer_start ();
-    g_assert (adblock_is_matched ("http://www.engadget.com/_uac/adpage.html", ""));
-    g_assert (adblock_is_matched ("http://test.dom/test?var=1", ""));
-    g_assert (adblock_is_matched ("http://ads.foo.bar/teddy", ""));
-    g_assert (!adblock_is_matched ("http://ads.fuu.bar/teddy", ""));
-    g_assert (adblock_is_matched ("https://ads.bogus.name/blub", ""));
-    g_assert (adblock_is_matched ("http://ads.bla.blub/kitty", ""));
-    g_assert (adblock_is_matched ("http://ads.blub.boing/soda", ""));
-    g_assert (!adblock_is_matched ("http://ads.foo.boing/beer", ""));
-    g_assert (adblock_is_matched ("https://testsub.engine.adct.ru/test?id=1", ""));
-    if (USE_PATTERN_MATCHING)
-        g_assert (adblock_is_matched ("http://test.ltd/addyn/test/test?var=adtech;&var2=1", ""));
-    g_assert (adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtvi", ""));
-    g_assert (!adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtv", ""));
-    g_assert (adblock_is_matched ("http://objects.tremormedia.com/embed/xml/list.xml?r=", ""));
-    g_assert (!adblock_is_matched ("http://qq.videostrip.c/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://br.gcl.ru/cgi-bin/br/test", ""));
-    g_assert (!adblock_is_matched ("https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", ""));
-    g_assert (!adblock_is_matched ("http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", ""));
-    g_assert (!adblock_is_matched ("http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", ""));
-    g_assert (!adblock_is_matched ("http://google.com", ""));
-
-    g_print ("Search took %f seconds\n", g_test_timer_elapsed ());
-
-    close (temp);
-    g_unlink (filename);
-    adblock_destroy_db ();
-}
-
-void
-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);
-}
-
-MidoriExtension*
-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,
-        "authors", "Christian Dywan <christian@twotoasts.de>",
-        NULL);
-    midori_extension_install_string_list (extension, "filters", NULL, G_MAXSIZE);
-
-    g_signal_connect (extension, "activate",
-        G_CALLBACK (adblock_activate_cb), NULL);
-
-    return extension;
-}
diff --git a/extensions/adblock/config.vala b/extensions/adblock/config.vala
new file mode 100644 (file)
index 0000000..20199bb
--- /dev/null
@@ -0,0 +1,146 @@
+/*
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+ 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 Adblock {
+    public class Config : GLib.Object {
+        List<Subscription> subscriptions;
+        public string? path { get; private set; }
+        KeyFile keyfile;
+        bool should_save;
+        public bool enabled { get; set; }
+
+        public Config (string? path, string? presets) {
+            should_save = false;
+            subscriptions = new GLib.List<Subscription> ();
+            enabled = true;
+            this.path = path;
+            size = 0;
+            load_file (path);
+            load_file (presets);
+            should_save = true;
+        }
+
+        void load_file (string? filename) {
+            if (filename == null)
+                return;
+
+            keyfile = new GLib.KeyFile ();
+            try {
+                keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
+                string[] filters = keyfile.get_string_list ("settings", "filters");
+                foreach (string filter in filters) {
+                    bool active = false;
+                    string uri = filter;
+                    if (filter.has_prefix ("http-/"))
+                        uri = "http:" + filter.substring (5);
+                    else if (filter.has_prefix ("file-/"))
+                        uri = "file:" + filter.substring (5);
+                    else if (filter.has_prefix ("http-:"))
+                        uri = "https" + filter.substring (5);
+                    else
+                        active = true;
+                    Subscription sub = new Subscription (uri);
+                    sub.active = active;
+                    sub.add_feature (new Updater ());
+                    add (sub);
+                }
+                enabled = !keyfile.get_boolean ("settings", "disabled");
+            } catch (KeyFileError.KEY_NOT_FOUND key_error) {
+                /* It's no error if a key is missing */
+            } catch (KeyFileError.GROUP_NOT_FOUND group_error) {
+                /* It's no error if a group is missing */
+            } catch (FileError.NOENT exist_error) {
+                /* It's no error if no config file exists */
+            } catch (GLib.Error settings_error) {
+                warning ("Error reading settings from %s: %s\n", filename, settings_error.message);
+            }
+
+            notify["enabled"].connect (enabled_changed);
+        }
+
+        void enabled_changed (ParamSpec pspec) {
+            keyfile.set_boolean ("settings", "disabled", !enabled);
+            save ();
+        }
+
+        void active_changed (Object subscription, ParamSpec pspec) {
+            update_filters ();
+        }
+
+        void update_filters () {
+            var filters = new StringBuilder ();
+            foreach (var sub in subscriptions) {
+                if (!sub.mutable)
+                    continue;
+                if (sub.uri.has_prefix ("http:") && !sub.active)
+                    filters.append ("http-" + sub.uri.substring (4));
+                else if (sub.uri.has_prefix ("file:") && !sub.active)
+                    filters.append ("file-" + sub.uri.substring (5));
+                else if (sub.uri.has_prefix ("https:") && !sub.active)
+                    filters.append ("http-" + sub.uri.substring (5));
+                else
+                    filters.append (sub.uri);
+                filters.append_c (';');
+            }
+
+            if (filters.str.has_suffix (";"))
+                filters.truncate (filters.len - 1);
+            string[] list = filters.str.split (";");
+            keyfile.set_string_list ("settings", "filters", list);
+
+            save ();
+        }
+
+
+        public void save () {
+            try {
+                FileUtils.set_contents (path, keyfile.to_data ());
+            } catch (Error error) {
+                warning ("Failed to save settings: %s", error.message);
+            }
+        }
+
+        /* foreach support */
+        public new Subscription? get (uint index) {
+            return subscriptions.nth_data (index);
+        }
+        public uint size { get; private set; }
+
+        bool contains (Subscription subscription) {
+            foreach (var sub in subscriptions)
+                if (sub.uri == subscription.uri)
+                    return true;
+            return false;
+        }
+
+        public bool add (Subscription sub) {
+            if (contains (sub))
+                return false;
+
+            sub.notify["active"].connect (active_changed);
+            subscriptions.append (sub);
+            size++;
+            if (should_save)
+                update_filters ();
+            return true;
+        }
+
+        public void remove (Subscription sub) {
+            if (!contains (sub))
+                return;
+
+            subscriptions.remove (sub);
+            sub.notify["active"].disconnect (active_changed);
+            update_filters ();
+            size--;
+        }
+    }
+}
diff --git a/extensions/adblock/element.vala b/extensions/adblock/element.vala
new file mode 100644 (file)
index 0000000..0e92813
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+ 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 Adblock {
+    public class Element : Feature {
+        public HashTable<string, string> blockcssprivate;
+        bool debug_element;
+
+        public Element () {
+            base ();
+            debug_element = "adblock:element" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+        }
+
+        public override void clear () {
+            blockcssprivate = new HashTable<string, string> (str_hash, str_equal);
+        }
+
+        public string? lookup (string domain) {
+            return blockcssprivate.lookup (domain);
+        }
+
+        public void insert (string domain, string value) {
+            if (debug_element)
+                stdout.printf ("Element to be blocked %s => %s\n", domain, value);
+            blockcssprivate.insert (domain, value);
+        }
+    }
+}
diff --git a/extensions/adblock/extension.vala b/extensions/adblock/extension.vala
new file mode 100644 (file)
index 0000000..c4ac047
--- /dev/null
@@ -0,0 +1,865 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+    public enum Directive {
+        ALLOW,
+        BLOCK
+    }
+
+    public enum State {
+        ENABLED,
+        DISABLED,
+        BLOCKED
+    }
+
+    public string? parse_subscription_uri (string? uri) {
+        if (uri == null)
+            return null;
+
+        if (uri.has_prefix ("http") || uri.has_prefix ("abp") || uri.has_prefix ("file"))
+        {
+            string sub_uri = uri;
+            if (uri.has_prefix ("abp:")) {
+                uri.replace ("abp://", "abp:");
+                if (uri.has_prefix ("abp:subscribe?location=")) {
+                    /* abp://subscripe?location=http://example.com&title=foo */
+                    string[] parts = uri.substring (23, -1).split ("&", 2);
+                    sub_uri = parts[0];
+                }
+            }
+
+            string decoded_uri = Soup.URI.decode (sub_uri);
+            return decoded_uri;
+        }
+        return null;
+    }
+
+    public class Extension : Midori.Extension {
+        internal Config config;
+        internal Subscription custom;
+        internal StringBuilder hider_selectors;
+        internal StatusIcon status_icon;
+        internal SubscriptionManager manager;
+        internal bool debug_element;
+#if !USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+        internal string? js_hider_function_body;
+#endif
+
+#if HAVE_WEBKIT2
+#if !HAVE_WEBKIT2_3_91
+        public Extension.WebExtension (WebKit.WebExtension web_extension) {
+            init ();
+            web_extension.page_created.connect (page_created);
+        }
+
+        void page_created (WebKit.WebPage web_page) {
+            web_page.send_request.connect (send_request);
+        }
+
+        bool send_request (WebKit.WebPage web_page, WebKit.URIRequest request, WebKit.URIResponse? redirected_response) {
+            return request_handled (request.uri, web_page.uri);
+        }
+#endif
+#endif
+
+        public Extension () {
+            GLib.Object (name: _("Advertisement blocker"),
+                         description: _("Block advertisements according to a filter list"),
+                         version: "2.0",
+                         authors: "Christian Dywan <christian@twotoasts.de>");
+            activate.connect (extension_activated);
+            deactivate.connect (extension_deactivated);
+            open_preferences.connect (extension_preferences);
+        }
+
+        void extension_preferences () {
+            manager.add_subscription (null);
+        }
+
+        void extension_activated (Midori.App app) {
+#if HAVE_WEBKIT2
+            string cache_dir = Environment.get_user_cache_dir ();
+            string wk2path = Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext");
+            Midori.Paths.mkdir_with_parents (wk2path);
+            string filename = "libadblock." + GLib.Module.SUFFIX;
+            var wk2link = File.new_for_path (wk2path).get_child (filename);
+            var library = File.new_for_path (Midori.Paths.get_lib_path (PACKAGE_NAME)).get_child (filename);
+            try {
+                wk2link.make_symbolic_link (library.get_path ());
+            } catch (IOError.EXISTS exist_error) {
+                /* It's no error if the file already exists. */
+            } catch (Error error) {
+                critical ("Failed to create WebKit2 link: %s", error.message);
+            }
+#endif
+            init ();
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+            app.remove_browser.connect (browser_removed);
+        }
+
+        void extension_deactivated () {
+            var app = get_app ();
+            foreach (var browser in app.get_browsers ())
+                browser_removed (browser);
+            app.add_browser.disconnect (browser_added);
+            app.remove_browser.disconnect (browser_removed);
+            foreach (var button in status_icon.toggle_buttons)
+                button.destroy ();
+        }
+
+        void browser_added (Midori.Browser browser) {
+            foreach (var tab in browser.get_tabs ())
+                tab_added (tab);
+            browser.add_tab.connect (tab_added);
+            browser.remove_tab.connect (tab_removed);
+
+            var toggle_button = status_icon.add_button ();
+            browser.statusbar.pack_end (toggle_button, false, false, 3);
+            toggle_button.show ();
+        }
+
+        void browser_removed (Midori.Browser browser) {
+            foreach (var tab in browser.get_tabs ())
+                tab_removed (tab);
+            browser.add_tab.disconnect (tab_added);
+            browser.remove_tab.disconnect (tab_removed);
+        }
+
+        void tab_added (Midori.View view) {
+            view.navigation_requested.connect (navigation_requested);
+#if !HAVE_WEBKIT2
+            view.web_view.resource_request_starting.connect (resource_requested);
+#endif
+            view.notify["load-status"].connect (load_status_changed);
+            view.context_menu.connect (context_menu);
+        }
+
+        void tab_removed (Midori.View view) {
+#if !HAVE_WEBKIT2
+            view.web_view.resource_request_starting.disconnect (resource_requested);
+#endif
+            view.navigation_requested.disconnect (navigation_requested);
+            view.notify["load-status"].disconnect (load_status_changed);
+            view.context_menu.disconnect (context_menu);
+        }
+
+        void load_status_changed (Object object, ParamSpec pspec) {
+            var view = object as Midori.View;
+            if (config.enabled) {
+                if (view.load_status == Midori.LoadStatus.FINISHED)
+                    inject_css (view, view.uri);
+            }
+        }
+
+        void context_menu (WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+            string label, uri;
+            if ((hit_test_result.context & WebKit.HitTestResultContext.IMAGE) != 0) {
+                label = _("Bl_ock image");
+                uri = hit_test_result.image_uri;
+            } else if ((hit_test_result.context & WebKit.HitTestResultContext.LINK) != 0)  {
+                label = _("Bl_ock link");
+                uri = hit_test_result.link_uri;
+            } else
+                return;
+            var action = new Gtk.Action ("BlockElement", label, null, null);
+            action.activate.connect ((action) => {
+                CustomRulesEditor custom_rules_editor = new CustomRulesEditor (custom);
+                custom_rules_editor.set_uri (uri);
+                custom_rules_editor.show();
+            });
+            menu.add (action);
+        }
+
+#if !HAVE_WEBKIT2
+        void resource_requested (WebKit.WebView web_view, WebKit.WebFrame frame,
+            WebKit.WebResource resource, WebKit.NetworkRequest request, WebKit.NetworkResponse? response) {
+
+            if (request_handled (request.uri, web_view.uri)) {
+                request.set_uri ("about:blank");
+            }
+        }
+#endif
+
+        bool navigation_requested (Midori.Tab tab, string uri) {
+            if (uri.has_prefix ("abp:")) {
+                string parsed_uri = parse_subscription_uri (uri);
+                manager.add_subscription (parsed_uri);
+                return true;
+            }
+            status_icon.set_state (config.enabled ? State.ENABLED : State.DISABLED);
+            return false;
+        }
+
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+        string? get_hider_css_for_blocked_resources () {
+            if (hider_selectors.str == "")
+                return null;
+
+            /* Hide elements that were blocked, otherwise we will get "broken image" icon */
+            var code = new StringBuilder (hider_selectors.str);
+            string hider_css;
+            if (debug_element)
+                hider_css = " { background-color: red; border: 4px solid green; }";
+            else
+                hider_css = " { visiblility: hidden; width: 0; height: 0; }";
+
+            code.truncate (code.len -3);
+            code.append (hider_css);
+            if (debug_element)
+                stdout.printf ("hider css: %s\n", code.str);
+            return code.str;
+        }
+#else
+        string? fetch_js_hider_function_body () {
+            string filename = Midori.Paths.get_res_filename ("adblock/element_hider.js");
+            File js_file = GLib.File.new_for_path (filename);
+            try {
+                uint8[] function_body;
+                js_file.load_contents (null, out function_body, null);
+                return (string)function_body;
+            }
+            catch (Error error) {
+                warning ("Error while loading adblock hider js: %s\n", error.message);
+            }
+            return null;
+        }
+
+        string? get_hider_js_for_blocked_resorces () {
+            if (hider_selectors.str == "")
+                return null;
+
+            if (js_hider_function_body == null || js_hider_function_body == "")
+                return null;
+
+            var js =  new StringBuilder ("(function() {");
+            js.append (js_hider_function_body);
+            js.append ("var uris=new Array ();");
+            js.append (hider_selectors.str);
+            js.append (" hideElementBySrc (uris);})();");
+
+            return js.str;
+        }
+#endif
+
+        string[]? get_domains_for_uri (string uri) {
+            if (uri == null)
+                return null;
+            string[]? domains = null;
+            string domain = Midori.URI.parse_hostname (uri, null);
+            string[] subdomains = domain.split (".");
+            if (subdomains == null)
+                return null;
+            int cnt = subdomains.length - 1;
+            var subdomain = new StringBuilder (subdomains[cnt]);
+            subdomain.prepend_c ('.');
+            cnt--;
+            while (cnt >= 0) {
+                subdomain.prepend (subdomains[cnt]);
+                domains += subdomain.str;
+                subdomain.prepend_c ('.');
+                cnt--;
+            }
+            return domains;
+        }
+
+        string? get_hider_css_rules_for_uri (string page_uri) {
+            if (page_uri == null)
+                return null;
+            string[]? domains = get_domains_for_uri (page_uri);
+            if (domains == null)
+                return null;
+            var code = new StringBuilder ();
+            int blockscnt = 0;
+            string? style = null;
+            foreach (Subscription sub in config) {
+                foreach (var feature in sub) {
+                    if (feature is Adblock.Element) {
+                        foreach (var subdomain in domains) {
+                            style = (feature as Adblock.Element).lookup (subdomain);
+                            if (style != null) {
+                                code.append (style);
+                                code.append_c (',');
+                                blockscnt++;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (blockscnt == 0)
+                return null;
+            code.truncate (code.len - 1);
+
+            string hider_css;
+            if (debug_element)
+                hider_css = " { background-color: red !important; border: 4px solid green !important; }";
+            else
+                hider_css = " { display: none !important }";
+
+            code.append (hider_css);
+            if (debug_element)
+                stdout.printf ("css: %s\n", code.str);
+
+            return code.str;
+        }
+
+        void inject_css (Midori.View view, string page_uri) {
+            /* Don't block ads on internal pages */
+            if (!Midori.URI.is_http (page_uri))
+                return;
+
+            if ("adblock:element" in (Environment.get_variable ("MIDORI_DEBUG") ?? ""))
+                debug_element = true;
+            else
+                debug_element = status_icon.debug_element_toggled;
+
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+            string? blocked_css = get_hider_css_for_blocked_resources ();
+            if (blocked_css != null)
+                view.inject_stylesheet (blocked_css);
+#else
+            string? blocked_js = get_hider_js_for_blocked_resorces ();
+            if (blocked_js != null)
+                view.execute_script (blocked_js, null);
+#endif
+            string? style = get_hider_css_rules_for_uri (page_uri);
+            if (style != null)
+                view.inject_stylesheet (style);
+        }
+
+        internal void init () {
+            hider_selectors = new StringBuilder ();
+            load_config ();
+            manager = new SubscriptionManager (config);
+            status_icon = new StatusIcon (config, manager);
+            foreach (Subscription sub in config) {
+                try {
+                    sub.parse ();
+                } catch (GLib.Error error) {
+                    warning ("Error parsing %s: %s", sub.uri, error.message);
+                }
+            }
+            config.notify["size"].connect (subscriptions_added_removed);
+            manager.description_label.activate_link.connect (open_link);
+#if !USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+            js_hider_function_body = fetch_js_hider_function_body ();
+#endif
+        }
+
+        bool open_link (string uri) {
+            var browser = get_app ().browser;
+            var view = browser.add_uri (uri);
+            browser.tab = view;
+            return true;
+        }
+
+        void subscriptions_added_removed (ParamSpec pspec) {
+            hider_selectors = new StringBuilder ();
+        }
+
+        void load_config () {
+#if HAVE_WEBKIT2
+            string config_dir = Path.build_filename (GLib.Environment.get_user_config_dir (), PACKAGE_NAME, "extensions", "libadblock." + GLib.Module.SUFFIX);
+            Midori.Paths.mkdir_with_parents (config_dir);
+#else
+            string config_dir = Midori.Paths.get_extension_config_dir ("adblock");
+#endif
+            string presets = Midori.Paths.get_extension_preset_filename ("adblock", "config");
+            string filename = Path.build_filename (config_dir, "config");
+            config = new Config (filename, presets);
+            string custom_list = GLib.Path.build_filename (config_dir, "custom.list");
+            try {
+                custom = new Subscription (Filename.to_uri (custom_list, null));
+                custom.mutable = false;
+                custom.title = _("Custom");
+                config.add (custom);
+            } catch (Error error) {
+                custom = null;
+                warning ("Failed to add custom list %s: %s", custom_list, error.message);
+            }
+        }
+
+        public Adblock.Directive get_directive_for_uri (string request_uri, string page_uri) {
+            if (!config.enabled)
+                return Directive.ALLOW;
+
+            /* Always allow the main page */
+            if (request_uri == page_uri)
+                return Directive.ALLOW;
+
+            /* Skip adblock on internal pages */
+            if (Midori.URI.is_blank (page_uri))
+                return Directive.ALLOW;
+
+            /* Skip adblock on favicons and non http schemes */
+            if (!Midori.URI.is_http (request_uri) || request_uri.has_suffix ("favicon.ico"))
+                return Directive.ALLOW;
+
+            Directive? directive = null;
+            foreach (Subscription sub in config) {
+                directive = sub.get_directive (request_uri, page_uri);
+                if (directive != null)
+                    break;
+            }
+
+            if (directive == null)
+                directive = Directive.ALLOW;
+            else if (directive == Directive.BLOCK) {
+                status_icon.set_state (State.BLOCKED);
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+                hider_selectors.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (request_uri, request_uri));
+#else
+                hider_selectors.append (" uris.push ('%s');\n".printf (request_uri));
+#endif
+            }
+            return directive;
+        }
+
+        internal bool request_handled (string request_uri, string page_uri) {
+            return get_directive_for_uri (request_uri, page_uri) == Directive.BLOCK;
+        }
+    }
+
+    static void debug (string format, ...) {
+        bool debug_match = "adblock:match" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+        if (!debug_match)
+            return;
+
+        var args = va_list ();
+        stdout.vprintf (format + "\n", args);
+    }
+
+    internal static string? fixup_regex (string prefix, string? src) {
+        if (src == null)
+            return null;
+
+        var fixed = new StringBuilder ();
+        fixed.append(prefix);
+
+        uint i = 0;
+        if (src[0] == '*')
+            i++;
+        uint l = src.length;
+        while (i < l) {
+            char c = src[i];
+            switch (c) {
+                case '*':
+                    fixed.append (".*"); break;
+                case '|':
+                case '^':
+                case '+':
+                    break;
+                case '?':
+                case '[':
+                case ']':
+                case '(':
+                case ')':
+                    fixed.append_printf ("\\%c", c); break;
+                default:
+                    fixed.append_c (c); break;
+            }
+            i++;
+        }
+        return fixed.str;
+    }
+}
+
+#if HAVE_WEBKIT2
+#if !HAVE_WEBKIT2_3_91
+Adblock.Extension? filter;
+public static void webkit_web_extension_initialize (WebKit.WebExtension web_extension) {
+    filter = new Adblock.Extension.WebExtension (web_extension);
+}
+#endif
+#endif
+
+public Midori.Extension extension_init () {
+    return new Adblock.Extension ();
+}
+
+static string? tmp_folder = null;
+string get_test_file (string contents) {
+    if (tmp_folder == null)
+        tmp_folder = Midori.Paths.make_tmp_dir ("adblockXXXXXX");
+    string checksum = Checksum.compute_for_string (ChecksumType.MD5, contents);
+    string file = Path.build_path (Path.DIR_SEPARATOR_S, tmp_folder, checksum);
+    try {
+        FileUtils.set_contents (file, contents, -1);
+    } catch (Error file_error) {
+        GLib.error (file_error.message);
+    }
+    return file;
+}
+
+struct TestCaseConfig {
+    public string content;
+    public uint size;
+    public bool enabled;
+}
+
+const TestCaseConfig[] configs = {
+    { "", 0, true },
+    { "[settings]", 0, true },
+    { "[settings]\nfilters=foo;", 1, true },
+    { "[settings]\nfilters=foo;\ndisabled=true", 1, false }
+};
+
+void test_adblock_config () {
+    assert (new Adblock.Config (null, null).size == 0);
+
+    foreach (var conf in configs) {
+        var config = new Adblock.Config (get_test_file (conf.content), null);
+        if (config.size != conf.size)
+            error ("Wrong size %s rather than %s:\n%s",
+                   config.size.to_string (), conf.size.to_string (), conf.content);
+        if (config.enabled != conf.enabled)
+            error ("Wrongly got enabled=%s rather than %s:\n%s",
+                   config.enabled.to_string (), conf.enabled.to_string (), conf.content);
+    }
+}
+
+struct TestCaseSub {
+    public string uri;
+    public bool active;
+}
+
+const TestCaseSub[] subs = {
+    { "http://foo.com", true },
+    { "http://bar.com", false },
+    { "https://spam.com", true },
+    { "https://eggs.com", false },
+    { "file:///bla", true },
+    { "file:///blub", false }
+};
+
+void test_adblock_subs () {
+    var config = new Adblock.Config (get_test_file ("""
+[settings]
+filters=http://foo.com;http-//bar.com;https://spam.com;http-://eggs.com;file:///bla;file-///blub;http://foo.com;
+"""), null);
+
+    assert (config.enabled);
+    foreach (var sub in subs) {
+        bool found = false;
+        foreach (var subscription in config) {
+            if (subscription.uri == sub.uri) {
+                assert (subscription.active == sub.active);
+                found = true;
+            }
+        }
+        if (!found)
+            error ("%s not found", sub.uri);
+    }
+
+    /* 6 unique URLs, 1 duplicate */
+    assert (config.size == 6);
+    /* Duplicates aren't added again either */
+    assert (!config.add (new Adblock.Subscription ("https://spam.com")));
+
+    /* Saving the config and loading it should give back identical results */
+    config.save ();
+    var copy = new Adblock.Config (config.path, null);
+    assert (copy.size == config.size);
+    assert (copy.enabled == config.enabled);
+    for (int i = 0; i < config.size; i++) {
+        assert (copy[i].uri == config[i].uri);
+        assert (copy[i].active == config[i].active);
+    }
+    /* Enabled status should be saved and loaded */
+    config.enabled = false;
+    copy = new Adblock.Config (config.path, null);
+    assert (copy.enabled == config.enabled);
+    /* Flipping individual active values should be retained after saving */
+    foreach (var sub in config)
+        sub.active = !sub.active;
+    copy = new Adblock.Config (config.path, null);
+    for (uint i = 0; i < config.size; i++) {
+        if (config[i].active != copy[i].active) {
+            string contents;
+            try {
+                FileUtils.get_contents (config.path, out contents, null);
+            } catch (Error file_error) {
+                error (file_error.message);
+            }
+            error ("%s is %s but should be %s:\n%s",
+                   copy[i].uri, copy[i].active ? "active" : "disabled", config[i].active ? "active" : "disabled", contents);
+        }
+    }
+
+    /* Adding and removing works, changes size */
+    var s = new Adblock.Subscription ("http://en.de");
+    assert (config.add (s));
+    assert (config.size == 7);
+    config.remove (s);
+    assert (config.size == 6);
+    /* If it was removed before we should be able to add it again */
+    assert (config.add (s));
+    assert (config.size == 7);
+}
+
+void test_adblock_init () {
+    /* No config */
+    var extension = new Adblock.Extension ();
+    extension.init ();
+    assert (extension.config.enabled);
+    /* Defaults plus custom */
+    if (extension.config.size != 3)
+        error ("Expected 3 initial subs, got %s".printf (
+               extension.config.size.to_string ()));
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
+
+    /* Add new subscription */
+    string path = Midori.Paths.get_res_filename ("adblock.list");
+    string uri;
+    try {
+        uri = Filename.to_uri (path, null);
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var sub = new Adblock.Subscription (uri);
+    extension.config.add (sub);
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
+    assert (extension.config.size == 4);
+    try {
+        sub.parse ();
+    } catch (GLib.Error error) {
+        GLib.error (error.message);
+    }
+    /* The page itself never hits */
+    assert (!extension.request_handled ("https://ads.bogus.name/blub", "https://ads.bogus.name/blub"));
+    /* Favicons don't either */
+    assert (!extension.request_handled ("https://foo.com", "https://ads.bogus.name/blub/favicon.ico"));
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
+    /* Some sanity checks to be sure there's no earlier problem */
+    assert (sub.title == "Exercise");
+    assert (sub.get_directive ("https://ads.bogus.name/blub", "") == Adblock.Directive.BLOCK);
+    /* A rule hit should add to the cache */
+    assert (extension.request_handled ("https://ads.bogus.name/blub", "https://foo.com"));
+    assert (extension.status_icon.state == Adblock.State.BLOCKED);
+    assert (extension.hider_selectors.str != "");
+    /* Disabled means no request should be handled */
+    extension.config.enabled = false;
+    assert (!extension.request_handled ("https://ads.bogus.name/blub", "https://foo.com"));
+    // FIXME: assert (extension.status_icon.state == Adblock.State.DISABLED);
+    /* Removing a subscription should clear the cached CSS */
+    extension.config.remove (sub);
+    assert (extension.hider_selectors.str == "");
+    assert (extension.config.size == 3);
+    /* Now let's add a custom rule */
+    extension.config.enabled = true;
+    extension.custom.add_rule ("/adpage.");
+    assert (extension.custom.get_directive ("http://www.engadget.com/_uac/adpage.html", "http://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://www.engadget.com/_uac/adpage.html", "http://foo.com"));
+    assert (extension.status_icon.state == Adblock.State.BLOCKED);
+    /* Second attempt, from cache, same result */
+    assert (extension.custom.get_directive ("http://www.engadget.com/_uac/adpage.html", "http://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://www.engadget.com/_uac/adpage.html", "http://foo.com"));
+    /* Another custom rule */
+    extension.custom.add_rule ("/images/*.png");
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/yota.png", "https://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://alpha.beta.com/images/yota.png", "https://foo.com"));
+    /* Second attempt, from cache, same result */
+    assert (extension.request_handled ("http://alpha.beta.com/images/yota.png", "https://foo.com"));
+    /* Similar uri but .jpg should pass */
+    assert (!extension.request_handled ("http://alpha.beta.com/images/yota.jpg", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/yota.jpg", "https://foo.com") != Adblock.Directive.BLOCK);
+    /* Add whitelist rule */
+    extension.custom.add_rule ("@@http://alpha.beta.com/images/drop*bear.png");
+    assert (!extension.request_handled ("http://alpha.beta.com/images/drop-bear.png", "https://foo.com"));
+    assert (!extension.request_handled ("http://alpha.beta.com/images/dropzone_bear.png", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/drop-bear.png", "https://foo.com") != Adblock.Directive.BLOCK);
+    /* Doesn't match whitelist, matches *.png rule, should be blocked */
+    assert (extension.request_handled ("http://alpha.beta.com/images/bear.png", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/bear.png", "https://foo.com") == Adblock.Directive.BLOCK);
+ }
+
+struct TestCaseLine {
+    public string line;
+    public string fixed;
+}
+
+const TestCaseLine[] lines = {
+    { null, null },
+    { "!", "!" },
+    { "@@", "@@" },
+    { "##", "##" },
+    { "[", "\\[" },
+    { "+advert/", "advert/" },
+    { "*foo", "foo" },
+    { "f*oo", "f.*oo" },
+    { "?foo", "\\?foo" },
+    { "foo?", "foo\\?" },
+    { ".*foo/bar", "..*foo/bar" },
+    { "http://bla.blub/*", "http://bla.blub/.*" },
+    { "bag?r[]=*cpa", "bag\\?r\\[\\]=.*cpa" },
+    { "(facebookLike,", "\\(facebookLike," }
+};
+
+void test_adblock_fixup_regexp () {
+    foreach (var line in lines) {
+        Katze.assert_str_equal (line.line, Adblock.fixup_regex ("", line.line), line.fixed);
+    }
+}
+
+struct TestCasePattern {
+    public string uri;
+    public Adblock.Directive directive;
+}
+
+const TestCasePattern[] patterns = {
+    { "http://www.engadget.com/_uac/adpage.html", Adblock.Directive.BLOCK },
+    { "http://test.dom/test?var=1", Adblock.Directive.BLOCK },
+    { "http://ads.foo.bar/teddy", Adblock.Directive.BLOCK },
+    { "http://ads.fuu.bar/teddy", Adblock.Directive.ALLOW },
+    { "https://ads.bogus.name/blub", Adblock.Directive.BLOCK },
+    // FIXME { "http://ads.bla.blub/kitty", Adblock.Directive.BLOCK },
+    // FIXME { "http://ads.blub.boing/soda", Adblock.Directive.BLOCK },
+    { "http://ads.foo.boing/beer", Adblock.Directive.ALLOW },
+    { "https://testsub.engine.adct.ru/test?id=1", Adblock.Directive.BLOCK },
+    { "http://test.ltd/addyn/test/test?var=adtech;&var2=1", Adblock.Directive.BLOCK },
+    { "http://add.doubleclick.net/pfadx/aaaa.mtvi", Adblock.Directive.BLOCK },
+    { "http://add.doubleclick.net/pfadx/aaaa.mtv", Adblock.Directive.ALLOW },
+    { "http://objects.tremormedia.com/embed/xml/list.xml?r=", Adblock.Directive.BLOCK },
+    { "http://qq.videostrip.c/sub/admatcherclient.php", Adblock.Directive.ALLOW },
+    { "http://qq.videostrip.com/sub/admatcherclient.php", Adblock.Directive.BLOCK },
+    { "http://qq.videostrip.com/sub/admatcherclient.php", Adblock.Directive.BLOCK },
+    { "http://br.gcl.ru/cgi-bin/br/test", Adblock.Directive.BLOCK },
+    { "https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", Adblock.Directive.ALLOW },
+    { "http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", Adblock.Directive.ALLOW },
+    { "http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", Adblock.Directive.ALLOW },
+    { "http://google.com", Adblock.Directive.ALLOW }
+};
+
+string pretty_directive (Adblock.Directive? directive) {
+    if (directive == null)
+        return "none";
+    return directive.to_string ();
+}
+
+void test_adblock_pattern () {
+    string path = Midori.Paths.get_res_filename ("adblock.list");
+    string uri;
+    try {
+        uri = Filename.to_uri (path, null);
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var sub = new Adblock.Subscription (uri);
+    try {
+        sub.parse ();
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    foreach (var pattern in patterns) {
+        Adblock.Directive? directive = sub.get_directive (pattern.uri, "");
+        if (directive == null)
+            directive = Adblock.Directive.ALLOW;
+        if (directive != pattern.directive) {
+            error ("%s expected for %s but got %s",
+                   pretty_directive (pattern.directive), pattern.uri, pretty_directive (directive));
+        }
+    }
+}
+
+string pretty_date (DateTime? date) {
+    if (date == null)
+        return "N/A";
+    return date.to_string ();
+}
+
+struct TestUpdateExample {
+    public string content;
+    public bool result;
+    public bool valid;
+}
+
+ const TestUpdateExample[] examples = {
+        { "[Adblock Plus 1.1]\n! Last modified: 05 Sep 2010 11:00 UTC\n! This list expires after 48 hours\n", true, true },
+        { "[Adblock Plus 1.1]\n! Last modified: 05.09.2010 11:00 UTC\n! Expires: 2 days (update frequency)\n", true, true },
+        { "[Adblock Plus 1.1]\n! Updated: 05 Nov 2024 11:00 UTC\n! Expires: 5 days (update frequency)\n", false, true },
+        { "[Adblock]\n! dutchblock v3\n! This list expires after 14 days\n|http://b*.mookie1.com/\n", false, true },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n! Expires: 5 days (update frequency)\n", true, true },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n", true, true },
+        { "[Adblock]\n ! dummy,  i dont have any dates\n", false, true },
+        /* non-standard update time metadata as found in http://abp.mozilla-hispano.org/nauscopio/filtros.txt */
+        { "[Adblock Plus 2.0]\n ! Last modified: Oct 26, 2013 18:00 UTC\n ! This list expires after 5 days\n! Last modified by maty: 12Oct2013\n! \n", false, true },
+        { "\n", false, false }
+    };
+
+void test_subscription_update () {
+    string uri;
+    FileIOStream iostream;
+    File file;
+    try {
+        file = File.new_tmp ("midori_adblock_update_test_XXXXXX", out iostream);
+        uri = file.get_uri ();
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var sub = new Adblock.Subscription (uri);
+    var updater = new Adblock.Updater ();
+    sub.add_feature (updater);
+
+    foreach (var example in examples) {
+        try {
+            file.replace_contents (example.content.data, null, false, FileCreateFlags.NONE, null);
+            sub.clear ();
+            sub.parse ();
+        } catch (Error error) {
+            GLib.error (error.message);
+        }
+        if (example.valid != sub.valid)
+            error ("Subscription expected to be %svalid but %svalid:\n%s",
+                   example.valid ? "" : "in", sub.valid ? "" : "in", example.content);
+        if (example.result != updater.needs_update)
+            error ("Update%s expected for:\n%s\nLast Updated: %s\nExpires: %s",
+                   example.result ? "" : " not", example.content,
+                   pretty_date (updater.last_updated), pretty_date (updater.expires));
+    }
+}
+
+struct TestSubUri {
+    public string? src_uri;
+    public string? dst_uri;
+}
+
+const TestSubUri[] suburis =
+{
+    { null, null },
+    { "not-a-link", null },
+    { "http://some.uri", "http://some.uri" },
+    { "abp:subscribe?location=https%3A%2F%2Feasylist-downloads.adblockplus.org%2Fabpindo%2Beasylist.txt&title=ABPindo%2BEasyList", "https://easylist-downloads.adblockplus.org/abpindo+easylist.txt" }
+};
+
+void test_subscription_uri_parsing () {
+    string? parsed_uri;
+    foreach (var example in suburis) {
+        parsed_uri = Adblock.parse_subscription_uri (example.src_uri);
+        if (parsed_uri != example.dst_uri)
+            error ("Subscription expected to be %svalid but %svalid:\n%s",
+                   example.dst_uri, parsed_uri, example.src_uri);
+    }
+}
+
+public void extension_test () {
+    Test.add_func ("/extensions/adblock2/config", test_adblock_config);
+    Test.add_func ("/extensions/adblock2/subs", test_adblock_subs);
+    Test.add_func ("/extensions/adblock2/init", test_adblock_init);
+    Test.add_func ("/extensions/adblock2/parse", test_adblock_fixup_regexp);
+    Test.add_func ("/extensions/adblock2/pattern", test_adblock_pattern);
+    Test.add_func ("/extensions/adblock2/update", test_subscription_update);
+    Test.add_func ("/extensions/adblock2/subsparse", test_subscription_uri_parsing);
+}
+
diff --git a/extensions/adblock/filter.vala b/extensions/adblock/filter.vala
new file mode 100644 (file)
index 0000000..5e3ba34
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+    public abstract class Filter : Feature {
+        Options optslist;
+        protected HashTable<string, Regex?> rules;
+
+        public virtual void insert (string sig, Regex regex) {
+            rules.insert (sig, regex);
+        }
+
+        public virtual Regex? lookup (string sig) {
+            return rules.lookup (sig);
+        }
+
+        public virtual uint size () {
+            return rules.size ();
+        }
+
+        protected Filter (Options options) {
+            optslist = options;
+            clear ();
+        }
+
+        public override void clear () {
+            rules = new HashTable<string, Regex> (str_hash, str_equal);
+        }
+
+        protected bool check_rule (Regex regex, string pattern, string request_uri, string page_uri) throws Error {
+            if (!regex.match_full (request_uri))
+                return false;
+
+            var opts = optslist.lookup (pattern);
+            if (opts != null && Regex.match_simple (",third-party", opts,
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))
+                if (page_uri != null && regex.match_full (page_uri))
+                    return false;
+            debug ("blocked by pattern regexp=%s -- %s", regex.get_pattern (), request_uri);
+            return true;
+        }
+    }
+}
diff --git a/extensions/adblock/keys.vala b/extensions/adblock/keys.vala
new file mode 100644 (file)
index 0000000..5ed987f
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+    public class Keys : Filter {
+        List<Regex> blacklist;
+
+        public Keys (Options options) {
+            base (options);
+        }
+
+        public override void clear () {
+            base.clear ();
+            blacklist = new List<Regex> ();
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            string? uri = fixup_regex ("", request_uri);
+            if (uri == null)
+                return null;
+
+            int signature_size = 8;
+            int pos, l = uri.length;
+            for (pos = l - signature_size; pos >= 0; pos--) {
+                string signature = uri.offset (pos).ndup (signature_size);
+                var regex = rules.lookup (signature);
+                if (regex == null || blacklist.find (regex) != null)
+                    continue;
+
+                if (check_rule (regex, uri, request_uri, page_uri))
+                    return Directive.BLOCK;
+                blacklist.prepend (regex);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/extensions/adblock/options.vala b/extensions/adblock/options.vala
new file mode 100644 (file)
index 0000000..cc82e85
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+ 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 Adblock {
+    public class Options : GLib.Object {
+        HashTable<string, string?> optslist;
+
+        public Options () {
+            clear ();
+        }
+
+        public void insert (string sig, string? opts) {
+            optslist.insert (sig, opts);
+        }
+
+        public string? lookup (string sig) {
+            return optslist.lookup (sig);
+        }
+
+        public void clear () {
+            optslist = new HashTable<string, string?> (str_hash, str_equal);
+        }
+    }
+}
diff --git a/extensions/adblock/pattern.vala b/extensions/adblock/pattern.vala
new file mode 100644 (file)
index 0000000..ebc651d
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+    public class Pattern : Filter {
+        public Pattern (Options options) {
+            base (options);
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            foreach (var patt in rules.get_keys ())
+                if (check_rule (rules.lookup (patt), patt, request_uri, page_uri))
+                    return Directive.BLOCK;
+            return null;
+        }
+    }
+}
diff --git a/extensions/adblock/subscriptions.vala b/extensions/adblock/subscriptions.vala
new file mode 100644 (file)
index 0000000..20efb2e
--- /dev/null
@@ -0,0 +1,403 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+    public abstract class Feature : GLib.Object {
+        public virtual bool header (string key, string value) {
+            return false;
+        }
+        public virtual bool parsed (File file) {
+            return true;
+        }
+        public virtual Directive? match (string request_uri, string page_uri) throws Error {
+            return null;
+        }
+        public virtual void clear () {
+        }
+    }
+
+    public class Subscription : GLib.Object {
+        public string? path;
+        bool debug_parse;
+        public string uri { get; set; default = null; }
+        public string title { get; set; default = null; }
+        public bool active { get; set; default = true; }
+        public bool mutable { get; set; default = true; }
+        public bool valid { get; private set; default = true; }
+        HashTable<string, Directive?> cache;
+        List<Feature> features;
+        public Pattern pattern;
+        public Keys keys;
+        public Options optslist;
+        public Whitelist whitelist;
+        public Element element;
+#if !HAVE_WEBKIT2
+        WebKit.Download? download;
+#endif
+
+        public Subscription (string uri) {
+            debug_parse = "adblock:parse" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+
+            this.uri = uri;
+
+            this.optslist = new Options ();
+            this.whitelist = new Whitelist (optslist);
+            add_feature (this.whitelist);
+            this.keys = new Keys (optslist);
+            add_feature (this.keys);
+            this.pattern = new Pattern (optslist);
+            add_feature (this.pattern);
+            this.element = new Element ();
+            add_feature (this.element);
+            clear ();
+        }
+
+        public void add_feature (Feature feature) {
+            features.append (feature);
+            size++;
+        }
+
+        /* foreach support */
+        public new Feature? get (uint index) {
+            return features.nth_data (index);
+        }
+        public uint size { get; private set; }
+
+        public void clear () {
+            cache = new HashTable<string, Directive?> (str_hash, str_equal);
+            foreach (var feature in features)
+                feature.clear ();
+            optslist.clear ();
+        }
+
+        internal void parse_line (string? line) throws Error {
+            if (line.has_prefix ("@@")) {
+                if (line.contains("$") && line.contains ("domain"))
+                    return;
+                if (line.has_prefix ("@@||"))
+                    add_url_pattern ("^", "whitelist", line.offset (4));
+                else if (line.has_prefix ("@@|"))
+                    add_url_pattern ("^", "whitelist", line.offset (3));
+                else
+                    add_url_pattern ("", "whitelist", line.offset (2));
+                return;
+            }
+            /* TODO: [include] [exclude] */
+            if (line[0] == '[')
+                return;
+
+            /* CSS block hider */
+            if (line.has_prefix ("##")) {
+                /* TODO */
+                return;
+            }
+            if (line[0] == '#')
+                return;
+
+            /* TODO: CSS hider whitelist */
+            if ("#@#" in line)
+                return;
+
+            /* Per domain CSS hider rule */
+            if ("##" in line) {
+                frame_add_private (line, "##");
+                return;
+            }
+            if ("#" in line) {
+                frame_add_private (line, "#");
+                return;
+            }
+
+            /* URL blocker rule */
+            if (line.has_prefix ("|")) {
+                /* TODO: handle options and domains excludes */
+                if (line.contains("$"))
+                    return;
+
+                if (line.has_prefix ("||"))
+                    add_url_pattern ("", "fulluri", line.offset (2));
+                else
+                    add_url_pattern ("^", "fulluri", line.offset (1));
+                return /* add_url_pattern */;
+            }
+
+            add_url_pattern ("", "uri", line);
+            return /* add_url_pattern */;
+        }
+
+        void frame_add_private (string line, string sep) {
+            string[] data = line.split (sep, 2);
+            if (!(data[1] != null && data[1] != "")
+             ||  data[1].chr (-1, '\'') != null
+             || (data[1].chr (-1, ':') != null
+             && !Regex.match_simple (".*\\[.*:.*\\].*", data[1],
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))) {
+                return;
+            }
+
+            if (data[0].chr (-1, ',') != null) {
+                string[] domains = data[0].split (",", -1);
+
+                foreach (string domain in domains) {
+                    /* Ignore Firefox-specific option */
+                    if (domain == "~pregecko2")
+                        continue;
+                    /* FIXME: ~ should negate match */
+                    if (domain[0] == '~')
+                        domain = domain.substring (1, -1);
+                    update_css_hash (domain.strip (), data[1]);
+                }
+            }
+            else {
+                update_css_hash (data[0], data[1]);
+            }
+        }
+
+        bool css_element_seems_valid (string element) {
+            bool is_valid = true;
+            string[] valid_elements = { "::after", "::before", "a", "abbr", "address", "article", "aside",
+                "b", "blockquote", "caption", "center", "cite", "code", "div", "dl", "dt", "dd", "em",
+                "feed", "fieldset", "figcaption", "figure", "font", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6",
+                "header", "hgroup", "i", "iframe", "iframe html *", "img", "kbd", "label", "legend", "li",
+                "m", "main", "marquee", "menu", "nav", "ol", "option", "p", "pre", "q", "samp", "section",
+                "small", "span", "strong", "summary", "table", "tr", "tbody", "td", "th", "thead", "tt", "ul" };
+
+            if (!element.has_prefix (".") && !element.has_prefix ("#")
+            && !(element.split("[")[0] in valid_elements))
+                is_valid = false;
+
+
+            bool debug_selectors = "adblock:css" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+            if (debug_selectors)
+                stdout.printf ("Adblock '%s' %s: %s\n",
+                    this.title, is_valid ? "selector" : "INVALID?", element);
+
+            return is_valid;
+        }
+
+        void update_css_hash (string domain, string value) {
+            if (css_element_seems_valid (value)) {
+                string? olddata = element.lookup (domain);
+                if (olddata != null) {
+                    string newdata = olddata + " , " + value;
+                    element.insert (domain, newdata);
+                } else {
+                    element.insert (domain, value);
+                }
+            }
+        }
+
+        void add_url_pattern (string prefix, string type, string line) throws Error {
+            string[]? data = line.split ("$", 2);
+            if (data == null || data[0] == null)
+                return;
+
+            string patt, opts;
+            patt = data[0];
+            opts = type;
+
+            if (data[1] != null)
+                opts = type + "," + data[1];
+
+            if (Regex.match_simple ("subdocument", opts,
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))
+                return;
+
+            string format_patt = fixup_regex (prefix, patt);
+            if (debug_parse)
+                stdout.printf ("got: %s opts %s\n", format_patt, opts);
+            compile_regexp (format_patt, opts);
+            /* return format_patt */
+        }
+
+        bool compile_regexp (string? patt, string opts) throws Error {
+            if (patt == null)
+                return false;
+            try {
+                var regex = new Regex (patt, RegexCompileFlags.OPTIMIZE, RegexMatchFlags.NOTEMPTY);
+                /* is pattern is already a regex? */
+                if (Regex.match_simple ("^/.*[\\^\\$\\*].*/$", patt,
+                    RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY)
+                 || (opts != null && opts.contains ("whitelist"))) {
+                    if (debug_parse)
+                        stdout.printf ("patt: %s\n", patt);
+                    if (opts.contains ("whitelist"))
+                        this.whitelist.insert (patt, regex);
+                    else
+                        this.pattern.insert (patt, regex);
+                    this.optslist.insert (patt, opts);
+                    return false;
+                } else { /* nope, no regex */
+                    int pos = 0, len;
+                    int signature_size = 8;
+                    string sig;
+                    len = patt.length;
+
+                    /* chop up pattern into substrings for faster matching */
+                    for (pos = len - signature_size; pos>=0; pos--)
+                    {
+                        sig = patt.offset (pos).ndup (signature_size);
+                        /* we don't have a * nor \\, does not look like regex, save chunk as "key" */
+                        if (!Regex.match_simple ("[\\*]", sig, RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY) && keys.lookup (sig) == null) {
+                            this.keys.insert (sig, regex);
+                            this.optslist.insert (sig, opts);
+                        } else {
+                            /* starts with * or \\ - save as regex */
+                            if ((sig.has_prefix ("*") || sig.has_prefix("\\")) && this.pattern.lookup (sig) == null) {
+                                this.pattern.insert (sig, regex);
+                                this.optslist.insert (sig, opts);
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+            catch (Error error) {
+                warning ("Adblock compile regexp: %s", error.message);
+                return true;
+            }
+        }
+
+        public void parse_header (string header) throws Error {
+            /* Headers come in two forms
+               ! Foo: Bar
+               ! Some freeform text
+             */
+            string key = header;
+            string value = "";
+            if (header.contains (":")) {
+                string[] parts = header.split (":", 2);
+                if (parts[0] != null && parts[0] != ""
+                 && parts[1] != null && parts[1] != "") {
+                    key = parts[0].substring (2, -1);
+                    value = parts[1].substring (1, -1);
+                }
+            }
+            debug ("Header '%s' says '%s'", key, value);
+            if (key == "Title")
+                title = value;
+            foreach (var feature in features) {
+                if (feature.header (key, value))
+                    break;
+            }
+        }
+
+#if !HAVE_WEBKIT2
+        void download_status (ParamSpec pspec) {
+            if (download.get_status () != WebKit.DownloadStatus.FINISHED)
+                return;
+
+            download = null;
+            try {
+                parse ();
+            } catch (Error error) {
+                warning ("Error parsing %s: %s", uri, error.message);
+            }
+        }
+#endif
+
+        public void parse () throws Error
+        {
+            if (!active)
+                return;
+
+            debug ("Parsing %s (%s)", uri, path);
+
+            clear ();
+
+            if (uri.has_prefix ("file://"))
+                path = Filename.from_uri (uri);
+            else {
+                string cache_dir = GLib.Path.build_filename (GLib.Environment.get_user_cache_dir (), PACKAGE_NAME, "adblock");
+                Midori.Paths.mkdir_with_parents (cache_dir);
+                string filename = Checksum.compute_for_string (ChecksumType.MD5, this.uri, -1);
+                path = GLib.Path.build_filename (cache_dir, filename);
+            }
+
+            File filter_file = File.new_for_path (path);
+            DataInputStream stream;
+            try  {
+                stream = new DataInputStream (filter_file.read ());
+            } catch (IOError.NOT_FOUND exist_error) {
+#if HAVE_WEBKIT2
+                /* TODO */
+#else
+                /* Don't bother trying to download local files */
+                if (!uri.has_prefix ("file://")) {
+                    if (download != null)
+                        return;
+
+                    string destination_uri = Filename.to_uri (path, null);
+                    debug ("Fetching %s to %s now", uri, destination_uri);
+                    download = new WebKit.Download (new WebKit.NetworkRequest (uri));
+                    if (!Midori.Download.has_enough_space (download, destination_uri, true))
+                         throw new FileError.EXIST ("Can't download to \"%s\"", path);
+                    download.destination_uri = destination_uri;
+                    download.notify["status"].connect (download_status);
+                    download.start ();
+                }
+#endif
+                return;
+            }
+
+            valid = false;
+            string? line;
+            while ((line = stream.read_line (null)) != null) {
+                if (line == null)
+                    continue;
+                string chomped = line.chomp ();
+                if (chomped == "")
+                    continue;
+                if (line[0] == '!')
+                    parse_header (chomped);
+                else
+                    parse_line (chomped);
+                /* The file isn't completely empty */
+                valid = true;
+            }
+
+            foreach (var feature in features) {
+                if (!feature.parsed (filter_file))
+                    valid = false;
+            }
+        }
+
+        public Directive? get_directive (string request_uri, string page_uri) {
+            try {
+                Directive? directive = cache.lookup (request_uri);
+                if (directive != null)
+                    return directive;
+                foreach (var feature in features) {
+                    directive = feature.match (request_uri, page_uri);
+                    if (directive != null) {
+                        debug ("%s gave %s for %s (%s)\n",
+                               feature.get_type ().name (), directive.to_string (), request_uri, page_uri);
+                        return directive;
+                    }
+                }
+            } catch (Error error) {
+                warning ("Adblock match error: %s\n", error.message);
+            }
+            return null;
+        }
+
+        public void add_rule (string rule) {
+            try {
+                var file = File.new_for_uri (uri);
+                file.append_to (FileCreateFlags.NONE).write (("%s\n".printf (rule)).data);
+                parse ();
+            } catch (Error error) {
+                warning ("Failed to add custom rule: %s", error.message);
+            }
+        }
+    }
+}
diff --git a/extensions/adblock/updater.vala b/extensions/adblock/updater.vala
new file mode 100644 (file)
index 0000000..bcbb9b6
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ Copyright (C) 2014 Paweł Forysiuk <tuxator@o2.pl>
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+ 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 Adblock {
+    public class Updater : Feature {
+        string expires_meta;
+        string last_mod_meta;
+        public DateTime last_updated { get; set; }
+        public DateTime expires { get; set; }
+        public bool needs_update { get; set; }
+
+        public Updater () {
+        }
+
+        public override void clear () {
+            expires_meta = null;
+            last_mod_meta = null;
+            last_updated = null;
+            expires = null;
+            needs_update = false;
+        }
+
+        public override bool header (string key, string value) {
+            if (key.has_prefix ("Last mod") || key == "Updated") {
+                last_mod_meta = value;
+                return true;
+            } else if (key == "Expires") {
+                /* ! Expires: 5 days (update frequency) */
+                expires_meta = value;
+                return true;
+            } else if (key.has_prefix ("! This list expires after")) {
+                /* ! This list expires after 14 days */
+                expires_meta = key.substring (26, -1);
+                return true;
+            }
+            return false;
+        }
+
+        public override bool parsed (File file) {
+            process_dates (file);
+            /* It's not an error to have no update headers, we go for defaults */
+            return true;
+        }
+
+        int get_month_from_string (string? month) {
+            if (month == null)
+                return 0;
+
+            string[] months = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+            for (int i = 0; i<= months.length; i++)
+            {
+                if (month.has_prefix (months[i]))
+                    return i+1;
+            }
+            return 0;
+        }
+
+        void process_dates (File file) {
+            DateTime now = new DateTime.now_local ();
+            last_updated = null;
+            expires = null;
+
+            /* We have "last modification" metadata */
+            if (last_mod_meta != null && (last_mod_meta.contains (" ") && last_mod_meta[0].isdigit () == true)) {
+                int h = 0, min = 0, d, m, y;
+                /* Date in a form of: 20.08.2012 12:34 */
+                if (last_mod_meta.contains (".") || last_mod_meta.contains("-")) {
+                    string[] parts = last_mod_meta.split (" ", 2);
+                    string[] date_parts;
+                    string split_char = " ";
+
+                    /* contains time part ? */
+                    if (parts[1] != "" && parts[1].contains (":")) {
+                        string[] time_parts = parts[1].split (":", 2);
+                        h = int.parse(time_parts[0]);
+                        min = int.parse(time_parts[1]);
+                    }
+
+                    /* check if dot or dash was used as a delimiter */
+                    if (parts[0].contains ("."))
+                        split_char = ".";
+                    else if (parts[0].contains ("-"))
+                        split_char = "-";
+
+                    date_parts = parts[0].split (split_char, 3);
+                    m = int.parse(date_parts[1]);
+                    if (date_parts[2].length == 4) {
+                        y = int.parse(date_parts[2]);
+                        d = int.parse(date_parts[0]);
+                    } else {
+                        y = int.parse(date_parts[0]);
+                        d = int.parse(date_parts[2]);
+                    }
+                } else { /* Date in a form of: 20 Mar 2012 12:34 */
+                    string[] parts = last_mod_meta.split (" ", 4);
+                    /* contains time part ? */
+                    if (parts[3] != null && parts[3].contains (":")) {
+                        string[] time_parts = parts[3].split (":", 2);
+                        h = int.parse(time_parts[0]);
+                        min = int.parse(time_parts[1]);
+                    }
+
+                    m = get_month_from_string (parts[1]);
+                    if (parts[2].length == 4) {
+                        y = int.parse(parts[2]);
+                        d = int.parse(parts[0]);
+                    } else {
+                        y = int.parse(parts[0]);
+                        d = int.parse(parts[2]);
+                    }
+                }
+
+                last_updated = new DateTime.local (y, m, d, h, min, 0.0);
+            } else {
+                /* FIXME: use file modification date if there's no update header
+                try {
+                    string modified = FileAttribute.TIME_MODIFIED;
+                    var info = file.query_filesystem_info (modified);
+                    last_updated = new DateTime.from_timeval_local (info.get_modification_time ());
+                } catch (Error error) {
+                    last_updated = now;
+                }
+                 */
+                last_updated = now;
+            }
+
+            /* We have "expires" metadata */
+            if (expires_meta != null) {
+                if (expires_meta.contains ("days")) {
+                    string[] parts = expires_meta.split (" ");
+                    expires = last_updated.add_days (int.parse (parts[0]));
+                } else if (expires_meta.contains ("hours")) {
+                    string[] parts = expires_meta.split (" ");
+                    expires = last_updated.add_hours (int.parse (parts[0]));
+                }
+            } else {
+                /* No expire metadata found, assume x days */
+                int days_to_expire = 7;
+                expires = last_updated.add_days (days_to_expire);
+            }
+
+            /* Check if we are past expire date */
+            needs_update = now.compare (expires) == 1;
+        }
+    }
+}
diff --git a/extensions/adblock/whitelist.vala b/extensions/adblock/whitelist.vala
new file mode 100644 (file)
index 0000000..3396d72
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2014 Paweł Forysiuk <tuxator@o2.pl>
+
+ 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 Adblock {
+    public class Whitelist : Filter {
+        public Whitelist (Options options) {
+            base (options);
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            foreach (var white in rules.get_keys ()) {
+                var regex = rules.lookup (white);
+                if (!regex.match_full (request_uri))
+                    return null;
+                if (Regex.match_simple (regex.get_pattern (), request_uri, RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY))
+                    return Directive.ALLOW;
+            }
+            return null;
+        }
+    }
+}
diff --git a/extensions/adblock/widgets.vala b/extensions/adblock/widgets.vala
new file mode 100644 (file)
index 0000000..4be1d29
--- /dev/null
@@ -0,0 +1,327 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
+
+ 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 Adblock {
+
+
+    public class StatusIcon {
+        Config config;
+        SubscriptionManager manager;
+        public State state;
+        public bool debug_element_toggled;
+        public List<IconButton> toggle_buttons;
+
+        public StatusIcon (Adblock.Config config, SubscriptionManager manager) {
+            this.config = config;
+            this.manager = manager;
+            this.debug_element_toggled = false;
+        }
+
+        public void set_state (Adblock.State state) {
+            this.state = state;
+            update_buttons ();
+        }
+
+        public class IconButton : Gtk.Button {
+            Gtk.Image icon;
+
+            public IconButton () {
+                icon = new Gtk.Image ();
+                add (icon);
+                icon.show ();
+            }
+
+            public void set_status (string status) {
+                icon.set_from_file (Midori.Paths.get_res_filename ("adblock/%s.png".printf (status)));
+            }
+        }
+
+        public IconButton add_button () {
+            var button = new IconButton ();
+            button.set_status (config.enabled ? "enabled" : "disabled");
+            button.clicked.connect (icon_clicked);
+            button.destroy.connect (()=> { toggle_buttons.remove (button); });
+            toggle_buttons.append (button);
+            return button;
+        }
+
+        public void update_buttons () {
+            string state = "";
+            foreach (var toggle_button in toggle_buttons) {
+                if (this.state == State.BLOCKED) {
+                    toggle_button.set_status ("blocked");
+                    state = _("Blocking");
+                }
+                if (this.state == State.ENABLED) {
+                    toggle_button.set_status ("enabled");
+                    state = _("Enabled");
+                }
+                if (this.state == State.DISABLED) {
+                    toggle_button.set_status ("disabled");
+                    state = _("Disabled");
+                }
+                toggle_button.set_tooltip_text (_("Adblock state: %s").printf (state));
+            }
+        }
+
+        public void icon_clicked (Gtk.Button toggle_button) {
+            var menu = new Gtk.Menu ();
+
+            var menuitem = new Gtk.ImageMenuItem.with_label (_("Preferences"));
+            var image = new Gtk.Image.from_stock (Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU);
+            menuitem.always_show_image = true;
+            menuitem.set_image (image);
+            menuitem.activate.connect (() => {
+                manager.add_subscription (null);
+            });
+            menu.append (menuitem);
+
+            var separator = new Gtk.SeparatorMenuItem ();
+            menu.append (separator);
+
+            var checkitem = new Gtk.CheckMenuItem.with_label (_("Disable"));
+            checkitem.set_active (!config.enabled);
+            checkitem.toggled.connect (() => {
+                config.enabled = !checkitem.active;
+                set_state (config.enabled ? Adblock.State.ENABLED : Adblock.State.DISABLED);
+            });
+            menu.append (checkitem);
+
+            var hideritem = new Gtk.CheckMenuItem.with_label (_("Display hidden elements"));
+            hideritem.set_active (debug_element_toggled);
+            hideritem.toggled.connect (() => {
+                this.debug_element_toggled = hideritem.active;
+            });
+            menu.append (hideritem);
+
+            menu.show_all ();
+            menu.attach_to_widget (toggle_button, null);
+            menu.popup (null, null, null, 1, Gtk.get_current_event_time ());
+        }
+    }
+
+    public class SubscriptionManager {
+        Gtk.TreeView treeview;
+        Gtk.ListStore liststore;
+        Adblock.Config config;
+        public Gtk.Label description_label;
+        string description;
+
+        public SubscriptionManager (Config config) {
+            this.config = config;
+            this.liststore = new Gtk.ListStore (1, typeof (Subscription));
+            this.description_label = new Gtk.Label (null);
+            this.description = _("Type the address of a preconfigured filter list in the text entry and hit Enter.\n");
+            this.description += _("You can find more lists by visiting following sites:\n %s, %s\n".printf (
+                "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a>",
+                "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>"
+            ));
+        }
+
+        public void add_subscription (string? uri) {
+            var dialog = new Gtk.Dialog.with_buttons (_("Configure Advertisement filters"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
+                Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
+#if HAVE_GTK3
+            dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
+#endif
+            dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
+            dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
+
+            var hbox = new Gtk.HBox (false, 0);
+            (dialog.get_content_area () as Gtk.Box).pack_start (hbox, true, true, 12);
+            var vbox = new Gtk.VBox (false, 0);
+            hbox.pack_start (vbox, true, true, 4);
+            this.description_label.set_markup (this.description);
+            this.description_label.set_line_wrap (true);
+            vbox.pack_start (this.description_label, false, false, 4);
+
+            var entry = new Gtk.Entry ();
+            if (uri != null)
+                entry.set_text (uri);
+            vbox.pack_start (entry, false, false, 4);
+
+            liststore = new Gtk.ListStore (1, typeof (Subscription));
+            treeview = new Gtk.TreeView.with_model (liststore);
+            treeview.set_headers_visible (false);
+            var column = new Gtk.TreeViewColumn ();
+            var renderer_toggle = new Gtk.CellRendererToggle ();
+            column.pack_start (renderer_toggle, false);
+            column.set_cell_data_func (renderer_toggle, (column, renderer, model, iter) => {
+                Subscription sub;
+                liststore.get (iter, 0, out sub);
+                renderer.set ("active", sub.active,
+                              "sensitive", sub.mutable);
+            });
+            renderer_toggle.toggled.connect ((path) => {
+                Gtk.TreeIter iter;
+                if (liststore.get_iter_from_string (out iter, path)) {
+                    Subscription sub;
+                    liststore.get (iter, 0, out sub);
+                    sub.active = !sub.active;
+                }
+            });
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            var renderer_text = new Gtk.CellRendererText ();
+            column.pack_start (renderer_text, false);
+            renderer_text.set ("editable", true);
+            // TODO: renderer_text.edited.connect
+            column.set_cell_data_func (renderer_text, (column, renderer, model, iter) => {
+                Subscription sub;
+                liststore.get (iter, 0, out sub);
+                string status = "";
+                foreach (var feature in sub) {
+                    if (feature is Adblock.Updater) {
+                        var updater = feature as Adblock.Updater;
+                        if (updater.last_updated != null)
+                            status = updater.last_updated.format (_("Last update: %x %X"));
+                    }
+                }
+                if (!sub.valid)
+                    status = _("File incomplete - broken download?");
+                renderer.set ("markup", (Markup.printf_escaped ("<b>%s</b>\n%s",
+                    sub.title ?? sub.uri, status)));
+            });
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_button = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_button, false);
+            column.set_cell_data_func (renderer_button, on_render_button);
+            treeview.append_column (column);
+
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            scrolled.add (treeview);
+            vbox.pack_start (scrolled);
+            int height;
+            treeview.create_pango_layout ("a\nb").get_pixel_size (null, out height);
+            scrolled.set_size_request (-1, height * 5);
+
+            foreach (Subscription sub in config)
+                liststore.insert_with_values (null, 0, 0, sub);
+            treeview.button_release_event.connect (button_released);
+
+            entry.activate.connect (() => {
+                string? parsed_uri = Adblock.parse_subscription_uri (entry.text);
+                if (parsed_uri != null) {
+                    var sub = new Subscription (parsed_uri);
+                    if (config.add (sub)) {
+                        liststore.insert_with_values (null, 0, 0, sub);
+                        try {
+                            sub.parse ();
+                        } catch (GLib.Error error) {
+                            warning ("Error parsing %s: %s", sub.uri, error.message);
+                        }
+                    }
+                }
+                entry.text = "";
+            });
+
+            dialog.get_content_area ().show_all ();
+
+            dialog.response.connect ((response)=>{ dialog.destroy (); });
+            dialog.show ();
+        }
+
+        void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            Subscription sub;
+            liststore.get (iter, 0, out sub);
+
+            renderer.set ("stock-id", sub.mutable ? Gtk.STOCK_DELETE : null,
+                          "stock-size", Gtk.IconSize.MENU);
+        }
+
+        public bool button_released (Gdk.EventButton event) {
+            Gtk.TreePath? path;
+            Gtk.TreeViewColumn column;
+            if (treeview.get_path_at_pos ((int)event.x, (int)event.y, out path, out column, null, null)) {
+                if (path != null) {
+                    if (column == treeview.get_column (2)) {
+                        Gtk.TreeIter iter;
+                        if (liststore.get_iter (out iter, path)) {
+                            Subscription sub;
+                            liststore.get (iter, 0, out sub);
+                            if (sub.mutable) {
+                                config.remove (sub);
+                                liststore.remove (iter);
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
+    class CustomRulesEditor {
+        Gtk.Dialog dialog;
+        Subscription custom;
+        public string? rule { get; set; }
+
+        public CustomRulesEditor (Subscription custom) {
+            this.custom = custom;
+        }
+
+        public void set_uri (string uri) {
+            this.rule = uri;
+        }
+
+        public void show () {
+             this.dialog = new Gtk.Dialog.with_buttons (_("Edit rule"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);
+            dialog.set_icon_name (Gtk.STOCK_ADD);
+            dialog.resizable = false;
+
+            var hbox = new Gtk.HBox (false, 8);
+            var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
+            hbox.border_width = 5;
+            var label = new Gtk.Label.with_mnemonic (_("_Rule:"));
+            sizegroup.add_widget (label);
+            hbox.pack_start (label, false, false, 0);
+            (dialog.get_content_area () as Gtk.Box).pack_start (hbox, false, true, 0);
+
+            var entry = new Gtk.Entry ();
+            sizegroup.add_widget (entry);
+            entry.activates_default = true;
+            entry.set_text (this.rule);
+            hbox.pack_start (entry, true, true, 0);
+
+            dialog.get_content_area ().show_all ();
+
+            dialog.set_default_response (Gtk.ResponseType.ACCEPT);
+            if (dialog.run () != Gtk.ResponseType.ACCEPT)
+                return;
+
+            this.rule = entry.get_text ();
+            this.dialog.destroy ();
+            custom.add_rule (this.rule);
+        }
+    }
+
+}
index 57770bc6fc2151aa0e2c1bd7edd58d4759097188..319c290cf9add5852ccf07046052ddded200cd4f 100644 (file)
@@ -393,6 +393,9 @@ addons_button_delete_clicked_cb (GtkWidget* toolitem,
 {
     GtkTreeModel* model;
     GtkTreeIter iter;
+    GtkTreePath* path;
+    GtkTreeRowReference* row;
+    gchar* fullpath;
 
     if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (addons->treeview),
                                                           &model, &iter))
@@ -403,6 +406,11 @@ addons_button_delete_clicked_cb (GtkWidget* toolitem,
         gchar* markup;
 
         gtk_tree_model_get (model, &iter, 0, &element, -1);
+        fullpath = g_strdup (element->fullpath);
+        
+        path = gtk_tree_model_get_path (model, &iter);
+        row = gtk_tree_row_reference_new (model, path);
+        gtk_tree_path_free (path);
         dialog = gtk_message_dialog_new (
             GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))),
             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -424,6 +432,9 @@ addons_button_delete_clicked_cb (GtkWidget* toolitem,
             GTK_MESSAGE_DIALOG (dialog), "%s", markup);
         g_free (markup);
 
+        /* The execution of gtk_dialog_run allows the directory watcher to
+        rebuild the treeview and the element list, so our references may be
+        invalid afterward */
         delete_response = gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (GTK_WIDGET (dialog));
 
@@ -433,7 +444,7 @@ addons_button_delete_clicked_cb (GtkWidget* toolitem,
             GFile* file;
             gboolean result;
 
-            file = g_file_new_for_path (element->fullpath);
+            file = g_file_new_for_path (fullpath);
             result = g_file_delete (file, NULL, &error);
 
             if (!result && error)
@@ -452,11 +463,20 @@ addons_button_delete_clicked_cb (GtkWidget* toolitem,
                     g_error_free (error);
             }
 
-            if (result)
+            /* The row reference may have been invalidated if the
+            filesystem watcher deleted the row concurrently */
+            if (result && gtk_tree_row_reference_valid (row))
+            {
+                path = gtk_tree_row_reference_get_path (row);
+                gtk_tree_model_get_iter (model, &iter, path);
+                gtk_tree_path_free (path);
                 gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+            }
 
+            gtk_tree_row_reference_free (row);
             g_object_unref (file);
         }
+        g_free (fullpath);
     }
 }
 static void
@@ -485,8 +505,8 @@ addons_open_in_editor_clicked_cb (GtkWidget* toolitem,
         else
         {
             gchar* element_uri = g_filename_to_uri (element->fullpath, NULL, NULL);
-            sokoke_show_uri (NULL, element_uri,
-                             gtk_get_current_event_time (), NULL);
+            gboolean handled = FALSE;
+            g_signal_emit_by_name (midori_browser_get_current_tab (browser), "open-uri", element_uri, &handled);
             g_free (element_uri);
         }
 
@@ -522,8 +542,9 @@ addons_open_target_folder_clicked_cb (GtkWidget* toolitem,
     folder_uri = g_filename_to_uri (folder, NULL, NULL);
     g_free (folder);
 
-    sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (addons->treeview)),
-                     folder_uri, gtk_get_current_event_time (), NULL);
+    MidoriBrowser* browser = midori_browser_get_for_widget (addons->treeview);
+    gboolean handled = FALSE;
+    g_signal_emit_by_name (midori_browser_get_current_tab (browser), "open-uri", folder_uri, &handled);
     g_free (folder_uri);
 }
 
@@ -617,7 +638,6 @@ addons_get_toolbar (MidoriViewable* viewable)
     if (!ADDONS (viewable)->toolbar)
     {
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         toolitem = gtk_tool_item_new ();
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
         gtk_widget_show (GTK_WIDGET (toolitem));
@@ -1044,7 +1064,7 @@ css_metadata_from_file (const gchar* filename,
                          domain = g_strndup (value + begin, end - begin * 2);
                          if (!midori_uri_is_location (domain)
                           && !g_str_has_prefix (domain, "file://"))
-                             tmp_domain = g_strdup_printf ("http://*%s/*", domain);
+                             tmp_domain = g_strdup_printf ("http*://*%s/*", domain);
                          else
                              tmp_domain = domain;
 
@@ -1448,6 +1468,12 @@ static gboolean
 addons_skip_element (struct AddonElement* element,
                      gchar* uri)
 {
+    if (midori_debug("addons:match"))
+    {
+       g_print("%s: %s on %s matched: %d\n", G_STRFUNC,
+               element->displayname, uri, addons_may_run (uri, &element->includes, &element->excludes));
+    }
+
     if (!element->enabled || element->broken)
         return TRUE;
     if (element->includes || element->excludes)
@@ -1866,6 +1892,8 @@ test_addons_simple_regexp (void)
     { "*", "^.*" },
     { "http://", "^http://" },
     { "https://", "^https://" },
+    { "http*://", "^http://" },
+    { "http*://", "^https://" },
     { "about:blank", "^about:blank" },
     { "file://", "^file://" },
     { "ftp://", "^ftp://" },
index 7be0d2a2d69f01f6a0a7de36a8189ef90edce2e4..16e2286d5b6e87021808cd50b796db47c5741c63 100644 (file)
@@ -10,7 +10,8 @@
 */
 
 namespace Apps {
-    const string EXEC_PREFIX = PACKAGE_NAME + " -a ";
+    const string APP_PREFIX = PACKAGE_NAME + " -a ";
+    const string PROFILE_PREFIX = PACKAGE_NAME + " -c ";
 
     private class Launcher : GLib.Object, GLib.Initable {
         internal GLib.File file;
@@ -19,31 +20,145 @@ namespace Apps {
         internal string exec;
         internal string uri;
 
-        internal static async void create (GLib.File folder, string uri, string title) {
+        internal static string get_favicon_name_for_uri (string prefix, GLib.File folder, string uri, bool testing)
+        {
+            string icon_name = Midori.Stock.WEB_BROWSER;
+
+            if (testing == true)
+                return icon_name;
+
+            if (prefix != PROFILE_PREFIX)
+            {
+                try {
+                    var pixbuf = Midori.Paths.get_icon (uri, null);
+                    if (pixbuf == null)
+                        throw new FileError.EXIST ("No favicon loaded");
+                    string icon_filename = folder.get_child ("icon.png").get_path ();
+                    pixbuf.save (icon_filename, "png", null, "compression", "7", null);
+#if HAVE_WIN32
+                    string doubleslash_icon = icon_filename.replace ("\\", "\\\\");
+                    icon_name = doubleslash_icon;
+#else
+                    icon_name = icon_filename;
+#endif
+                }
+                catch (Error error) {
+                    GLib.warning (_("Failed to fetch application icon in %s: %s"), folder.get_path (), error.message);
+                }
+            }
+            return icon_name;
+        }
+
+        internal static string prepare_desktop_file (string prefix, string name, string uri, string title, string icon_name)
+        {
+            string exec;
+#if HAVE_WIN32
+            string doubleslash_uri = uri.replace ("\\", "\\\\");
+            string quoted_uri = GLib.Shell.quote (doubleslash_uri);
+            exec = prefix + quoted_uri;
+#else
+            exec = prefix + uri;
+#endif
+            var keyfile = new GLib.KeyFile ();
+            string entry = "Desktop Entry";
+
+            keyfile.set_string (entry, "Version", "1.0");
+            keyfile.set_string (entry, "Type", "Application");
+            keyfile.set_string (entry, "Name", name);
+            keyfile.set_string (entry, "Exec", exec);
+            keyfile.set_string (entry, "TryExec", PACKAGE_NAME);
+            keyfile.set_string (entry, "Icon", icon_name);
+            keyfile.set_string (entry, "Categories", "Network;");
+            /*
+               Using the sanitized URI as a class matches midori_web_app_new
+               So dock type launchers can distinguish different apps with the same executable
+             */
+            if (exec.has_prefix (APP_PREFIX))
+                keyfile.set_string (entry, "StartupWMClass", uri.delimit (":.\\/", '_'));
+
+            return keyfile.to_data();
+        }
+
+        internal static File get_app_folder () {
+            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
+            return data_dir.get_child ("apps");
+        }
+
+        internal static async File create_app (string uri, string title, Gtk.Widget? proxy) {
+            string checksum = Checksum.compute_for_string (ChecksumType.MD5, uri, -1);
+            var folder = get_app_folder ();
+            yield Launcher.create (APP_PREFIX, folder.get_child (checksum),
+                uri, title, proxy);
+            return folder.get_child (checksum);
+        }
+
+        internal static File get_profile_folder () {
+            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ()).get_child (PACKAGE_NAME);
+            return data_dir.get_child ("profiles");
+        }
+
+        internal static async File create_profile (Gtk.Widget? proxy) {
+            string uuid = g_dbus_generate_guid ();
+            string config = Path.build_path (Path.DIR_SEPARATOR_S,
+                Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
+            var folder = get_profile_folder ();
+            yield Launcher.create (PROFILE_PREFIX, folder.get_child (uuid),
+                config, _("Midori (%s)").printf (uuid), proxy);
+            return folder.get_child (uuid);
+        }
+
+        internal static async void create (string prefix, GLib.File folder, string uri, string title, Gtk.Widget proxy) {
             /* Strip LRE leading character and / */
-            string filename = title.delimit ("‪/", ' ') + ".desktop";
-            string exec = EXEC_PREFIX + uri;
-            string name = title;
-            // TODO: Midori.Paths.get_icon save to png
+            string name = title.delimit ("‪/", ' ').strip();
+            string filename = Midori.Download.clean_filename (name);
             string icon_name = Midori.Stock.WEB_BROWSER;
-            string contents = """
-                [Desktop Entry]
-                Version=1.0
-                Type=Application
-                Name=%s
-                Exec=%s
-                TryExec=%s
-                Icon=%s
-                Categories=Network;
-                """.printf (name, exec, PACKAGE_NAME, icon_name);
-            var file = folder.get_child (filename);
+            bool testing = false;
+            if (proxy == null)
+                testing = true;
+            var file = folder.get_child ("desc");
+
+            try {
+                folder.make_directory_with_parents (null);
+            } catch (IOError.EXISTS exist_error) {
+                /* It's no error if the folder already exists */
+            } catch (Error error) {
+                warning (_("Failed to create new launcher (%s): %s"), file.get_path (), error.message);
+            }
+
+            icon_name = get_favicon_name_for_uri (prefix, folder, uri, testing);
+            string desktop_file = prepare_desktop_file (prefix, name, uri, title, icon_name);
+
             try {
                 var stream = yield file.replace_async (null, false, GLib.FileCreateFlags.NONE);
-                yield stream.write_async (contents.data);
+                yield stream.write_async (desktop_file.data);
+                // Create a launcher/ menu
+#if HAVE_WIN32
+                Midori.Sokoke.create_win32_desktop_lnk (prefix, filename, uri);
+#else
+                var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
+                var desktop_dir = data_dir.get_child ("applications");
+                try {
+                    desktop_dir.make_directory_with_parents (null);
+                } catch (IOError.EXISTS exist_error) {
+                    /* It's no error if the folder already exists */
+                }
+
+                yield file.copy_async (desktop_dir.get_child (filename + ".desktop"),
+                    GLib.FileCopyFlags.NONE);
+#endif
+                if (proxy != null) {
+                    var browser = proxy.get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Launcher created"),
+                        _("You can now run <b>%s</b> from your launcher or menu").printf (name));
+                }
             }
             catch (Error error) {
-                // TODO GUI infobar
-                warning ("Failed to create new launcher: %s", error.message);
+                warning (_("Failed to create new launcher (%s): %s"), file.get_path (), error.message);
+                if (proxy != null) {
+                    var browser = proxy.get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Error creating launcher"),
+                        _("Failed to create new launcher (%s): %s").printf (file.get_path (), error.message));
+                }
             }
         }
 
@@ -52,18 +167,20 @@ namespace Apps {
         }
 
         bool init (GLib.Cancellable? cancellable) throws GLib.Error {
-            if (!file.get_basename ().has_suffix (".desktop"))
-                return false;
-
             var keyfile = new GLib.KeyFile ();
-            keyfile.load_from_file (file.get_path (), GLib.KeyFileFlags.NONE);
+            try {
+                keyfile.load_from_file (file.get_child ("desc").get_path (), GLib.KeyFileFlags.NONE);
+            } catch (Error desc_error) {
+                throw new FileError.EXIST (_("No file \"desc\" found"));
+            }
+
             exec = keyfile.get_string ("Desktop Entry", "Exec");
-            if (!exec.has_prefix (EXEC_PREFIX))
+            if (!exec.has_prefix (APP_PREFIX) && !exec.has_prefix (PROFILE_PREFIX))
                 return false;
 
             name = keyfile.get_string ("Desktop Entry", "Name");
             icon_name = keyfile.get_string ("Desktop Entry", "Icon");
-            uri = exec.replace (EXEC_PREFIX, "");
+            uri = exec.replace (APP_PREFIX, "").replace (PROFILE_PREFIX, "");
             return true;
         }
     }
@@ -73,6 +190,8 @@ namespace Apps {
         Gtk.ListStore store = new Gtk.ListStore (1, typeof (Launcher));
         Gtk.TreeView treeview;
         Katze.Array array;
+        GLib.File app_folder;
+        GLib.File profile_folder;
 
         public unowned string get_stock_id () {
             return Midori.Stock.WEB_BROWSER;
@@ -85,12 +204,93 @@ namespace Apps {
         public Gtk.Widget get_toolbar () {
             if (toolbar == null) {
                 toolbar = new Gtk.Toolbar ();
-                toolbar.set_icon_size (Gtk.IconSize.BUTTON);
+
+#if !HAVE_WIN32
+                /* FIXME: Profiles are broken on win32 because of no multi instance support */
+                var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
+                profile.label = _("New _Profile");
+                profile.tooltip_text = _("Creates a new, independent profile and a launcher");
+                profile.use_underline = true;
+                profile.is_important = true;
+                profile.show ();
+                profile.clicked.connect (() => {
+                    Launcher.create_profile.begin (this);
+                });
+                toolbar.insert (profile, -1);
+#endif
+
+                var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
+                app.label = _("New _App");
+                app.tooltip_text = _("Creates a new app for a specific site");
+                app.use_underline = true;
+                app.is_important = true;
+                app.show ();
+                app.clicked.connect (() => {
+                    var view = (get_toplevel () as Midori.Browser).tab as Midori.View;
+                    string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
+                    Launcher.create.begin (APP_PREFIX, app_folder.get_child (checksum),
+                        view.get_display_uri (), view.get_display_title (), this);
+                });
+                toolbar.insert (app, -1);
             }
             return toolbar;
         }
 
-        public Sidebar (Katze.Array array) {
+        void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (store.get_iter (out iter, path)) {
+                Launcher launcher;
+                store.get (iter, 0, out launcher);
+                try {
+                    GLib.Process.spawn_command_line_async (launcher.exec);
+                }
+                catch (Error error) {
+                    var browser = get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Error launching"), error.message);
+                }
+            }
+        }
+
+        bool button_released (Gdk.EventButton event) {
+            Gtk.TreePath? path;
+            Gtk.TreeViewColumn column;
+            if (event.button != 1)
+               return false;
+            if (treeview.get_path_at_pos ((int)event.x, (int)event.y, out path, out column, null, null)) {
+                if (path != null) {
+                    if (column == treeview.get_column (2)) {
+                        Gtk.TreeIter iter;
+                        if (store.get_iter (out iter, path)) {
+                            Launcher launcher;
+                            store.get (iter, 0, out launcher);
+                            try {
+                                launcher.file.trash (null);
+                                store.remove (iter);
+
+                                string filename = Midori.Download.clean_filename (launcher.name);
+#if HAVE_WIN32
+                                string lnk_filename = Midori.Sokoke.get_win32_desktop_lnk_path_for_filename (filename);
+                                if (Posix.access (lnk_filename, Posix.F_OK) == 0) {
+                                    var lnk_file = File.new_for_path (lnk_filename);
+                                    lnk_file.trash ();
+                                }
+#else
+                                var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
+                                data_dir.get_child ("applications").get_child (filename + ".desktop").trash ();
+#endif
+                            }
+                            catch (Error error) {
+                                GLib.critical ("Failed to remove launcher (%s): %s", launcher.file.get_path (), error.message);
+                            }
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        public Sidebar (Katze.Array array, GLib.File app_folder, GLib.File profile_folder) {
             Gtk.TreeViewColumn column;
 
             treeview = new Gtk.TreeView.with_model (store);
@@ -113,6 +313,14 @@ namespace Apps {
             column.set_cell_data_func (renderer_text, on_render_text);
             treeview.append_column (column);
 
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_button = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_button, false);
+            column.set_cell_data_func (renderer_button, on_render_button);
+            treeview.append_column (column);
+
+            treeview.row_activated.connect (row_activated);
+            treeview.button_release_event.connect (button_released);
             treeview.show ();
             pack_start (treeview, true, true, 0);
 
@@ -121,6 +329,9 @@ namespace Apps {
             array.remove_item.connect (launcher_removed);
             foreach (GLib.Object item in array.get_items ())
                 launcher_added (item);
+
+            this.app_folder = app_folder;
+            this.profile_folder = profile_folder;
         }
 
         private int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
@@ -145,11 +356,18 @@ namespace Apps {
 
             Launcher launcher;
             model.get (iter, 0, out launcher);
-            if (launcher.icon_name != null)
+
+            try {
+                int icon_width = 48, icon_height = 48;
+                Gtk.icon_size_lookup_for_settings (get_settings (),
+                    Gtk.IconSize.DIALOG, out icon_width, out icon_height);
+                var pixbuf = new Gdk.Pixbuf.from_file_at_size (launcher.icon_name, icon_width, icon_height);
+                renderer.set ("pixbuf", pixbuf);
+            }
+            catch (Error error) {
                 renderer.set ("icon-name", launcher.icon_name);
-            else
-                renderer.set ("stock-id", Gtk.STOCK_FILE);
-            renderer.set ("stock-size", Gtk.IconSize.BUTTON,
+            }
+            renderer.set ("stock-size", Gtk.IconSize.DIALOG,
                           "xpad", 4);
         }
 
@@ -163,12 +381,20 @@ namespace Apps {
                     launcher.name, launcher.uri),
                           "ellipsize", Pango.EllipsizeMode.END);
         }
+
+        void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            renderer.set ("stock-id", Gtk.STOCK_DELETE,
+                          "stock-size", Gtk.IconSize.MENU);
+        }
     }
 
     private class Manager : Midori.Extension {
         internal Katze.Array array;
         internal GLib.File app_folder;
-        internal GLib.FileMonitor? monitor;
+        internal GLib.File profile_folder;
+        internal GLib.List<GLib.FileMonitor> monitors;
         internal GLib.List<Gtk.Widget> widgets;
 
         void app_changed (GLib.File file, GLib.File? other, GLib.FileMonitorEvent event) {
@@ -188,24 +414,21 @@ namespace Apps {
                 }
             }
             catch (Error error) {
-                warning ("Application changed: %s", error.message);
+                warning ("Application changed (%s): %s", file.get_path (), error.message);
             }
         }
 
-        async void populate_apps () {
-            var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
-            app_folder = data_dir.get_child ("applications");
+        async void populate_apps (File app_folder) {
             try {
                 try {
                     app_folder.make_directory_with_parents (null);
-                }
-                catch (IOError folder_error) {
-                    if (!(folder_error is IOError.EXISTS))
-                        throw folder_error;
+                } catch (IOError.EXISTS exist_error) {
+                    /* It's no error if the folder already exists */
                 }
 
-                monitor = app_folder.monitor_directory (0, null);
+                var monitor = app_folder.monitor_directory (0, null);
                 monitor.changed.connect (app_changed);
+                monitors.append (monitor);
 
                 var enumerator = yield app_folder.enumerate_children_async ("standard::name", 0);
                 while (true) {
@@ -213,48 +436,55 @@ namespace Apps {
                     if (files == null)
                         break;
                     foreach (var info in files) {
-                        var desktop_file = app_folder.get_child (info.get_name ());
+                        var file = app_folder.get_child (info.get_name ());
                         try {
-                            var launcher = new Launcher (desktop_file);
+                            var launcher = new Launcher (file);
                             if (launcher.init ())
                                 array.add_item (launcher);
                         }
                         catch (Error error) {
-                            warning ("Failed to parse launcher: %s", error.message);
+                            warning ("Failed to parse launcher (%s): %s", file.get_path (), error.message);
                         }
                     }
                 }
             }
             catch (Error io_error) {
-                monitor = null;
-                warning ("Failed to list .desktop files (%s): %s",
+                warning ("Failed to list apps (%s): %s",
                          app_folder.get_path (), io_error.message);
             }
         }
 
-        void tool_menu_populated (Midori.Browser browser, Gtk.Menu menu) {
-            var menuitem = new Gtk.MenuItem.with_mnemonic (_("Create _Launcher"));
-            menuitem.show ();
-            menu.append (menuitem);
-            menuitem.activate.connect (() => {
+        void browser_added (Midori.Browser browser) {
+            var accels = new Gtk.AccelGroup ();
+            browser.add_accel_group (accels);
+            var action_group = browser.get_action_group ();
+
+            var action = new Gtk.Action ("CreateLauncher", _("Create _Launcher"),
+                _("Creates a new app for a specific site"), null);
+            action.activate.connect (() => {
                 var view = browser.tab as Midori.View;
-                Launcher.create.begin (app_folder,
-                    view.get_display_uri (), view.get_display_title ());
+                Launcher.create_app.begin (view.get_display_uri (), view.get_display_title (), view);
             });
-        }
+            action_group.add_action_with_accel (action, "<Ctrl><Shift>A");
+            action.set_accel_group (accels);
+            action.connect_accelerator ();
 
-        void browser_added (Midori.Browser browser) {
-            var viewable = new Sidebar (array);
+            var viewable = new Sidebar (array, app_folder, profile_folder);
             viewable.show ();
             browser.panel.append_page (viewable);
-            browser.populate_tool_menu.connect (tool_menu_populated);
-            // TODO website context menu
             widgets.append (viewable);
         }
 
         void activated (Midori.App app) {
             array = new Katze.Array (typeof (Launcher));
-            populate_apps.begin ();
+            monitors = new GLib.List<GLib.FileMonitor> ();
+            app_folder = Launcher.get_app_folder ();
+            populate_apps.begin (app_folder);
+            /* FIXME: Profiles are broken on win32 because of no multi instance support */
+            profile_folder = Launcher.get_profile_folder ();
+#if !HAVE_WIN32
+            populate_apps.begin (profile_folder);
+#endif
             widgets = new GLib.List<Gtk.Widget> ();
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
@@ -263,11 +493,19 @@ namespace Apps {
 
         void deactivated () {
             var app = get_app ();
-            if (monitor != null)
+            foreach (var monitor in monitors)
                 monitor.changed.disconnect (app_changed);
+            monitors = null;
+
             app.add_browser.disconnect (browser_added);
             foreach (var widget in widgets)
                 widget.destroy ();
+            foreach (var browser in app.get_browsers ()) {
+                var action_group = browser.get_action_group ();
+                var action = action_group.get_action ("CreateLauncher");
+                action_group.remove_action (action);
+            }
+
         }
 
         internal Manager () {
@@ -286,3 +524,27 @@ public Midori.Extension extension_init () {
     return new Apps.Manager ();
 }
 
+class ExtensionsAppsDesktop : Midori.Test.Job {
+    public static void test () { new ExtensionsAppsDesktop ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        string uri = "http://example.com";
+        string checksum = Checksum.compute_for_string (ChecksumType.MD5, uri, -1);
+        var apps = Apps.Launcher.get_app_folder ().get_child (checksum);
+        Midori.Paths.remove_path (apps.get_path ());
+
+        var data_dir = File.new_for_path (Midori.Paths.get_user_data_dir ());
+        var desktop_dir = data_dir.get_child ("applications");
+        Midori.Paths.remove_path (desktop_dir.get_child ("Example.desktop").get_path ());
+
+        var folder = yield Apps.Launcher.create_app (uri, "Example", null);
+        var launcher = new Apps.Launcher (folder);
+        launcher.init ();
+        Katze.assert_str_equal (folder.get_path (), launcher.uri, uri);
+        yield Apps.Launcher.create_profile (null);
+    }
+}
+
+public void extension_test () {
+    Test.add_func ("/extensions/apps/desktop", ExtensionsAppsDesktop.test);
+}
+
index 058c439cf85c31c16a292287f0d6c8d0164c1bc0..a81950c4de85859783bfbc3a298f037a597598b0 100644 (file)
 
 #include <midori/midori.h>
 
-static GdkColor
-view_get_bgcolor_for_hostname (MidoriView* view, gchar* hostname)
+static void
+get_foreground_color_for_GdkColor (GdkColor* color,
+                                   GdkColor* fgcolor)
 {
-    GdkColor color;
-    GdkPixbuf* icon = midori_view_get_icon (view);
-    if (icon != NULL)
-    {
-        GdkPixbuf* newpix;
-        guchar* pixels;
-
-        newpix = gdk_pixbuf_scale_simple (icon, 1, 1, GDK_INTERP_BILINEAR);
-        pixels = gdk_pixbuf_get_pixels (newpix);
-        color.red = pixels[0] * 255;
-        color.green = pixels[1] * 255;
-        color.blue = pixels[2] * 255;
-    }
-    else
-    {
-        gchar* hash, *colorstr;
+    gfloat brightness, r, g, b;
 
-        hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, hostname, 1);
-        colorstr = g_strndup (hash, 6 + 1);
-        colorstr[0] = '#';
-        gdk_color_parse (colorstr, &color);
+    r = color->red / 255;
+    g = color->green / 255;
+    b = color->blue / 255;
 
-        g_free (hash);
-        g_free (colorstr);
-    }
+    /* For math used see algorithms for converting from rgb to yuv */
+    brightness = 0.299 * r + 0.587 * g + 0.114 * b;
+
+    /* Ensure high contrast by enforcing black/ white text colour. */
+    /* Brigthness (range 0-255) equals value of y from YUV color space. */
+    if (brightness < 128)
+        gdk_color_parse ("white", fgcolor);
+    else
+        gdk_color_parse ("black", fgcolor);
+}
+
+static void
+adjust_brightness (GdkColor* color)
+{
+    guint dark_grey = 137 * 255;
+    guint adjustment = 78 * 255;
+    guint blue = 39 * 255;
+    guint readjust = 19 * 255;
 
-    if ((color.red   < 35000)
-     && (color.green < 35000)
-     && (color.blue  < 35000))
+    if ((color->red   < dark_grey)
+     && (color->green < dark_grey)
+     && (color->blue  < dark_grey))
     {
-        color.red   += 20000;
-        color.green += 20000;
-        color.blue  += 20000;
+        color->red   += adjustment;
+        color->green += adjustment;
+        color->blue  += adjustment;
     }
 
-    if (color.red < 10000)
-        color.red = 5000;
+    if (color->red < blue)
+        color->red = readjust;
     else
-        color.red -= 5000;
-    if (color.blue < 10000)
-        color.blue = 5000;
+        color->red -= readjust;
+
+    if (color->blue < blue)
+        color->blue = readjust;
     else
-        color.blue -= 5000;
-    if (color.green < 10000)
-        color.green = 5000;
+        color->blue -= readjust;
+
+    if (color->green < blue)
+        color->green = readjust;
     else
-        color.green -= 5000;
+        color->green -= readjust;
+}
+
+static void
+view_get_bgcolor_for_favicon (GdkPixbuf* icon,
+                              GdkColor*  color)
+{
+    GdkPixbuf* newpix;
+    guchar* pixels;
 
-    return color;
+    newpix = gdk_pixbuf_scale_simple (icon, 1, 1, GDK_INTERP_BILINEAR);
+    pixels = gdk_pixbuf_get_pixels (newpix);
+    color->red = pixels[0] * 255;
+    color->green = pixels[1] * 255;
+    color->blue = pixels[2] * 255;
+
+    adjust_brightness (color);
+}
+
+static void
+view_get_bgcolor_for_hostname (gchar*    hostname,
+                               GdkColor* color)
+{
+    gchar* hash, *colorstr;
+
+    hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, hostname, 1);
+    colorstr = g_strndup (hash, 6 + 1);
+    colorstr[0] = '#';
+    gdk_color_parse (colorstr, color);
+
+    g_free (hash);
+    g_free (colorstr);
+
+    adjust_brightness (color);
 }
 
 static void
@@ -71,25 +104,28 @@ colorful_tabs_view_notify_uri_cb (MidoriView*      view,
                                   GParamSpec*      pspec,
                                   MidoriExtension* extension)
 {
-    gchar* hostname;
-    GdkColor color;
-    GdkColor fgcolor;
+    const gchar* uri = midori_view_get_display_uri (view);
+    if (!*uri)
+        return;
 
-    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)
+    if (!midori_uri_is_blank (uri))
     {
-        color = view_get_bgcolor_for_hostname (view, hostname);
-        g_free (hostname);
-        /* Ensure high contrast by enforcing black/ white text colour. */
-        if ((color.red   < 41000)
-         && (color.green < 41000)
-         && (color.blue  < 41000))
-            gdk_color_parse ("#fff", &fgcolor);
-        else
-            gdk_color_parse ("#000", &fgcolor);
-
-        midori_view_set_colors (view, &fgcolor, &color);
+        gchar* hostname = midori_uri_parse_hostname (uri, NULL);
+        if (hostname)
+        {
+            GdkColor fgcolor, color;
+            GdkPixbuf* icon = midori_view_get_icon (view);
+
+            if (icon)
+                view_get_bgcolor_for_favicon (icon, &color);
+            else
+                view_get_bgcolor_for_hostname (hostname, &color);
+
+            get_foreground_color_for_GdkColor (&color, &fgcolor);
+            midori_view_set_colors (view, &fgcolor, &color);
+
+            g_free (hostname);
+        }
     }
     else
         midori_view_set_colors (view, NULL, NULL);
@@ -115,7 +151,6 @@ colorful_tabs_deactivate_cb (MidoriExtension* extension,
                              MidoriBrowser*   browser)
 {
     GList* children;
-    GtkWidget* view;
     MidoriApp* app = midori_extension_get_app (extension);
 
     g_signal_handlers_disconnect_by_func (
@@ -170,6 +205,51 @@ colorful_tabs_activate_cb (MidoriExtension* extension,
     g_object_unref (browsers);
 }
 
+void test_colour_for_hostname (void)
+{
+    GdkColor color;
+    GdkColor fgcolor;
+
+    typedef struct
+    {
+        const gchar* host;
+        const gchar* fgcolor;
+        const gchar* color;
+    } ColorItem;
+
+    static const ColorItem items[] = {
+     { "www.last.fm", "#ffffffffffff", "#12ed7da312ed" },
+     { "git.xfce.org", "#ffffffffffff", "#1c424c72e207" },
+     { "elementaryos.org", "#000000000000", "#50dbac36b43e" },
+     { "news.ycombinator.com", "#000000000000", "#a5cba6cc5278" },
+     { "cgit.freedesktop.org", "#000000000000", "#95bb8db37ca2" },
+     { "get.cm", "#ffffffffffff", "#1c424c72e207" },
+    };
+
+    guint i;
+    for (i = 0; i < G_N_ELEMENTS (items); i++)
+    {
+        view_get_bgcolor_for_hostname ((gchar*)items[i].host, &color);
+        get_foreground_color_for_GdkColor (&color, &fgcolor);
+
+        g_assert_cmpstr (items[i].color, ==, gdk_color_to_string (&color));
+        g_assert_cmpstr (items[i].fgcolor, ==, gdk_color_to_string (&fgcolor));
+    }
+}
+
+void
+extension_test (void)
+{
+    #ifndef HAVE_WEBKIT2
+    g_object_set_data (G_OBJECT (webkit_get_default_session ()),
+                       "midori-session-initialized", (void*)1);
+    #endif
+
+    /* TODO: Add test which uses favicon codepath */
+
+    g_test_add_func ("/extensions/colorful_tabs/hostname_colour", test_colour_for_hostname);
+}
+
 MidoriExtension*
 extension_init (void)
 {
index 37fff4e71a4e52b7f63f17929c0e52b75d567962..60b5c54e01a7868eee92c2dcc4c728f15026c4f3 100644 (file)
@@ -87,10 +87,6 @@ static void cm_create_toolbar(CookieManagerPage *cmp)
        GtkToolItem *toolitem;
 
        priv->toolbar = toolbar = gtk_toolbar_new();
-       gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-       gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
-       gtk_widget_show(toolbar);
-
        toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_tool_item_set_is_important(toolitem, TRUE);
        g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp);
@@ -664,17 +660,9 @@ static gchar *cm_get_cookie_description_text(SoupCookie *cookie)
        if (cookie->expires != NULL)
        {
                time_t expiration_time = soup_date_to_time_t(cookie->expires);
-               #if GLIB_CHECK_VERSION (2, 26, 0)
                GDateTime* date = g_date_time_new_from_unix_local(expiration_time);
                expires = g_date_time_format(date, "%c");
                g_date_time_unref(date);
-               #else
-               static gchar date_fmt[512];
-               const struct tm *tm = localtime(&expiration_time);
-               /* Some GCC versions falsely complain about "%c" */
-               strftime(date_fmt, sizeof(date_fmt), "%c", tm);
-               expires = g_strdup(date_fmt);
-               #endif
        }
        else
                expires = g_strdup(_("At the end of the session"));
index e43520b4f75bed3d602648a756c1ba03fb473d4a..de6b83fb25d72ce4276a1f259b54303fccc19d07 100644 (file)
@@ -12,6 +12,7 @@
 #include "config.h"
 #include <midori/midori.h>
 #include "katze/katze.h"
+#include <libsoup/soup-cookie-jar-sqlite.h>
 
 #include "cookie-manager.h"
 #include "cookie-manager-page.h"
@@ -259,6 +260,7 @@ static void cookie_manager_finalize(GObject *object)
 
        g_object_unref(priv->store);
        g_free(priv->filter_text);
+       g_object_unref(priv->jar);
 
        G_OBJECT_CLASS(cookie_manager_parent_class)->finalize(object);
 }
@@ -267,7 +269,6 @@ static void cookie_manager_finalize(GObject *object)
 static void cookie_manager_init(CookieManager *self)
 {
        CookieManagerPrivate *priv;
-       SoupSession *session;
 
        self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
            COOKIE_MANAGER_TYPE, CookieManagerPrivate);
@@ -279,8 +280,15 @@ static void cookie_manager_init(CookieManager *self)
                COOKIE_MANAGER_COL_NAME, GTK_SORT_ASCENDING);
 
        /* setup soup */
-       session = webkit_get_default_session();
+#ifdef HAVE_WEBKIT2
+       gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db");
+       priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE);
+       g_free(filename);
+#else
+       SoupSession *session = webkit_get_default_session();
        priv->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type()));
+       g_object_ref(priv->jar);
+#endif
        g_signal_connect(priv->jar, "changed", G_CALLBACK(cookie_manager_jar_changed_cb), self);
 
        cookie_manager_refresh_store(self);
index 33fb2d6bf08d09f8f67630feafe263ba868e49cb..2546ab1bb05bf355e28033ec3ff91eb0699c1b48 100644 (file)
@@ -43,16 +43,17 @@ struct _CookiePermissionManagerPreferencesWindowPrivate
        GtkListStore                    *listStore;
        GtkWidget                               *list;
        GtkTreeSelection                *listSelection;
+       GtkWidget                               *editingCombo;
        GtkWidget                               *deleteButton;
        GtkWidget                               *deleteAllButton;
-       GtkWidget                               *askForUnknownPolicyCheckbox;
+       GtkWidget                               *unknownPolicyCombo;
        GtkWidget                               *addDomainEntry;
        GtkWidget                               *addDomainPolicyCombo;
        GtkWidget                               *addDomainButton;
 
        gint                                    signalManagerChangedDatabaseID;
-       gint                                    signalManagerAskForUnknownPolicyID;
-       gint                                    signalAskForUnknownPolicyID;
+       gint                                    signalManagerUnknownPolicyID;
+       gint                                    signalUnknownPolicyID;
 };
 
 enum
@@ -314,35 +315,130 @@ static void _cookie_permission_manager_preferences_window_manager_database_chang
        return;
 }
 
-/* Ask-for-unknown-policy in manager changed or check-box changed */
-static void _cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed(CookiePermissionManagerPreferencesWindow *self,
-                                                                                                                                                                                                       GParamSpec *inSpec,
-                                                                                                                                                                                                       gpointer inUserData)
+/* unknown-policy in manager changed or drop-down changed */
+static void _cookie_permission_manager_preferences_window_manager_unknown_policy_changed(CookiePermissionManagerPreferencesWindow *self,
+                                                                                                                                                                                       GParamSpec *inSpec,
+                                                                                                                                                                                       gpointer inUserData)
 {
        CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv;
        CookiePermissionManager                                                 *manager=COOKIE_PERMISSION_MANAGER(inUserData);
-       gboolean                                                                                doAsk;
+       CookiePermissionManagerPolicy                                   policy;
 
-       /* Get new ask-for-unknown-policy value */
-       g_object_get(manager, "ask-for-unknown-policy", &doAsk, NULL);
+       /* Get new unknown-policy value */
+       g_object_get(manager, "unknown-policy", &policy, NULL);
 
-       /* Set toogle in widget (but block signal for toggle) */
-       g_signal_handler_block(priv->askForUnknownPolicyCheckbox, priv->signalAskForUnknownPolicyID);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->askForUnknownPolicyCheckbox), doAsk);
-       g_signal_handler_unblock(priv->askForUnknownPolicyCheckbox, priv->signalAskForUnknownPolicyID);
+       /* Set value in combobox (blocking signal to avoid loops) */
+       g_signal_handler_block(priv->unknownPolicyCombo, priv->signalUnknownPolicyID);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(priv->unknownPolicyCombo), policy);
+       g_signal_handler_unblock(priv->unknownPolicyCombo, priv->signalUnknownPolicyID);
 }
 
-static void _cookie_permission_manager_preferences_window_ask_for_unknown_policy_changed(CookiePermissionManagerPreferencesWindow *self,
-                                                                                                                                                                                       gpointer *inUserData)
+static void _cookie_permission_manager_preferences_window_unknown_policy_changed(CookiePermissionManagerPreferencesWindow *self,
+                                                                                                                                                                       gpointer *inUserData)
 {
        CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv;
-       gboolean                                                                                doAsk;
+       CookiePermissionManagerPolicy                                   policy;
+       GtkTreeIter                                                                             policyIter;
+
+       if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->unknownPolicyCombo), &policyIter))
+               return;
+
+       gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(priv->unknownPolicyCombo)),
+                                                                                               &policyIter,
+                                                                                               0, &policy,
+                                                                                               -1);
 
        /* Get toogle state of widget (but block signal for manager) and set in manager */
-       g_signal_handler_block(priv->manager, priv->signalManagerAskForUnknownPolicyID);
-       doAsk=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->askForUnknownPolicyCheckbox));
-       g_object_set(priv->manager, "ask-for-unknown-policy", doAsk, NULL);
-       g_signal_handler_unblock(priv->manager, priv->signalManagerAskForUnknownPolicyID);
+       g_signal_handler_block(priv->manager, priv->signalManagerUnknownPolicyID);
+       g_object_set(priv->manager, "unknown-policy", policy, NULL);
+       g_signal_handler_unblock(priv->manager, priv->signalManagerUnknownPolicyID);
+}
+
+static void _cookie_permission_manager_preferences_on_policy_editing_started(CookiePermissionManagerPreferencesWindow *self,
+                                                                                                                                                               GtkCellEditable *editable,
+                                                                                                                                                               gchar *path,
+                                                                                                                                                               gpointer *inUserData)
+{
+       CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv;
+
+       priv->editingCombo=NULL;
+
+       if(!GTK_IS_COMBO_BOX(editable)) return;
+
+       priv->editingCombo=GTK_WIDGET(editable);
+}
+
+static void _cookie_permission_manager_preferences_on_policy_editing_canceled(CookiePermissionManagerPreferencesWindow *self,
+                                                                                                                                                               gpointer *inUserData)
+{
+       CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv;
+
+       priv->editingCombo=NULL;
+}
+
+static void _cookie_permission_manager_preferences_on_policy_edited(CookiePermissionManagerPreferencesWindow *self,
+                                                                                                                                               gchar *path,
+                                                                                                                                               gchar *newText,
+                                                                                                                                               gpointer *inUserData)
+{
+       CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv;
+       gchar                                                                                   *domain;
+       GtkTreeIter                                                                             iter;
+       GtkTreeIter                                                                             policyIter;
+
+       g_return_if_fail(priv->database);
+
+       if (priv->editingCombo == NULL) return;
+
+       gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(priv->listStore), &iter, path);
+
+       gtk_tree_model_get(GTK_TREE_MODEL(priv->listStore),
+                                               &iter,
+                                               DOMAIN_COLUMN, &domain,
+                                               -1);
+
+       /* Get policy from combo box */
+       if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->editingCombo), &policyIter))
+       {
+               gchar   *sql;
+               gchar   *error=NULL;
+               gint    success;
+               gint    policy;
+               gchar   *policyName;
+
+               /* Get policy value to set for domain */
+               gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(priv->editingCombo)),
+                                                                                                       &policyIter,
+                                                                                                       0, &policy,
+                                                                                                       1, &policyName,
+                                                                                                       -1);
+
+               g_return_if_fail(g_strcmp0(policyName, newText)==0);
+
+               /* Add domain name and the selected policy to database */
+               sql=sqlite3_mprintf("UPDATE policies SET value = %d WHERE domain = '%q';",
+                                                               policy,
+                                                               domain);
+               success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
+
+               /* Show error message if any */
+               if(success==SQLITE_OK)
+               {
+                       gtk_list_store_set(priv->listStore,
+                                                               &iter,
+                                                               POLICY_COLUMN, newText,
+                                                               -1);
+               }
+                       else g_warning(_("SQL fails: %s"), error);
+
+
+               if(error) sqlite3_free(error);
+
+               /* Free allocated resources */
+               sqlite3_free(sql);
+       }
+
+       priv->editingCombo=NULL;
 }
 
 /* Selection in list changed */
@@ -500,8 +596,8 @@ static void cookie_permission_manager_preferences_window_finalize(GObject *inObj
                if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
                priv->signalManagerChangedDatabaseID=0;
 
-               if(priv->signalManagerAskForUnknownPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerAskForUnknownPolicyID);
-               priv->signalManagerAskForUnknownPolicyID=0;
+               if(priv->signalManagerUnknownPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerUnknownPolicyID);
+               priv->signalManagerUnknownPolicyID=0;
 
                g_object_unref(priv->manager);
                priv->manager=NULL;
@@ -531,8 +627,8 @@ static void cookie_permission_manager_preferences_window_set_property(GObject *i
                                if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
                                priv->signalManagerChangedDatabaseID=0;
 
-                               if(priv->signalManagerAskForUnknownPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerAskForUnknownPolicyID);
-                               priv->signalManagerAskForUnknownPolicyID=0;
+                               if(priv->signalManagerUnknownPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerUnknownPolicyID);
+                               priv->signalManagerUnknownPolicyID=0;
 
                                g_object_unref(priv->manager);
                                priv->manager=NULL;
@@ -553,12 +649,12 @@ static void cookie_permission_manager_preferences_window_set_property(GObject *i
                                                                                                self);
                                _cookie_permission_manager_preferences_window_manager_database_changed(self, NULL, priv->manager);
 
-                               priv->signalManagerAskForUnknownPolicyID=
+                               priv->signalManagerUnknownPolicyID=
                                        g_signal_connect_swapped(priv->manager,
-                                                                                               "notify::ask-for-unknown-policy",
-                                                                                               G_CALLBACK(_cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed),
+                                                                                               "notify::unknown-policy",
+                                                                                               G_CALLBACK(_cookie_permission_manager_preferences_window_manager_unknown_policy_changed),
                                                                                                self);
-                               _cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed(self, NULL, priv->manager);
+                               _cookie_permission_manager_preferences_window_manager_unknown_policy_changed(self, NULL, priv->manager);
                        }
                        break;
 
@@ -723,7 +819,7 @@ static void cookie_permission_manager_preferences_window_init(CookiePermissionMa
        gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
        g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_add_domain_clicked), self);
 
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
        /* Set up cookie domain list */
        priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
@@ -744,7 +840,11 @@ static void cookie_permission_manager_preferences_window_init(CookiePermissionMa
        gtk_tree_view_column_set_sort_column_id(column, DOMAIN_COLUMN);
        gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column);
 
-       renderer=gtk_cell_renderer_text_new();
+       renderer=gtk_cell_renderer_combo_new();
+       g_object_set(G_OBJECT(renderer), "model", list, "text-column", 1, "has-entry", false, "editable", true, NULL);
+       g_signal_connect_swapped(renderer, "editing-started", G_CALLBACK(_cookie_permission_manager_preferences_on_policy_editing_started), self);
+       g_signal_connect_swapped(renderer, "editing-canceled", G_CALLBACK(_cookie_permission_manager_preferences_on_policy_editing_canceled), self);
+       g_signal_connect_swapped(renderer, "edited", G_CALLBACK(_cookie_permission_manager_preferences_on_policy_edited), self);
        column=gtk_tree_view_column_new_with_attributes(_("Policy"),
                                                                                                        renderer,
                                                                                                        "text", POLICY_COLUMN,
@@ -780,18 +880,44 @@ static void cookie_permission_manager_preferences_window_init(CookiePermissionMa
        gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
        g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_delete_all), self);
 
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
+
+       /* Add "unknown-policy" combo */
+#ifdef HAVE_GTK3
+       hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
+#else
+       hbox=gtk_hbox_new(FALSE, 0);
+#endif
+       widget=gtk_label_new(_("Policy for cookies from domains not in the list: "));
+       gtk_container_add(GTK_CONTAINER(hbox), widget);
+       
+       list=gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED, 1, _("Ask for a decision"), -1);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT, 1, _("Accept"), -1);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION, 1, _("Accept for session"), -1);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, COOKIE_PERMISSION_MANAGER_POLICY_BLOCK, 1, _("Block"), -1);
+
+       priv->unknownPolicyCombo=gtk_combo_box_new_with_model(GTK_TREE_MODEL(list));
+       gtk_combo_box_set_active(GTK_COMBO_BOX(priv->unknownPolicyCombo), 0);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->unknownPolicyCombo);
+
+       renderer=gtk_cell_renderer_text_new();
+       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(priv->unknownPolicyCombo), renderer, TRUE);
+       gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->unknownPolicyCombo), renderer, "text", 1);
 
-       /* Add "ask-for-unknown-policy" checkbox */
-       priv->askForUnknownPolicyCheckbox=gtk_check_button_new_with_mnemonic(_("A_sk for policy if unknown for a domain"));
-       priv->signalAskForUnknownPolicyID=g_signal_connect_swapped(priv->askForUnknownPolicyCheckbox,
-                                                                                                                               "toggled",
-                                                                                                                               G_CALLBACK(_cookie_permission_manager_preferences_window_ask_for_unknown_policy_changed),
-                                                                                                                               self);
-       gtk_box_pack_start(GTK_BOX(vbox), priv->askForUnknownPolicyCheckbox, TRUE, TRUE, 5);
+       priv->signalUnknownPolicyID=g_signal_connect_swapped(priv->unknownPolicyCombo,
+                                                                                                                       "changed",
+                                                                                                                       G_CALLBACK(_cookie_permission_manager_preferences_window_unknown_policy_changed),
+                                                                                                                       self);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
        /* Finalize setup of content area */
-       gtk_container_add(GTK_CONTAINER(priv->contentArea), vbox);
+       gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
 }
 
 /* Implementation: Public API */
index e06b30ca79171445b73fbcfce927f042ce81fadf..4b53cb47cc0b0e119532ac7a9a5b0842437058dd 100644 (file)
@@ -31,7 +31,7 @@ enum
 
        PROP_DATABASE,
        PROP_DATABASE_FILENAME,
-       PROP_ASK_FOR_UNKNOWN_POLICY,
+       PROP_UNKNOWN_POLICY,
 
        PROP_LAST
 };
@@ -49,7 +49,7 @@ struct _CookiePermissionManagerPrivate
        MidoriApp                                               *application;
        sqlite3                                                 *database;
        gchar                                                   *databaseFilename;
-       gboolean                                                askForUnknownPolicy;
+       CookiePermissionManagerPolicy   unknownPolicy;
 
        /* Cookie jar related */
        SoupSession                                             *session;
@@ -224,8 +224,9 @@ static void _cookie_permission_manager_open_database(CookiePermissionManager *se
 
                        uri=soup_uri_new(NULL);
                        soup_uri_set_host(uri, domain);
+                       soup_uri_set_path(uri, "/");
                        cookies=soup_cookie_jar_get_cookie_list(priv->cookieJar, uri, TRUE);
-                       for(cookie=cookies; cookie; cookie->next)
+                       for(cookie=cookies; cookie; cookie=cookie->next)
                        {
                                soup_cookie_jar_delete_cookie(priv->cookieJar, (SoupCookie*)cookie->data);
                        }
@@ -294,24 +295,23 @@ static gint _cookie_permission_manager_get_policy(CookiePermissionManager *self,
        sqlite3_finalize(statement);
 
        /* Check if policy is undetermined. If it is then check if this policy was set by user.
-        * If it was not set by user check if we should ask user for his decision
+        * If it was not set by user, check what to do.
         */
-       if(!priv->askForUnknownPolicy && !foundPolicy)
+       if(!foundPolicy)
        {
-               switch(soup_cookie_jar_get_accept_policy(priv->cookieJar))
-               {
-                       case SOUP_COOKIE_JAR_ACCEPT_ALWAYS:
-                       case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
-                               policy=COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT;
-                               break;
+               /* A SoupCookieJar that doesn't want to accept any cookies should override the user's
+                * choice, in case of e.g. private mode, to err on the side of caution. */
+               SoupCookieJarAcceptPolicy soup_policy=soup_cookie_jar_get_accept_policy(priv->cookieJar);
 
-                       case SOUP_COOKIE_JAR_ACCEPT_NEVER:
-                               policy=COOKIE_PERMISSION_MANAGER_POLICY_BLOCK;
-                               break;
-
-                       default:
+               if(soup_policy==SOUP_COOKIE_JAR_ACCEPT_ALWAYS || soup_policy==SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY)
+               {
+                       policy=priv->unknownPolicy;
+               }
+               else
+               {
+                       if(soup_policy!=SOUP_COOKIE_JAR_ACCEPT_NEVER)
                                g_critical(_("Could not determine global cookie policy to set for domain: %s"), domain);
-                               break;
+                       policy=COOKIE_PERMISSION_MANAGER_POLICY_BLOCK;
                }
        }
 
@@ -458,10 +458,11 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
        gint                                                                    numberDomains, numberCookies;
        GSList                                                                  *sortedCookies, *cookies;
        WebKitWebView                                                   *webkitView;
-       CookiePermissionManagerModalInfobar             modalInfo;
+       CookiePermissionManagerModalInfobar             *modalInfo;
 
        /* Get webkit view of midori view */
        webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(inView));
+       modalInfo=g_new0(CookiePermissionManagerModalInfobar, 1);
 
        /* Create a copy of cookies and sort them */
        sortedCookies=_cookie_permission_manager_get_number_domains_and_cookies(self,
@@ -535,16 +536,12 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
         * but I don't want to create an GObject just for a simple struct. So set object
         * data by our own
         */
-       g_object_set_data(G_OBJECT(infobar), "cookie-permission-manager-infobar-data", &modalInfo);
+       g_object_set_data_full(G_OBJECT(infobar), "cookie-permission-manager-infobar-data", modalInfo, (GDestroyNotify)g_free);
 
 /* FIXME: Find a way to add "details" widget */
 #ifndef NO_INFOBAR_DETAILS
        /* Get content area of infobar */
-#if HAVE_GTK_INFO_BAR
        contentArea=gtk_info_bar_get_content_area(GTK_INFO_BAR(infobar));
-#else
-       contentArea=infobar;
-#endif
 
        /* Create list and set up columns of list */
        list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(listStore));
@@ -614,19 +611,19 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
 
        /* Connect signals to quit main loop */
        g_signal_connect(webkitView, "navigation-policy-decision-requested", G_CALLBACK(_cookie_permission_manager_on_infobar_webview_navigate), infobar);
-       g_signal_connect(infobar, "destroy", G_CALLBACK(_cookie_permission_manager_on_infobar_destroy), &modalInfo);
+       g_signal_connect(infobar, "destroy", G_CALLBACK(_cookie_permission_manager_on_infobar_destroy), modalInfo);
 
        /* Let info bar be modal and set response to default */
-       modalInfo.response=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED;
-       modalInfo.mainLoop=g_main_loop_new(NULL, FALSE);
+       modalInfo->response=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED;
+       modalInfo->mainLoop=g_main_loop_new(NULL, FALSE);
 
        GDK_THREADS_LEAVE();
-       g_main_loop_run(modalInfo.mainLoop);
+       g_main_loop_run(modalInfo->mainLoop);
        GDK_THREADS_ENTER();
 
-       g_main_loop_unref(modalInfo.mainLoop);
+       g_main_loop_unref(modalInfo->mainLoop);
 
-       modalInfo.mainLoop=NULL;
+       modalInfo->mainLoop=NULL;
 
        /* Disconnect signal handler to webkit's web view  */
        g_signal_handlers_disconnect_by_func(webkitView, G_CALLBACK(_cookie_permission_manager_on_infobar_webview_navigate), infobar);
@@ -636,7 +633,7 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
         * updates of database for the same domain. This sorted list is a copy
         * to avoid a reorder of cookies
         */
-       if(modalInfo.response!=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED)
+       if(modalInfo->response!=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED)
        {
                const gchar                                     *lastDomain=NULL;
 
@@ -657,7 +654,7 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
 
                                sql=sqlite3_mprintf("INSERT OR REPLACE INTO policies (domain, value) VALUES ('%q', %d);",
                                                                                cookieDomain,
-                                                                               modalInfo.response);
+                                                                               modalInfo->response);
                                success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
                                if(success!=SQLITE_OK) g_warning(_("SQL fails: %s"), error);
                                if(error) sqlite3_free(error);
@@ -672,8 +669,8 @@ static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *s
        g_slist_free(sortedCookies);
 
        /* Return response */
-       return(modalInfo.response==COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED ?
-                       COOKIE_PERMISSION_MANAGER_POLICY_BLOCK : modalInfo.response);
+       return(modalInfo->response==COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED ?
+                       COOKIE_PERMISSION_MANAGER_POLICY_BLOCK : modalInfo->response);
 }
 
 /* A cookie was changed outside a request (e.g. Javascript) */
@@ -945,8 +942,8 @@ static void cookie_permission_manager_set_property(GObject *inObject,
                        _cookie_permission_manager_on_application_changed(self);
                        break;
 
-               case PROP_ASK_FOR_UNKNOWN_POLICY:
-                       cookie_permission_manager_set_ask_for_unknown_policy(self, g_value_get_boolean(inValue));
+               case PROP_UNKNOWN_POLICY:
+                       cookie_permission_manager_set_unknown_policy(self, g_value_get_int(inValue));
                        break;
 
                default:
@@ -980,8 +977,8 @@ static void cookie_permission_manager_get_property(GObject *inObject,
                        g_value_set_string(outValue, self->priv->databaseFilename);
                        break;
 
-               case PROP_ASK_FOR_UNKNOWN_POLICY:
-                       g_value_set_boolean(outValue, self->priv->askForUnknownPolicy);
+               case PROP_UNKNOWN_POLICY:
+                       g_value_set_int(outValue, self->priv->unknownPolicy);
                        break;
 
                default:
@@ -1033,12 +1030,14 @@ static void cookie_permission_manager_class_init(CookiePermissionManagerClass *k
                                                                NULL,
                                                                G_PARAM_READABLE);
 
-       CookiePermissionManagerProperties[PROP_ASK_FOR_UNKNOWN_POLICY]=
-               g_param_spec_boolean("ask-for-unknown-policy",
-                                                               _("Ask for unknown policy"),
-                                                               _("If true this extension ask for policy for every unknown domain."
-                                                                 "If false this extension uses the global cookie policy set in Midori settings."),
-                                                               TRUE,
+       CookiePermissionManagerProperties[PROP_UNKNOWN_POLICY]=
+               g_param_spec_int("unknown-policy",
+                                                               _("Unknown domain policy"),
+                                                               _("The policy to use for domains not individually configured."
+                                                                 " This only acts to further restrict the global cookie policy set in Midori settings."),
+                                                               COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED,
+                                                               COOKIE_PERMISSION_MANAGER_POLICY_BLOCK,
+                                                               COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
 
        g_object_class_install_properties(gobjectClass, PROP_LAST, CookiePermissionManagerProperties);
@@ -1056,7 +1055,7 @@ static void cookie_permission_manager_init(CookiePermissionManager *self)
        /* Set up default values */
        priv->database=NULL;
        priv->databaseFilename=NULL;
-       priv->askForUnknownPolicy=TRUE;
+       priv->unknownPolicy=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED;
 
        /* Hijack session's cookie jar to handle cookies requests on our own in HTTP streams
         * but remember old handlers to restore them on deactivation
@@ -1082,22 +1081,22 @@ CookiePermissionManager* cookie_permission_manager_new(MidoriExtension *inExtens
 }
 
 /* Get/set policy to ask for policy if unknown for a domain */
-gboolean cookie_permission_manager_get_ask_for_unknown_policy(CookiePermissionManager *self)
+CookiePermissionManagerPolicy cookie_permission_manager_get_unknown_policy(CookiePermissionManager *self)
 {
-       g_return_val_if_fail(IS_COOKIE_PERMISSION_MANAGER(self), FALSE);
+       g_return_val_if_fail(IS_COOKIE_PERMISSION_MANAGER(self), COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED);
 
-       return(self->priv->askForUnknownPolicy);
+       return(self->priv->unknownPolicy);
 }
 
-void cookie_permission_manager_set_ask_for_unknown_policy(CookiePermissionManager *self, gboolean inDoAsk)
+void cookie_permission_manager_set_unknown_policy(CookiePermissionManager *self, CookiePermissionManagerPolicy inPolicy)
 {
        g_return_if_fail(IS_COOKIE_PERMISSION_MANAGER(self));
 
-       if(inDoAsk!=self->priv->askForUnknownPolicy)
+       if(inPolicy!=self->priv->unknownPolicy)
        {
-               self->priv->askForUnknownPolicy=inDoAsk;
-               midori_extension_set_boolean(self->priv->extension, "ask-for-unknown-policy", inDoAsk);
-               g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_ASK_FOR_UNKNOWN_POLICY]);
+               self->priv->unknownPolicy=inPolicy;
+               midori_extension_set_integer(self->priv->extension, "unknown-policy", inPolicy);
+               g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_UNKNOWN_POLICY]);
        }
 }
 
index 6e0ec3a0a3b70efac2bcdd4155fa8256a509ea6f..1ba5a0ba4ff55c2babb2de765f3da53026343c27 100644 (file)
@@ -60,8 +60,8 @@ GType cookie_permission_manager_get_type(void);
 
 CookiePermissionManager* cookie_permission_manager_new(MidoriExtension *inExtension, MidoriApp *inApp);
 
-gboolean cookie_permission_manager_get_ask_for_unknown_policy(CookiePermissionManager *self);
-void cookie_permission_manager_set_ask_for_unknown_policy(CookiePermissionManager *self, gboolean inDoAsk);
+CookiePermissionManagerPolicy cookie_permission_manager_get_unknown_policy(CookiePermissionManager *self);
+void cookie_permission_manager_set_unknown_policy(CookiePermissionManager *self, CookiePermissionManagerPolicy inPolicy);
 
 /* Enumeration */
 GType cookie_permission_manager_policy_get_type(void) G_GNUC_CONST;
index fcf87bfc08d01aede386c0585d8a6b01f1b7c226..1efc04f6e9e45de4b15d455f13a8d047a23dea3b 100644 (file)
@@ -21,7 +21,7 @@ static void _cpm_on_activate(MidoriExtension *inExtension, MidoriApp *inApp, gpo
        g_return_if_fail(cpm==NULL);
 
        cpm=cookie_permission_manager_new(inExtension, inApp);
-       g_object_set(cpm, "ask-for-unknown-policy", midori_extension_get_boolean(inExtension, "ask-for-unknown-policy"), NULL);
+       g_object_set(cpm, "unknown-policy", midori_extension_get_integer(inExtension, "unknown-policy"), NULL);
 }
 
 /* This extension was deactivated */
@@ -65,7 +65,7 @@ MidoriExtension *extension_init(void)
                                                                                                "authors", "Stephan Haller <nomad@froevel.de>",
                                                                                                NULL);
 
-       midori_extension_install_boolean(extension, "ask-for-unknown-policy", TRUE);
+       midori_extension_install_integer(extension, "unknown-policy", COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED);
        midori_extension_install_boolean(extension, "show-details-when-ask", FALSE);
 
        g_signal_connect(extension, "activate", G_CALLBACK(_cpm_on_activate), NULL);
index 21b6df348b40e9b2c5aa9d69553a1ddb19091289..1ad9102ca4ebb958ec0105806d2b9311597999e7 100644 (file)
    See the file COPYING for the full license text.
 */
 
-using Gtk;
-using Katze;
-using Midori;
-
 namespace DelayedLoad {
-    private class PreferencesDialog : Gtk.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 (Gtk.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 == Midori.Delay.PENDING_UNDELAY) {
-                        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 initialized = false;
-        private HashTable<Midori.Browser, TabShaker> 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);
-                    Midori.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();
+                unowned Katze.Item item = new_view.get_proxy_item ();
 
                 int64 delay = item.get_meta_integer ("delay");
-                if (delay == Midori.Delay.PENDING_UNDELAY && new_view.progress < 1.0 && this.initialized) {
-                    this.schedule_reload (browser, new_view);
+                if (delay == Midori.Delay.PENDING_UNDELAY && new_view.progress < 1.0) {
+                    new_view.reload (true);
                 }
             }
         }
 
-        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) {
-                this.initialized = true;
-                Katze.Item item = view.get_proxy_item ();
-                item.ref();
-
-                int64 delay = item.get_meta_integer ("delay");
-                if (delay != Midori.Delay.DELAYED) {
-                    if (view.load_status == Midori.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);
         }
@@ -183,17 +31,6 @@ namespace DelayedLoad {
         }
 
         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)
-                Midori.Timeout.add (50, this.reload_first_tab);
-            else
-                this.initialized = true;
-
             foreach (Midori.Browser browser in app.get_browsers ()) {
                 browser_added (browser);
             }
@@ -211,17 +48,11 @@ namespace DelayedLoad {
         internal Manager () {
             GLib.Object (name: _("Delayed load"),
                          description: _("Delay page load until you actually use the tab."),
-                         version: "0.1",
+                         version: "0.2",
                          authors: "André Stösel <andre@stoesel.de>");
 
-            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<Midori.Browser, TabShaker> (GLib.direct_hash, GLib.direct_equal);
         }
     }
 }
diff --git a/extensions/devpet.vala b/extensions/devpet.vala
new file mode 100644 (file)
index 0000000..8af341b
--- /dev/null
@@ -0,0 +1,270 @@
+/*
+   Copyright (C) 2013 André Stösel <andre@stoesel.de>
+
+   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.
+*/
+
+Gtk.IconTheme theme;
+
+namespace DevPet {
+    enum TreeCells {
+        MESSAGE,
+        BACKTRACE,
+        STOCK,
+        COUNT
+    }
+
+    private class DataWindow : Gtk.Window {
+        public string message {get; construct; }
+        public string backtrace {get; construct; }
+
+        private void create_content () {
+            this.title = this.message;
+            this.set_default_size (500, 500);
+
+            Gtk.VBox vbox = new Gtk.VBox (false, 1);
+            this.add (vbox);
+
+            Gtk.TextBuffer message_buffer = new Gtk.TextBuffer (null);
+            message_buffer.set_text (this.message);
+
+            Gtk.TextView message_text_view = new Gtk.TextView.with_buffer (message_buffer);
+            message_text_view.editable = false;
+
+            Gtk.TextBuffer backtrace_buffer = new Gtk.TextBuffer (null);
+            backtrace_buffer.set_text (this.backtrace);
+
+            Gtk.TextView backtrace_text_view = new Gtk.TextView.with_buffer (backtrace_buffer);
+            backtrace_text_view.editable = false;
+
+            Gtk.ScrolledWindow message_scroll = new Gtk.ScrolledWindow (null, null);
+            message_scroll.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            message_scroll.add (message_text_view);
+
+            Gtk.ScrolledWindow backtrace_scroll = new Gtk.ScrolledWindow (null, null);
+            backtrace_scroll.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            backtrace_scroll.add (backtrace_text_view);
+
+            vbox.pack_start (message_scroll, false, false, 0);
+            vbox.pack_end (backtrace_scroll, true, true, 0);
+
+            this.show_all ();
+        }
+
+        internal DataWindow (string message, string backtrace) {
+            GLib.Object (type: Gtk.WindowType.TOPLEVEL,
+                window_position: Gtk.WindowPosition.CENTER,
+                message: message,
+                backtrace: backtrace);
+
+            this.create_content ();
+        }
+    }
+
+    private class LogWindow : Gtk.Window {
+        private Manager manager;
+
+        private void clear_list () {
+            this.manager.clear_list ();
+            this.destroy ();
+        }
+
+        #if HAVE_EXECINFO_H
+        private void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (this.manager.list_store.get_iter (out iter, path)) {
+                string message;
+                string backtrace;
+                this.manager.list_store.get(iter,
+                    TreeCells.MESSAGE, out message,
+                    TreeCells.BACKTRACE, out backtrace, -1);
+
+                DataWindow data_window = new DataWindow (message, backtrace);
+                data_window.show ();
+            }
+        }
+        #endif
+
+        private void create_content () {
+            this.title = "Midori - DevPet";
+            this.set_default_size (500, 250);
+            this.destroy.connect (this.manager.log_window_closed);
+
+            Gtk.VBox vbox = new Gtk.VBox (false, 1);
+            this.add (vbox);
+
+            #if HAVE_EXECINFO_H
+            Gtk.Label label = new Gtk.Label (_("Double click for more information"));
+            vbox.pack_start (label, false, false, 0);
+            #endif
+
+            Gtk.ScrolledWindow scroll_windows = new Gtk.ScrolledWindow (null, null);
+            scroll_windows.set_policy (Gtk.PolicyType.NEVER , Gtk.PolicyType.AUTOMATIC);
+            scroll_windows.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
+
+
+            Gtk.Button clear = new Gtk.Button.from_stock ("gtk-clear");
+            clear.clicked.connect (this.clear_list);
+
+            vbox.pack_start (scroll_windows, true, true, 0);
+            vbox.pack_start (clear, false, false, 0);
+
+
+            Gtk.TreeView treeview = new Gtk.TreeView.with_model (this.manager.list_store);
+            scroll_windows.add (treeview);
+
+            treeview.insert_column_with_attributes (
+                -1, "Type",
+                new Gtk.CellRendererPixbuf (), "stock-id", TreeCells.STOCK);
+            treeview.insert_column_with_attributes (
+                -1, "Message",
+                new Gtk.CellRendererText (), "text", TreeCells.MESSAGE);
+
+            #if HAVE_EXECINFO_H
+            treeview.row_activated.connect (this.row_activated);
+            #endif
+
+            this.show_all ();
+        }
+
+        internal LogWindow (Manager manager) {
+            GLib.Object (type: Gtk.WindowType.TOPLEVEL,
+                         window_position: Gtk.WindowPosition.CENTER);
+
+            this.manager = manager;
+            this.create_content ();
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        public Gtk.ListStore list_store;
+        private Gtk.StatusIcon? trayicon = null;
+        private LogWindow? log_window;
+        private GLib.LogFunc default_log_func;
+        private GLib.LogLevelFlags icon_flag = GLib.LogLevelFlags.LEVEL_DEBUG;
+
+        public void clear_list() {
+            this.icon_flag = GLib.LogLevelFlags.LEVEL_DEBUG;
+            if(this.trayicon != null)
+                this.trayicon.set_visible (false);
+            this.list_store.clear ();
+        }
+
+        public void log_window_closed () {
+            this.log_window = null;
+        }
+
+        private unowned string get_stock_from_log_level (GLib.LogLevelFlags flags) {
+            if ((flags & LogLevelFlags.LEVEL_CRITICAL) == flags || (flags & LogLevelFlags.LEVEL_ERROR) == flags) {
+                return Gtk.Stock.DIALOG_ERROR;
+            } else if ((flags & LogLevelFlags.LEVEL_WARNING) == flags) {
+                return Gtk.Stock.DIALOG_WARNING;
+            }
+            return Gtk.Stock.DIALOG_INFO;
+        }
+
+        private void ensure_trayicon() {
+            if(this.trayicon != null)
+                return;
+
+            this.trayicon = new Gtk.StatusIcon ();
+            this.trayicon.set_tooltip_text ("Midori - DevPet");
+            this.trayicon.activate.connect(this.show_error_log);
+        }
+
+        private void log_handler(string? domain, GLib.LogLevelFlags flags, string message) {
+            Gtk.TreeIter iter;
+            unowned string stock = this.get_stock_from_log_level (flags);
+
+            this.ensure_trayicon();
+
+            if (flags < this.icon_flag) {
+                this.icon_flag = flags;
+                this.trayicon.set_from_stock (stock);
+            }
+
+            #if HAVE_EXECINFO_H
+                string bt = "";
+                void* buffer[100];
+                int num = Linux.backtrace (buffer, 100);
+                /* Upstream bug: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2 */
+                unowned string[] symbols = Midori.Linux.backtrace_symbols (buffer, num);
+                if (symbols != null) {
+                    /* we don't need the first three lines */
+                    for (int i = 3; i < num; i++) {
+                        bt += "\r\n%s".printf(symbols[i]);
+                    }
+                }
+            #endif
+
+            this.list_store.append (out iter);
+            this.list_store.set (iter,
+                TreeCells.MESSAGE, message,
+                #if HAVE_EXECINFO_H
+                TreeCells.BACKTRACE, bt,
+                #endif
+                TreeCells.STOCK, stock);
+
+            this.trayicon.set_visible (true);
+        }
+
+        private void show_error_log () {
+            if (this.log_window == null) {
+                this.log_window = new LogWindow (this);
+                this.log_window.show ();
+            } else {
+                if (this.log_window.is_active) {
+                    this.log_window.hide ();
+                } else {
+                    this.log_window.present ();
+                }
+            }
+        }
+
+        private void activated (Midori.App app) {
+            this.default_log_func = GLib.Log.default_handler;
+            GLib.Log.set_default_handler (this.log_handler);
+            if (this.trayicon != null) {
+                int length = 0;
+                this.list_store.foreach((model, path, iter) => {
+                    length++;
+                    return false;
+                });
+
+                if (length > 0) {
+                    this.trayicon.set_visible (true);
+                }
+            }
+        }
+
+        private void deactivated () {
+            if (this.trayicon != null)
+                this.trayicon.set_visible (false);
+
+            GLib.Log.set_default_handler (this.default_log_func);
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("DevPet"),
+                         description: _("This extension shows glib error messages in systray."),
+                         version: "0.1",
+                         authors: "André Stösel <andre@stoesel.de>");
+
+            this.list_store = new Gtk.ListStore (TreeCells.COUNT, typeof(string), typeof(string), typeof (string));
+
+            this.activate.connect (this.activated);
+            this.deactivate.connect (this.deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    theme = Gtk.IconTheme.get_default ();
+    return new DevPet.Manager ();
+}
+
diff --git a/extensions/domain-keys.vala b/extensions/domain-keys.vala
new file mode 100644 (file)
index 0000000..366ec41
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ Copyright (C) 2014 James Axl <bilimish@yandex.ru>
+
+ 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 DomainHotkeys {
+    class Manager : Midori.Extension {
+        internal Manager () {
+            GLib.Object (name: _("Domain Hotkeys"),
+                         description: _("Add www. and .com/.country_domain and proceed with Ctrl+Enter/Shift+Enter"),
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "James Axl <bilimish@yandex.ru>");
+            activate.connect (this.activated);
+            deactivate.connect (this.deactivated);
+        }
+
+        bool key_press_event (Midori.LocationAction action, Gdk.EventKey event_key) {
+            if (event_key.keyval == Gdk.keyval_from_name ("Return")) {
+                if ((bool)(event_key.state & Gdk.ModifierType.CONTROL_MASK)) {
+                    location_action_submit_uri_with_suffix (action, ".com");
+                    return true;
+                } else if((bool)(event_key.state & Gdk.ModifierType.SHIFT_MASK)) {
+                    var domain = C_("Domain", ".com");
+                    location_action_submit_uri_with_suffix (action, domain);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void location_action_submit_uri_with_suffix (Midori.LocationAction action, string suffix) {
+            var url = action.get_text ();
+            string completed_url = "www." + url + suffix;
+            action.submit_uri (completed_url, false);
+        }
+
+        void browser_added (Midori.Browser browser) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Location") as Midori.LocationAction;
+            action.key_press_event.connect (key_press_event);
+        }
+
+        void activated (Midori.App app) {
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+        }
+
+        void browser_removed (Midori.Browser browser) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Location") as Midori.LocationAction;
+            action.key_press_event.disconnect (key_press_event);
+        }
+
+        void deactivated () {
+            var app = get_app ();
+            app.add_browser.disconnect (browser_added);
+            foreach (var browser in app.get_browsers ())
+                browser_removed (browser);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new DomainHotkeys.Manager ();
+}
index 70225ba1d07410954a88727024d2087f315b5b3f..25e044115fb639e3411c825328135c4ad0733dfb 100644 (file)
@@ -9,12 +9,6 @@
    See the file COPYING for the full license text.
 */
 
-using Gtk;
-using Soup;
-using Katze;
-using Midori;
-using WebKit;
-
 namespace EDM {
 #if !HAVE_WIN32
     [DBus (name = "net.launchpad.steadyflow.App")]
@@ -33,7 +27,7 @@ namespace EDM {
     internal Manager manager;
 
     private class Manager : GLib.Object {
-        private CookieJar cookie_jar;
+        private Soup.CookieJar cookie_jar;
         private GLib.PtrArray download_managers =  new GLib.PtrArray ();
 
         public bool download_requested (Midori.View view, WebKit.Download download) {
@@ -41,11 +35,16 @@ namespace EDM {
 
             if (download_type == Midori.DownloadType.SAVE) {
                 var dlReq = new DownloadRequest ();
-                dlReq.uri = download.get_uri ();
 
+                #if HAVE_WEBKIT2
+                dlReq.uri = download.request.get_uri ();
+                weak Soup.MessageHeaders headers = download.request.get_http_headers ();
+                #else
+                dlReq.uri = download.get_uri ();
                 var request = download.get_network_request ();
                 var message = request.get_message ();
-                weak MessageHeaders headers = message.request_headers;
+                weak Soup.MessageHeaders headers = message.request_headers;
+                #endif
 
                 dlReq.auth = headers.get ("Authorization");
                 dlReq.referer = headers.get ("Referer");
@@ -102,8 +101,12 @@ namespace EDM {
         }
 
         construct {
+            #if HAVE_WEBKIT2
+            var session= new Session ();
+            #else
             var session = WebKit.get_default_session ();
-            this.cookie_jar = session.get_feature (typeof (CookieJar)) as CookieJar;
+            #endif
+            this.cookie_jar = session.get_feature (typeof (Soup.CookieJar)) as Soup.CookieJar;
         }
     }
 
@@ -119,8 +122,8 @@ namespace EDM {
         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,
+            var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,
+                Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
                 _("An error occurred when attempting to download a file with the following plugin:\n" +
                   "%s\n\n" +
                   "Error:\n%s\n\n" +
@@ -137,32 +140,48 @@ namespace EDM {
 #if !HAVE_WIN32
     private class Aria2 : ExternalDownloadManager {
         public override bool download (DownloadRequest dlReq) {
-            var url = value_array_new ();
-            value_array_insert (url, 0, typeof (string), dlReq.uri);
+            var url = Soup.value_array_new ();
+            Soup.value_array_insert (url, 0, typeof (string), dlReq.uri);
 
-            GLib.HashTable<string, GLib.Value?> options = value_hash_new ();
+            GLib.HashTable<string, GLib.Value?> options = Soup.value_hash_new ();
             var referer = new GLib.Value (typeof (string));
             referer.set_string (dlReq.referer);
             options.insert ("referer", referer);
 
-            var headers = value_array_new ();
+            var headers = Soup.value_array_new ();
             if (dlReq.cookie_header != null) {
-                value_array_insert (headers, 0, typeof (string), "Cookie: %s".printf(dlReq.cookie_header));
+                Soup.value_array_insert (headers, 0, typeof (string), "Cookie: " + dlReq.cookie_header);
             }
 
             if (headers.n_values > 0)
                options.insert ("header", headers);
 
-            var message = XMLRPC.request_new ("http://127.0.0.1:6800/rpc",
+            var message = Soup.XMLRPC.request_new ("http://127.0.0.1:6800/rpc",
                 "aria2.addUri",
                 typeof (ValueArray), url,
                 typeof(HashTable), options);
-            var session = new SessionSync ();
+            var session = new Soup.SessionSync ();
             session.send_message (message);
 
+            /* Check if the plug-in actually recieved an reply.
+             * The parse method do not warns us about it. And the exception
+             * never is launched.*/
+            if (message.status_code != 200) {
+                var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,
+                    Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
+                    _("The plug-in was unable to connect with aria2:\n" +
+                      "Please make sure that aria2 is running with rpc enabled ie: aria2c --enable-rpc\n" +
+                      "If it's so, check it also is using the port 6800.\n" +
+                      "Lastly Check the configuration of your firewall.\n" +
+                      "Whitelist aria2 and the port 6800 if they aren't."
+                      ));
+                dialog.response.connect ((a) => { dialog.destroy (); });
+                dialog.run ();
+            }
+
             try {
                 Value v;
-                XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v);
+                Soup.XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v);
                 return true;
             } catch (Error e) {
                 this.handle_exception (e);
@@ -212,7 +231,7 @@ namespace EDM {
 #endif
 
     private class CommandLinePreferences : Gtk.Dialog {
-        protected Entry input;
+        protected Gtk.Entry input;
         protected CommandLine commandline;
 
         public CommandLinePreferences(CommandLine cl) {
@@ -234,20 +253,20 @@ namespace EDM {
 
         private void response_cb (Gtk.Dialog source, int response_id) {
             switch (response_id) {
-                case ResponseType.APPLY:
+                case Gtk.ResponseType.APPLY:
                     this.commandline.set_string ("commandline", this.input.get_text ());
                     this.commandline.update_description (this.commandline.get_app ());
                     this.destroy ();
                     break;
-                case ResponseType.CANCEL:
+                case Gtk.ResponseType.CANCEL:
                     this.destroy ();
                     break;
             }
         }
 
         private void create_widgets () {
-            Label text = new Label (_("Command:"));
-            this.input = new Entry ();
+            Gtk.Label text = new Gtk.Label (_("Command:"));
+            this.input = new Gtk.Entry ();
             this.input.set_text (this.commandline.get_string ("commandline"));
 
 
@@ -260,8 +279,8 @@ namespace EDM {
             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.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+            this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
 
             this.show_all ();
         }
@@ -273,15 +292,15 @@ namespace EDM {
             dialog.show ();
         }
 
+        private string replace_quoted (string context, string replace, string? with) {
+            return context.replace(replace, with != null ? GLib.Shell.quote(with) : "\'\'");
+        }
+
         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 = replace_quoted(cmd, "{REFERER}", dlReq.referer);
+                cmd = replace_quoted(cmd, "{COOKIES}", dlReq.cookie_header != null ? "Cookie: " + dlReq.cookie_header : null);
                 cmd = cmd.replace("{URL}", GLib.Shell.quote (dlReq.uri));
                 GLib.Process.spawn_command_line_async (cmd);
                 return true;
@@ -311,7 +330,7 @@ namespace EDM {
         internal CommandLine () {
 #if HAVE_WIN32
             string default_commandline = "\"%s\\FlashGet\\flashget.exe\" {URL}".printf (Environment.get_variable ("ProgramFiles"));
-#elif HAVE_FREEBSD
+#elif HAVE_FREEBSD || HAVE_DRAGONFLY
             string default_commandline = "fetch HTTP_REFERER={REFERER} {URL}";
 #else
             string default_commandline = "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}";
@@ -344,4 +363,3 @@ public Katze.Array extension_init () {
     extensions.add_item (new EDM.CommandLine ());
     return extensions;
 }
-
index 8a08107a0475cbdc200b3f4e6f436ff7547cd699..b4e565a0e45368daefac7f2483474f86b0399472 100644 (file)
@@ -359,17 +359,9 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview,
                 g_assert (KATZE_IS_ARRAY (parent));
                 if (added)
                 {
-                    #if GLIB_CHECK_VERSION (2, 26, 0)
                     GDateTime* date = g_date_time_new_from_unix_local (added);
                     gchar* pretty = g_date_time_format (date, "%c");
                     g_date_time_unref (date);
-                    #else
-                    static gchar date_fmt[512];
-                    const struct tm *tm = localtime (&added);
-                    /* Some GCC versions falsely complain about "%c" */
-                    strftime (date_fmt, sizeof (date_fmt), "%c", tm);
-                    gchar* pretty = g_strdup (date_fmt);
-                    #endif
 
     /* i18n: The local date a feed was last updated */
                     gchar* last_updated = g_strdup_printf (C_("Feed", "Last updated: %s."), pretty);
@@ -448,7 +440,6 @@ feed_panel_open_in_tab_activate_cb (GtkWidget* menuitem,
 {
     KatzeItem* item;
     const gchar* uri;
-    guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
 
@@ -675,8 +666,6 @@ feed_panel_get_toolbar (MidoriViewable* viewable)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         panel->toolbar = toolbar;
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed"));
index 356a582f6abde0ce708770fab58216ccc068c095..d27649fb8d7f3e94d834d10d3ba98cdb0ea1347d 100644 (file)
@@ -25,7 +25,11 @@ rss_is_valid (FeedParser* fparser)
     {
         if ((str = xmlGetProp (node, BAD_CAST "version")))
         {
-            valid = !xmlStrcmp (str, BAD_CAST "2.0");
+            if (!xmlStrcmp (str, BAD_CAST "2.0") || !xmlStrcmp (str, BAD_CAST "0.92"))
+                valid = TRUE;
+            else
+                valid = FALSE;
+
             xmlFree (str);
 
             if (valid)
diff --git a/extensions/feed-panel/katze-net.c b/extensions/feed-panel/katze-net.c
new file mode 100644 (file)
index 0000000..5cca255
--- /dev/null
@@ -0,0 +1,214 @@
+/*
+ Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+#if HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
+#if HAVE_UNISTD_H
+    #include <unistd.h>
+#endif
+
+#include "katze-net.h"
+#include "midori-core.h"
+
+#include <glib/gstdio.h>
+#include <libsoup/soup.h>
+
+struct _KatzeNet
+{
+    GObject parent_instance;
+};
+
+struct _KatzeNetClass
+{
+    GObjectClass parent_class;
+};
+
+G_DEFINE_TYPE (KatzeNet, katze_net, G_TYPE_OBJECT)
+
+static void
+katze_net_finalize (GObject* object);
+
+static void
+katze_net_class_init (KatzeNetClass* class)
+{
+    GObjectClass* gobject_class;
+
+    gobject_class = G_OBJECT_CLASS (class);
+    gobject_class->finalize = katze_net_finalize;
+}
+
+static void
+katze_net_init (KatzeNet* net)
+{
+}
+
+static void
+katze_net_finalize (GObject* object)
+{
+    G_OBJECT_CLASS (katze_net_parent_class)->finalize (object);
+}
+
+typedef struct
+{
+    KatzeNetStatusCb status_cb;
+    KatzeNetTransferCb transfer_cb;
+    gpointer user_data;
+    KatzeNetRequest* request;
+} KatzeNetPriv;
+
+#ifndef HAVE_WEBKIT2
+static void
+katze_net_priv_free (KatzeNetPriv* priv)
+{
+    KatzeNetRequest* request = priv->request;
+    g_free (request->uri);
+    g_free (request->mime_type);
+    g_free (request->data);
+    g_slice_free (KatzeNetRequest, request);
+    g_slice_free (KatzeNetPriv, priv);
+}
+
+static void
+katze_net_got_body_cb (SoupMessage*  msg,
+                       KatzeNetPriv* priv);
+
+static void
+katze_net_got_headers_cb (SoupMessage*  msg,
+                          KatzeNetPriv* priv)
+{
+    KatzeNetRequest* request = priv->request;
+
+    switch (msg->status_code)
+    {
+    case 200:
+        request->status = KATZE_NET_VERIFIED;
+        break;
+    case 301:
+        request->status = KATZE_NET_MOVED;
+        break;
+    default:
+        request->status = KATZE_NET_NOT_FOUND;
+    }
+
+    if (!priv->status_cb (request, priv->user_data))
+    {
+        g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv);
+        g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
+        soup_session_cancel_message (webkit_get_default_session (), msg, 1);
+    }
+}
+
+static void
+katze_net_got_body_cb (SoupMessage*  msg,
+                       KatzeNetPriv* priv)
+{
+    KatzeNetRequest* request = priv->request;
+
+    if (msg->response_body->length > 0)
+    {
+        request->data = g_memdup (msg->response_body->data,
+                                  msg->response_body->length);
+        request->length = msg->response_body->length;
+    }
+
+    priv->transfer_cb (request, priv->user_data);
+}
+
+static void
+katze_net_finished_cb (SoupMessage*  msg,
+                       KatzeNetPriv* priv)
+{
+    katze_net_priv_free (priv);
+}
+
+static gboolean
+katze_net_default_cb (KatzeNetPriv* priv)
+{
+    KatzeNetRequest* request;
+
+    request = priv->request;
+    request->status = KATZE_NET_NOT_FOUND;
+    if (priv->status_cb)
+        priv->status_cb (request, priv->user_data);
+    katze_net_priv_free (priv);
+    return FALSE;
+}
+#endif
+
+/**
+ * katze_net_load_uri:
+ * @net: a #KatzeNet, or %NULL
+ * @uri: an URI string
+ * @status_cb: function to call for status information
+ * @transfer_cb: function to call upon transfer
+ * @user_data: data to pass to the callback
+ *
+ * Requests a transfer of @uri.
+ *
+ * @status_cb will be called when the status of @uri
+ * is verified. The specified callback may be called
+ * multiple times unless cancelled.
+ *
+ * @transfer_cb will be called when the data @uri is
+ * pointing to was transferred. Note that even a failed
+ * transfer may transfer data.
+ *
+ * @status_cb will always to be called at least once.
+ **/
+void
+katze_net_load_uri (KatzeNet*          net,
+                    const gchar*       uri,
+                    KatzeNetStatusCb   status_cb,
+                    KatzeNetTransferCb transfer_cb,
+                    gpointer           user_data)
+{
+#ifndef HAVE_WEBKIT2
+    KatzeNetRequest* request;
+    KatzeNetPriv* priv;
+    SoupMessage* msg;
+
+    g_return_if_fail (uri != NULL);
+
+    if (!status_cb && !transfer_cb)
+        return;
+
+    request = g_slice_new (KatzeNetRequest);
+    request->uri = g_strdup (uri);
+    request->mime_type = NULL;
+    request->data = NULL;
+
+    priv = g_slice_new (KatzeNetPriv);
+    priv->status_cb = status_cb;
+    priv->transfer_cb = transfer_cb;
+    priv->user_data = user_data;
+    priv->request = request;
+
+    if (midori_uri_is_http (uri))
+    {
+        msg = soup_message_new ("GET", uri);
+        if (status_cb)
+            g_signal_connect (msg, "got-headers",
+                G_CALLBACK (katze_net_got_headers_cb), priv);
+        if (transfer_cb)
+            g_signal_connect (msg, "got-body",
+                G_CALLBACK (katze_net_got_body_cb), priv);
+        g_signal_connect (msg, "finished",
+            G_CALLBACK (katze_net_finished_cb), priv);
+        soup_session_queue_message (webkit_get_default_session (), msg, NULL, NULL);
+        return;
+    }
+
+    g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
+#endif
+}
+
diff --git a/extensions/feed-panel/katze-net.h b/extensions/feed-panel/katze-net.h
new file mode 100644 (file)
index 0000000..0fc8893
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+#ifndef __KATZE_NET_H__
+#define __KATZE_NET_H__
+
+#include "katze-utils.h"
+
+G_BEGIN_DECLS
+
+#define KATZE_TYPE_NET \
+    (katze_net_get_type ())
+#define KATZE_NET(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_NET, KatzeNet))
+#define KATZE_NET_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_NET, KatzeNetClass))
+#define KATZE_IS_NET(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_NET))
+#define KATZE_IS_NET_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_NET))
+#define KATZE_NET_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_NET, KatzeNetClass))
+
+typedef struct _KatzeNet                KatzeNet;
+typedef struct _KatzeNetClass           KatzeNetClass;
+
+GType
+katze_net_get_type                       (void) G_GNUC_CONST;
+
+typedef enum
+{
+    KATZE_NET_VERIFIED,
+    KATZE_NET_MOVED,
+    KATZE_NET_NOT_FOUND,
+    KATZE_NET_FAILED,
+    KATZE_NET_DONE
+} KatzeNetStatus;
+
+typedef struct
+{
+    gchar* uri;
+    KatzeNetStatus status;
+    gchar* mime_type;
+    gchar* data;
+    gint64 length;
+} KatzeNetRequest;
+
+typedef gboolean (*KatzeNetStatusCb)     (KatzeNetRequest*   request,
+                                          gpointer           user_data);
+
+typedef void     (*KatzeNetTransferCb)   (KatzeNetRequest*   request,
+                                          gpointer           user_data);
+
+void
+katze_net_load_uri                       (KatzeNet*          net,
+                                          const gchar*       uri,
+                                          KatzeNetStatusCb   status_cb,
+                                          KatzeNetTransferCb transfer_cb,
+                                          gpointer           user_data);
+
+G_END_DECLS
+
+#endif /* __KATZE_NET_H__ */
index 797c6e38c2ec7847bca59f56311e8e619ffe1c54..a605238c8e07b8e7626ec4800c8f5f6f379c4381 100644 (file)
@@ -13,6 +13,7 @@
 #include "feed-atom.h"
 #include "feed-rss.h"
 
+#include "katze-net.h"
 #include <midori/midori.h>
 
 #define EXTENSION_NAME "Feed Panel"
@@ -365,7 +366,7 @@ panel_add_feed_cb (FeedPanel*   panel,
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     gtk_entry_set_text (GTK_ENTRY (entry), "");
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
diff --git a/extensions/flummi.vala b/extensions/flummi.vala
new file mode 100644 (file)
index 0000000..7e8decb
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+   Copyright (C) 2013 André Stösel <andre@stoesel.de>
+
+   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 Flummi {
+    private class Manager : Midori.Extension {
+        private bool bounce () {
+            try {
+                Midori.App app = this.get_app ();
+                Midori.Browser? browser = app.browser;
+
+                if (browser == null || browser.tab == null) {
+                    return true;
+                }
+
+
+                Midori.Database database = new Midori.Database ("flummi.db");
+                unowned Sqlite.Database db = database.db;
+
+                string sqlcmd = "SELECT id, once, command FROM tasks ORDER BY id;";
+
+                Sqlite.Statement stmt;
+                if (db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK) {
+                    GLib.critical ("Failed to select from database: %s", db.errmsg ());
+                    return false;
+                }
+
+                int result = stmt.step ();
+                if (!(result == Sqlite.DONE || result == Sqlite.ROW)) {
+                    GLib.critical ("Failed to select from database: %s", db.errmsg ());
+                    return false;
+                }
+
+                Sqlite.Statement del_stmt;
+                sqlcmd = "DELETE FROM `tasks` WHERE id = :task_id;";
+                if (db.prepare_v2 (sqlcmd, -1, out del_stmt, null) != Sqlite.OK) {
+                    GLib.critical ("Failed to update database: %s", db.errmsg ());
+                    return false;
+                }
+
+                while (result == Sqlite.ROW) {
+                    int64 id = stmt.column_int64 (0);
+                    int64 once = stmt.column_int64 (1);
+                    string command = stmt.column_text (2);
+
+                    string[] commands = { command };
+
+                    if (!app.send_command (commands)) {
+                        GLib.critical ("Command failed: %s", command);
+                        return false;
+                    }
+
+                    if (once > 0) {
+                        del_stmt.bind_int64 (del_stmt.bind_parameter_index (":task_id"), id);
+                        if (del_stmt.step () != Sqlite.DONE) {
+                            GLib.critical ("Failed to delete record %lf.\nError: %s", id, db.errmsg ());
+                            return false;
+                        }
+                    }
+
+                    result = stmt.step ();
+                }
+            } catch (Midori.DatabaseError schema_error) {
+                GLib.error (schema_error.message);
+            }
+
+            return false;
+        }
+
+        private void activated (Midori.App app) {
+            GLib.Idle.add (this.bounce);
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("Flummi"),
+                         description: _("This extension provides a task queue for update jobs or recurring events."),
+                         version: "0.1",
+                         authors: "André Stösel <andre@stoesel.de>");
+
+            this.activate.connect (this.activated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new Flummi.Manager ();
+}
index 378ae65e62264b3647436455538a8dda60e3b82b..3fb0b02e8d803283981e452375efc7e491ba8150 100644 (file)
     #include <unistd.h>
 #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
 {
+    MidoriDatabase* database;
     sqlite3* db;
-    #ifdef FORMHISTORY_USE_GDOM
     WebKitDOMElement* element;
     int completion_timeout;
     GtkTreeModel* completion_model;
@@ -36,9 +31,6 @@ typedef struct
     GtkWidget* popup;
     gchar* oldkeyword;
     glong selection_index;
-    #else
-    gchar* jsforms;
-    #endif
     gchar* master_password;
     int master_password_canceled;
 } FormHistoryPriv;
@@ -64,11 +56,9 @@ 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
index 3d1d05ee03cc7cfa99fb813be8dd05775cc68b6e..8f7392109f2613c0d62dd284e066189093f0956c 100644 (file)
@@ -8,7 +8,6 @@
  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*
@@ -393,14 +392,12 @@ formhistory_DOMContentLoaded_cb (WebKitDOMElement* window,
     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);
@@ -460,11 +457,7 @@ formhistory_setup_suggestions (WebKitWebView*   web_view,
 void
 formhistory_private_destroy (FormHistoryPriv *priv)
 {
-    if (priv->db)
-    {
-        sqlite3_close (priv->db);
-        priv->db = NULL;
-    }
+    katze_object_assign (priv->database, NULL);
     katze_assign (priv->oldkeyword, NULL);
     gtk_widget_destroy (priv->popup);
     priv->popup = NULL;
@@ -506,9 +499,9 @@ formhistory_construct_popup_gui (FormHistoryPriv* priv)
     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;
+    priv->element = NULL;
 
     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 (file)
index 2596335..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- Copyright (C) 2009-2012 Alexander Butenko <a.butenka@gmail.com>
- Copyright (C) 2009-2012 Christian Dywan <christian@twotoasts.de>
-
- 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 = 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
index 510a135f8f46bb6f7981c00e9a61fd6ce410a7cc..060ac1c78c442c64995b17605f3e19770b230c3f 100644 (file)
@@ -117,13 +117,13 @@ formhistory_check_master_password (GtkWidget*       parent,
     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);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
 
     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_box_pack_start (GTK_BOX (content_area), entry, FALSE, TRUE, 0);
 
     gtk_widget_show_all (entry);
     gtk_widget_show_all (hbox);
@@ -221,9 +221,7 @@ formhistory_navigation_decision_cb (WebKitWebView*             web_view,
     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);
@@ -235,7 +233,6 @@ formhistory_navigation_decision_cb (WebKitWebView*             web_view,
             {
                 if (strcmp (parts[2], "password"))
                     formhistory_update_database (priv->db, NULL, parts[0], parts[1]);
-                #if WEBKIT_CHECK_VERSION (1, 3, 8)
                 else
                 {
                     #if 0
@@ -256,7 +253,6 @@ formhistory_navigation_decision_cb (WebKitWebView*             web_view,
                     g_object_set_data (G_OBJECT (web_view), "FormHistoryPasswordEntry", entry);
                     #endif
                 }
-                #endif
             }
             g_strfreev (parts);
             i++;
@@ -287,7 +283,6 @@ formhistory_window_object_cleared_cb (WebKitWebView*   web_view,
 
     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)
     {
@@ -301,10 +296,8 @@ formhistory_window_object_cleared_cb (WebKitWebView*   web_view,
                                   _("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)
@@ -391,7 +384,6 @@ formhistory_frame_loaded_cb (WebKitWebView*   web_view,
     formhistory_fill_login_data (js_context, priv, data);
     g_free (data);
 }
-#endif
 
 static void
 formhistory_deactivate_cb (MidoriExtension* extension,
@@ -408,11 +400,8 @@ formhistory_add_tab_cb (MidoriBrowser*   browser,
         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
@@ -460,10 +449,8 @@ formhistory_deactivate_tab (MidoriView*      view,
        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
@@ -502,44 +489,31 @@ static FormHistoryPriv*
 formhistory_new (const gchar* config_dir)
 {
     gchar* filename;
-    sqlite3* db;
-    char* errmsg = NULL, *errmsg2 = NULL;
+    GError* error = NULL;
     FormHistoryPriv* priv = formhistory_private_new ();
     priv->master_password = NULL;
     priv->master_password_canceled = 0;
     formhistory_construct_popup_gui (priv);
 
-    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);
+        priv->db = NULL;
+        return priv;
     }
+
+    filename = g_build_filename (config_dir, "forms.db", NULL);
+    priv->database = midori_database_new (filename, &error);
     g_free (filename);
-    if ((sqlite3_exec (db, "CREATE TABLE IF NOT EXISTS "
-                           "forms (domain text, field text, value text)",
-                           NULL, NULL, &errmsg) == SQLITE_OK))
+    if (error != NULL)
     {
-        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_critical ("%s", error->message);
+        g_error_free (error);
+        priv->db = NULL;
+        return priv;
     }
+
+    priv->db = midori_database_get_db (MIDORI_DATABASE (priv->database));
+    g_warn_if_fail (priv->db != NULL);
     return priv;
 }
 
@@ -625,7 +599,7 @@ formhistory_preferences_cb (MidoriExtension* extension)
     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);
+    gtk_box_pack_start (GTK_BOX (content_area), checkbox, FALSE, TRUE, 0);
     /* FIXME: Add pref to disable password manager */
 
     g_signal_connect (dialog,
index 79253a6b2bbf47fa9fdae421cf00c7a5d976699c..db719278a17a4e9d09496c911d1053102192456a 100644 (file)
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2010-2011 André Stösel <andre@stoesel.de>
+   Copyright (C) 2010-2013 André Stösel <andre@stoesel.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -9,11 +9,6 @@
    See the file COPYING for the full license text.
 */
 
-using Gtk;
-using Gdk;
-using WebKit;
-using Midori;
-
 namespace HistoryList {
     enum TabTreeCells {
         TREE_CELL_PIXBUF,
@@ -50,6 +45,8 @@ namespace HistoryList {
             Gtk.TreeViewColumn? column;
 
             this.treeview.get_cursor (out path, out column);
+            if (path == null)
+                return;
 
             unowned int[] indices = path.get_indices ();
             int new_index = indices[0] + step;
@@ -66,14 +63,16 @@ namespace HistoryList {
 
         public abstract void make_update ();
         public abstract void clean_up ();
+        public abstract void close_tab ();
     }
 
     private class TabWindow : HistoryWindow {
         protected Gtk.HBox? hbox;
         protected Gtk.VBox? vbox;
         protected bool is_dirty = false;
+        protected Gtk.ScrolledWindow? scroll_windows;
 
-        protected void store_append_row (GLib.PtrArray list, Gtk.ListStore store, out Gtk.TreeIter iter) {
+        protected void store_append_row (GLib.PtrArray list, Gtk.ListStore store) {
             for (var i = list.len; i > 0; i--) {
                 Midori.View view = list.index (i - 1) as Midori.View;
 
@@ -82,6 +81,7 @@ namespace HistoryList {
 
                 unowned string title = view.get_display_title ();
 
+                Gtk.TreeIter iter;
                 store.append (out iter);
                 store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon,
                                  TabTreeCells.TREE_CELL_STRING, title,
@@ -92,11 +92,32 @@ namespace HistoryList {
         }
 
         protected virtual void insert_rows (Gtk.ListStore store) {
-            Gtk.TreeIter iter;
             unowned GLib.PtrArray list = this.browser.get_data<GLib.PtrArray> ("history-list-tab-history");
             unowned GLib.PtrArray list_new = this.browser.get_data<GLib.PtrArray> ("history-list-tab-history-new");
-            store_append_row (list, store, out iter);
-            store_append_row (list_new, store, out iter);
+            store_append_row (list, store);
+            store_append_row (list_new, store);
+        }
+
+        protected void resize_treeview () {
+            Gtk.Requisition requisition;
+            int height;
+            int max_lines = 10;
+#if HAVE_GTK3
+            requisition = Gtk.Requisition();
+            this.treeview.get_preferred_size(out requisition, null);
+#else
+            this.treeview.size_request (out requisition);
+#endif
+            Gtk.ListStore model = this.treeview.get_model () as Gtk.ListStore;
+            int length = model.iter_n_children(null);
+            if (length > max_lines) {
+                height = requisition.height / length * max_lines + 2;
+            } else {
+                height = requisition.height + 2;
+            }
+            this.scroll_windows.set_size_request (320, height);
+            this.resize (320, height);
+
         }
 
         public TabWindow (Midori.Browser browser) {
@@ -107,10 +128,10 @@ namespace HistoryList {
 
             this.hbox = new Gtk.HBox (false, 1);
 
-            var sw = new Gtk.ScrolledWindow (null, null);
-            sw.set_policy (PolicyType.NEVER , PolicyType.AUTOMATIC);
-            sw.set_shadow_type (ShadowType.ETCHED_IN);
-            this.hbox.pack_start (sw, true, true, 0);
+            this.scroll_windows = new Gtk.ScrolledWindow (null, null);
+            this.scroll_windows.set_policy (Gtk.PolicyType.NEVER , Gtk.PolicyType.AUTOMATIC);
+            this.scroll_windows.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
+            this.hbox.pack_start (this.scroll_windows, true, true, 0);
 
             var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT,
                 typeof (Gdk.Pixbuf), typeof (string),
@@ -121,39 +142,23 @@ namespace HistoryList {
             this.vbox.pack_start (this.hbox, true, true, 0);
 
             this.treeview = new Gtk.TreeView.with_model (store);
-            sw.add (treeview);
+            this.scroll_windows.add (treeview);
 
             this.treeview.set_model (store);
             this.treeview.set ("headers-visible", false);
 
             this.treeview.insert_column_with_attributes (
                 -1, "Icon",
-                new CellRendererPixbuf (), "pixbuf", TabTreeCells.TREE_CELL_PIXBUF,
+                new Gtk.CellRendererPixbuf (), "pixbuf", TabTreeCells.TREE_CELL_PIXBUF,
                 "cell-background-gdk", TabTreeCells.TREE_CELL_BG);
             this.treeview.insert_column_with_attributes (
                 -1, "Title",
-                new CellRendererText (), "text", TabTreeCells.TREE_CELL_STRING,
+                new Gtk.CellRendererText (), "text", TabTreeCells.TREE_CELL_STRING,
                 "foreground-gdk", TabTreeCells.TREE_CELL_FG,
                 "cell-background-gdk", TabTreeCells.TREE_CELL_BG);
 
             this.show_all ();
-
-            Requisition requisition;
-            int height;
-            int max_lines = 10;
-#if HAVE_GTK3
-            requisition = Requisition();
-            this.treeview.get_preferred_size(out requisition, null);
-#else
-            this.treeview.size_request (out requisition);
-#endif
-            int length = store.iter_n_children(null);
-            if (length > max_lines) {
-                height = requisition.height / length * max_lines + 2;
-            } else {
-                height = requisition.height + 2;
-            }
-            sw.set_size_request (320, height);
+            this.resize_treeview ();
         }
 
         public override void make_update () {
@@ -163,13 +168,16 @@ namespace HistoryList {
             Gtk.TreeViewColumn? column;
 
             this.treeview.get_cursor (out path, out column);
+            if (path == null)
+                return;
 
             var model = this.treeview.get_model () as Gtk.ListStore;
 
             Gtk.TreeIter iter;
             unowned Midori.View? view = null;
 
-            model.get_iter (out iter, path);
+            if (!model.get_iter (out iter, path))
+                return;
             model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view);
             this.browser.set ("tab", view);
         }
@@ -188,6 +196,41 @@ namespace HistoryList {
                 this.is_dirty = false;
             }
         }
+
+        public override void close_tab () {
+            Gtk.TreePath? path;
+            Gtk.TreeViewColumn? column;
+
+            this.treeview.get_cursor (out path, out column);
+
+            Gtk.ListStore model = this.treeview.get_model () as Gtk.ListStore;
+            int length = model.iter_n_children(null);
+
+            if (length > 1) {
+                Gtk.TreeIter iter;
+                unowned Midori.View? view = null;
+
+                model.get_iter (out iter, path);
+                model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view);
+#if !HAVE_GTK3
+                /* removing the selected cursor causes a segfault when using GTK2 */
+                if (path.prev () == false)
+                    path.next ();
+                this.treeview.set_cursor (path, column, false);
+#endif
+
+                /*
+                    FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
+                    Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
+                */
+                model.remove (iter);
+                this.browser.close_tab (view);
+                if (length > 2)
+                    this.resize_treeview ();
+                else
+                    this.hide ();
+            }
+        }
     }
 
     private class NewTabWindow : TabWindow {
@@ -195,16 +238,15 @@ namespace HistoryList {
         protected bool first_step = true;
 
         protected override void insert_rows (Gtk.ListStore store) {
-            Gtk.TreeIter iter;
             unowned GLib.PtrArray list = this.browser.get_data<GLib.PtrArray> ("history-list-tab-history-new");
-            store_append_row (list, store, out iter);
+            store_append_row (list, store);
 
             if ((int)list.len == 0) {
                 this.old_tabs = true;
                 var label = new Gtk.Label (_("There are no unvisited tabs"));
                 this.vbox.pack_start (label, true, true, 0);
                 unowned GLib.PtrArray list_old = this.browser.get_data<GLib.PtrArray> ("history-list-tab-history");
-                store_append_row (list_old, store, out iter);
+                store_append_row (list_old, store);
             }
         }
 
@@ -234,7 +276,7 @@ namespace HistoryList {
 
     private class PreferencesDialog : Gtk.Dialog {
         protected Manager hl_manager;
-        protected ComboBox closing_behavior;
+        protected Gtk.ComboBox closing_behavior;
 
         public PreferencesDialog (Manager manager) {
             this.hl_manager = manager;
@@ -252,9 +294,9 @@ namespace HistoryList {
 
         private void response_cb (Gtk.Dialog source, int response_id) {
             switch (response_id) {
-                case ResponseType.APPLY:
+                case Gtk.ResponseType.APPLY:
                     int value;
-                    TreeIter iter;
+                    Gtk.TreeIter iter;
 
                     this.closing_behavior.get_active_iter (out iter);
                     var model = this.closing_behavior.get_model ();
@@ -265,26 +307,26 @@ namespace HistoryList {
 
                     this.destroy ();
                     break;
-                case ResponseType.CANCEL:
+                case Gtk.ResponseType.CANCEL:
                     this.destroy ();
                     break;
             }
         }
 
         private void create_widgets () {
-            ListStore model;
-            TreeIter iter;
-            TreeIter? active_iter = null;
+            Gtk.ListStore model;
+            Gtk.TreeIter iter;
+            Gtk.TreeIter? active_iter = null;
 
-            var table = new Table (1, 2, true);
-            var renderer = new CellRendererText ();
+            var table = new Gtk.Table (1, 2, true);
+            var renderer = new Gtk.CellRendererText ();
 
-            var label = new Label ( _("Tab closing behavior"));
+            var label = new Gtk.Label ( _("Tab closing behavior"));
             table.attach_defaults (label, 0, 1, 0, 1);
 
             var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
 
-            model = new ListStore (2, typeof (string), typeof (int));
+            model = new Gtk.ListStore (2, typeof (string), typeof (int));
 
             model.append (out iter);
             model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
@@ -304,7 +346,7 @@ namespace HistoryList {
             if (TabClosingBehavior.NEW == tab_closing_behavior)
                 active_iter = iter;
 
-            this.closing_behavior = new ComboBox.with_model (model);
+            this.closing_behavior = new Gtk.ComboBox.with_model (model);
             this.closing_behavior.set_active_iter (active_iter);
             this.closing_behavior.pack_start (renderer, true);
             this.closing_behavior.set_attributes (renderer, "text", 0);
@@ -323,8 +365,8 @@ namespace HistoryList {
             this.vbox.pack_start (table, false, true, 0);
 #endif
 
-            this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL);
-            this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY);
+            this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+            this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
 
             this.show_all ();
         }
@@ -334,6 +376,7 @@ namespace HistoryList {
         public signal void preferences_changed ();
 
         protected uint escKeyval;
+        protected uint delKeyval;
         protected uint modifier_count;
         protected int closing_behavior;
         protected HistoryWindow? history_window;
@@ -363,7 +406,7 @@ namespace HistoryList {
             return false;
         }
 
-        public bool key_release (Gdk.EventKey event_key, Browser browser) {
+        public bool key_release (Gdk.EventKey event_key, Midori.Browser browser) {
             if (is_key_a_modifier (event_key)) {
                 this.modifier_count--;
             }
@@ -378,11 +421,13 @@ namespace HistoryList {
                 }
                 this.history_window.destroy ();
                 this.history_window = null;
+            } else if (event_key.keyval == this.delKeyval) {
+                this.history_window.close_tab ();
             }
             return false;
         }
 
-        public void walk (Gtk.Action action, Browser browser, Type type, int step) {
+        public void walk (Gtk.Action action, Midori.Browser browser, Type type, int step) {
             Midori.View? view = null;
             view = browser.get_data<Midori.View?> ("history-list-last-change");
             if (view != null) {
@@ -417,7 +462,7 @@ namespace HistoryList {
             hw.walk (step);
         }
 
-        public void special_function (Gtk.Action action, Browser browser) {
+        public void special_function (Gtk.Action action, Midori.Browser browser) {
             if (this.history_window != null) {
                 this.ignoreNextChange = true;
                 this.history_window.make_update ();
@@ -578,6 +623,7 @@ namespace HistoryList {
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
             app.add_browser.connect (browser_added);
+            app.remove_browser.connect (browser_removed);
         }
 
         void deactivated () {
@@ -585,6 +631,7 @@ namespace HistoryList {
             foreach (var browser in app.get_browsers ())
                 browser_removed (browser);
             app.add_browser.disconnect (browser_added);
+            app.remove_browser.disconnect (browser_removed);
         }
 
         void show_preferences () {
@@ -607,6 +654,7 @@ namespace HistoryList {
         }
         construct {
             this.escKeyval = Gdk.keyval_from_name ("Escape");
+            this.delKeyval = Gdk.keyval_from_name ("Delete");
         }
     }
 }
index 46c14c86f34235a611609d10bf3496ba57bfd050..f105e153c0becb651af0495ef349132cf2062356 100644 (file)
@@ -128,8 +128,19 @@ struct MouseGestureNode
 static guint
 dist_sqr (guint x1, guint y1, guint x2, guint y2)
 {
-    guint xdiff = abs(x1 - x2);
-    guint ydiff = abs(y1 - y2);
+    guint xdiff = 0, ydiff = 0;
+    // Remember that x1, x2, y1 and y2 are guint unsigned integers.
+    // Subtracting a greater number from a lower one is undefined.
+    // This guards against that.
+
+    if (x1 > x2)
+        xdiff = x1 - x2;
+    else
+        xdiff = x2 - x1;
+    if (y1 > y2)
+        ydiff = y1 - y2;
+    else
+        ydiff = y2 - y1;
     return xdiff * xdiff + ydiff * ydiff;
 }
 
@@ -159,7 +170,7 @@ vector_follows_direction (float angle, float distance, MouseGestureDirection dir
         return distance < MINLENGTH / 2;
 
     float dir_angle = get_angle_for_direction (direction);
-    if (fabsf(angle - dir_angle) < DEVIANCE || fabsf(angle - dir_angle + 2 * M_PI) < DEVIANCE)
+    if (fabsf (angle - dir_angle) < DEVIANCE || fabsf (angle - dir_angle + 2 * (float)(M_PI)) < DEVIANCE)
         return TRUE;
 
     if(distance < MINLENGTH / 2)
@@ -267,8 +278,8 @@ mouse_gestures_motion_notify_event_cb (GtkWidget*     web_view,
             if (distance >= MINLENGTH)
             {
                 gesture->strokes[gesture->count] = nearest_direction_for_angle (angle);
-                if(midori_debug ("adblock:match"))
-                    g_debug ("detected %s\n", direction_names[gesture->strokes[gesture->count]]);
+                if (midori_debug ("mouse"))
+                    g_print ("mouse_gestures detected %s\n", direction_names[gesture->strokes[gesture->count]]);
             }
         }
         else if (!vector_follows_direction (angle, distance, old_direction)
@@ -384,7 +395,7 @@ mouse_gestures_load_config (MidoriExtension* extension)
     for(i = 0; keys[i]; i++)
     {
         gsize n_strokes;
-        int j;
+        guint j;
         gchar** stroke_strings = g_key_file_get_string_list (keyfile, "gestures", keys[i], &n_strokes,
                                                              NULL);
 
diff --git a/extensions/nojs/README.md b/extensions/nojs/README.md
new file mode 100644 (file)
index 0000000..3255980
--- /dev/null
@@ -0,0 +1 @@
+This is an extension for Midori web browser. With this extension you can manage which sites are allowed to execute javascript.
diff --git a/extensions/nojs/main.c b/extensions/nojs/main.c
new file mode 100644 (file)
index 0000000..74fefe2
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 "nojs.h"
+#include "nojs-preferences.h"
+
+/* Global instance */
+NoJS           *noJS=NULL;
+
+/* This extension was activated */
+static void _nojs_on_activate(MidoriExtension *inExtension, MidoriApp *inApp, gpointer inUserData)
+{
+       g_return_if_fail(noJS==NULL);
+
+       noJS=nojs_new(inExtension, inApp);
+       nojs_set_policy_for_unknown_domain(noJS, midori_extension_get_integer(inExtension, "unknown-domain-policy"));
+       nojs_set_allow_local_pages(noJS, midori_extension_get_boolean(inExtension, "allow-local-pages"));
+       nojs_set_only_second_level_domain(noJS, midori_extension_get_boolean(inExtension, "only-second-level"));
+}
+
+/* This extension was deactivated */
+static void _nojs_on_deactivate(MidoriExtension *inExtension, gpointer inUserData)
+{
+       g_return_if_fail(noJS);
+
+       g_object_unref(noJS);
+       noJS=NULL;
+}
+
+/* Preferences of this extension should be opened */
+static void _nojs_on_preferences_response(GtkWidget* inDialog,
+                                                                                       gint inResponse,
+                                                                                       gpointer *inUserData)
+{
+       gtk_widget_destroy(inDialog);
+}
+
+static void _nojs_on_open_preferences(MidoriExtension *inExtension)
+{
+       g_return_if_fail(noJS);
+
+       /* Show preferences window */
+       GtkWidget* dialog;
+
+       dialog=nojs_preferences_new(noJS);
+       gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+       g_signal_connect(dialog, "response", G_CALLBACK (_nojs_on_preferences_response), NULL);
+       gtk_widget_show_all(dialog);
+}
+
+/* Main entry for extension */
+MidoriExtension *extension_init(void)
+{
+       /* Set up extension */
+       MidoriExtension *extension=g_object_new(MIDORI_TYPE_EXTENSION,
+                                                                                               "name", _("NoJS"),
+                                                                                               "description", _("Manage javascript permission per site"),
+                                                                                               "version", "0.1" MIDORI_VERSION_SUFFIX,
+                                                                                               "authors", "Stephan Haller <nomad@froevel.de>",
+                                                                                               NULL);
+
+       midori_extension_install_integer(extension, "unknown-domain-policy", NOJS_POLICY_BLOCK);
+       midori_extension_install_boolean(extension, "allow-local-pages", TRUE);
+       midori_extension_install_boolean(extension, "only-second-level", TRUE);
+
+       g_signal_connect(extension, "activate", G_CALLBACK(_nojs_on_activate), NULL);
+       g_signal_connect(extension, "deactivate", G_CALLBACK(_nojs_on_deactivate), NULL);
+       g_signal_connect(extension, "open-preferences", G_CALLBACK(_nojs_on_open_preferences), NULL);
+
+       return(extension);
+}
diff --git a/extensions/nojs/nojs-preferences.c b/extensions/nojs/nojs-preferences.c
new file mode 100644 (file)
index 0000000..38900e9
--- /dev/null
@@ -0,0 +1,1022 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 "nojs-preferences.h"
+
+/* Define this class in GObject system */
+G_DEFINE_TYPE(NoJSPreferences,
+                               nojs_preferences,
+                               GTK_TYPE_DIALOG)
+
+/* Properties */
+enum
+{
+       PROP_0,
+
+       PROP_MANAGER,
+
+       PROP_LAST
+};
+
+static GParamSpec* NoJSPreferencesProperties[PROP_LAST]={ 0, };
+
+/* Private structure - access only by public API if needed */
+#define NOJS_PREFERENCES_GET_PRIVATE(obj) \
+       (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_NOJS_PREFERENCES, NoJSPreferencesPrivate))
+
+struct _NoJSPreferencesPrivate
+{
+       /* Extension related */
+       NoJS                                    *manager;
+       sqlite3                                 *database;
+
+       /* Dialog related */
+       GtkWidget                               *contentArea;
+       GtkListStore                    *listStore;
+       GtkWidget                               *list;
+       GtkTreeSelection                *listSelection;
+       GtkWidget                               *editingCombo;
+       GtkWidget                               *deleteButton;
+       GtkWidget                               *deleteAllButton;
+       GtkWidget                               *allowLocalPagesCheckbox;
+       GtkWidget                               *blockUnknownDomainsCheckbox;
+       GtkWidget                               *checkSecondLevelOnlyCheckbox;
+       GtkWidget                               *addDomainEntry;
+       GtkWidget                               *addDomainPolicyCombo;
+       GtkWidget                               *addDomainButton;
+
+       gint                                    signalAllowLocalPagesToggledID;
+       gint                                    signalBlockUnknownDomainsToggledID;
+       gint                                    signalCheckSecondLevelOnlyToggledID;
+
+       gint                                    signalManagerChangedDatabaseID;
+       gint                                    signalManagerChangedAllowLocalPagesID;
+       gint                                    signalManagerChangedUnknownDomainPolicyID;
+       gint                                    signalManagerChangedCheckSecondLevelID;
+};
+
+enum
+{
+       DOMAIN_COLUMN,
+       POLICY_COLUMN,
+       N_COLUMN
+};
+
+
+/* IMPLEMENTATION: Private variables and methods */
+
+/* "Add domain"-button was pressed */
+static void _nojs_preferences_on_add_domain_clicked(NoJSPreferences *self,
+                                                                                                               gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gchar                                   *domain;
+       const gchar                             *domainStart, *domainEnd;
+       gchar                                   *realDomain;
+       GtkTreeIter                             policyIter;
+
+       g_return_if_fail(priv->database);
+
+       /* Get domain name entered */
+       domain=g_hostname_to_ascii(gtk_entry_get_text(GTK_ENTRY(priv->addDomainEntry)));
+
+       /* Trim whitespaces from start and end of entered domain name */
+       domainStart=domain;
+       while(*domainStart && g_ascii_isspace(*domainStart)) domainStart++;
+
+       domainEnd=domain+strlen(domain)-1;
+       while(*domainEnd && g_ascii_isspace(*domainEnd)) domainEnd--;
+       if(domainEnd<=domainStart) return;
+
+       /* Seperate domain name from whitespaces */
+       realDomain=g_strndup(domain, domainEnd-domainStart+1);
+       if(!realDomain) return;
+
+       /* Get policy from combo box */
+       if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->addDomainPolicyCombo), &policyIter))
+       {
+               gchar   *sql;
+               gchar   *error=NULL;
+               gint    success;
+               gint    policy;
+               gchar   *policyName;
+
+               /* Get policy value to set for domain */
+               gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(priv->addDomainPolicyCombo)),
+                                                                                                       &policyIter,
+                                                                                                       0, &policy,
+                                                                                                       1, &policyName,
+                                                                                                       -1);
+
+               /* Add domain name and the selected policy to database */
+               sql=sqlite3_mprintf("INSERT OR REPLACE INTO policies (site, value) VALUES ('%q', %d);",
+                                                               realDomain,
+                                                               policy);
+               success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
+
+               /* Show error message if any */
+               if(success==SQLITE_OK)
+               {
+                       gtk_list_store_append(priv->listStore, &policyIter);
+                       gtk_list_store_set(priv->listStore,
+                                                               &policyIter,
+                                                               DOMAIN_COLUMN, realDomain,
+                                                               POLICY_COLUMN, policyName,
+                                                               -1);
+               }
+                       else g_warning(_("SQL fails: %s"), error);
+
+
+               if(error) sqlite3_free(error);
+
+               /* Free allocated resources */
+               sqlite3_free(sql);
+       }
+
+       /* Free allocated resources */
+       g_free(realDomain);
+       g_free(domain);
+}
+
+/* Entry containing domain name which may be added to list has changed */
+static void _nojs_preferences_on_add_domain_entry_changed(NoJSPreferences *self,
+                                                                                                                       GtkEditable *inEditable)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gchar                                   *asciiDomain, *checkAsciiDomain;
+       gchar                                   *asciiDomainStart, *asciiDomainEnd;
+       gint                                    dots;
+       gboolean                                isValid=FALSE;
+
+       /* Get ASCII representation of domain name entered */
+       asciiDomain=g_hostname_to_ascii(gtk_entry_get_text(GTK_ENTRY(priv->addDomainEntry)));
+
+       /* Trim whitespaces from start and end of entered domain name */
+       asciiDomainStart=asciiDomain;
+       while(*asciiDomainStart && g_ascii_isspace(*asciiDomainStart)) asciiDomainStart++;
+
+       asciiDomainEnd=asciiDomain+strlen(asciiDomain)-1;
+       while(*asciiDomainEnd && g_ascii_isspace(*asciiDomainEnd)) asciiDomainEnd--;
+
+       /* We allow only domain names and not cookie domain name so entered name
+        * must not start with a dot
+        */
+       checkAsciiDomain=asciiDomainStart;
+       isValid=(*asciiDomainStart!='.' && *asciiDomainEnd!='.');
+
+       /* Now check if ASCII domain name is valid (very very simple check)
+        * and contains a hostname besides TLD
+        */
+       dots=0;
+
+       while(*checkAsciiDomain &&
+                       checkAsciiDomain<=asciiDomainEnd &&
+                       isValid)
+       {
+               /* Check for dot as (at least the first one) seperates hostname from TLD */
+               if(*checkAsciiDomain=='.') dots++;
+                       else
+                       {
+                               /* Check for valid characters in domain name.
+                                * Valid domain name can only contain ASCII alphabetic letters,
+                                * digits (0-9) and hyphens ('-')
+                                */
+                               isValid=(g_ascii_isalpha(*checkAsciiDomain) ||
+                                                       g_ascii_isdigit(*checkAsciiDomain) ||
+                                                       *checkAsciiDomain=='-');
+                       }
+
+               checkAsciiDomain++;
+       }
+
+       /* If we have not reached the trimmed end of string something must have gone wrong 
+        * and domain entered is invalid. If domain name entered excluding dots is longer
+        * than 255 character it is also invalid.
+        */
+       if(checkAsciiDomain<asciiDomainEnd) isValid=FALSE;
+               else if((checkAsciiDomain-asciiDomainStart-dots)>255) isValid=FALSE;
+
+       /* We need at least one dot in domain name (minimum number of dots to seperate
+        * hostname from TLD)
+        */
+       isValid=(isValid && dots>0);
+
+       /* Activate "add" button if hostname (equal to domain name here) is valid */
+       gtk_widget_set_sensitive(priv->addDomainButton, isValid);
+
+       /* Free allocated resources */
+       g_free(asciiDomain);
+}
+
+/* Fill domain list with stored policies */
+static void _nojs_preferences_fill(NoJSPreferences *self)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gint                                    success;
+       sqlite3_stmt                    *statement=NULL;
+
+       /* Clear tree/list view */
+       gtk_list_store_clear(priv->listStore);
+
+       /* If no database is present return here */
+       if(!priv->database) return;
+
+       /* Fill list store with policies from database */
+       success=sqlite3_prepare_v2(priv->database,
+                                                               "SELECT site, value FROM policies;",
+                                                               -1,
+                                                               &statement,
+                                                               NULL);
+       if(statement && success==SQLITE_OK)
+       {
+               gchar           *domain;
+               gint            policy;
+               gchar           *policyName;
+               GtkTreeIter     iter;
+
+               while(sqlite3_step(statement)==SQLITE_ROW)
+               {
+                       /* Get values */
+                       domain=(gchar*)sqlite3_column_text(statement, 0);
+                       policy=sqlite3_column_int(statement, 1);
+
+                       switch(policy)
+                       {
+                               case NOJS_POLICY_ACCEPT:
+                                       policyName=_("Accept");
+                                       break;
+
+                               case NOJS_POLICY_ACCEPT_TEMPORARILY:
+                                       policyName=_("Accept for session");
+                                       break;
+
+                               case NOJS_POLICY_BLOCK:
+                                       policyName=_("Block");
+                                       break;
+
+                               default:
+                                       policyName=NULL;
+                                       break;
+                       }
+
+                       if(policyName)
+                       {
+                               gtk_list_store_append(priv->listStore, &iter);
+                               gtk_list_store_set(priv->listStore,
+                                                                       &iter,
+                                                                       DOMAIN_COLUMN, domain,
+                                                                       POLICY_COLUMN, policyName,
+                                                                       -1);
+                       }
+               }
+       }
+               else g_warning(_("SQL fails: %s"), sqlite3_errmsg(priv->database));
+
+       sqlite3_finalize(statement);
+}
+
+/* Database instance in manager changed */
+static void _nojs_preferences_on_manager_database_changed(NoJSPreferences *self,
+                                                                                                                       GParamSpec *inSpec,
+                                                                                                                       gpointer inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       NoJS                                    *manager=NOJS(inUserData);
+       gchar                                   *databaseFile;
+
+       /* Close connection to any open database */
+       if(priv->database) sqlite3_close(priv->database);
+       priv->database=NULL;
+
+       /* Get pointer to new database and open database */
+       g_object_get(manager, "database-filename", &databaseFile, NULL);
+       if(databaseFile)
+       {
+               gint                            success;
+
+               success=sqlite3_open(databaseFile, &priv->database);
+               if(success!=SQLITE_OK)
+               {
+                       g_warning(_("Could not open database of extension: %s"), sqlite3_errmsg(priv->database));
+
+                       if(priv->database) sqlite3_close(priv->database);
+                       priv->database=NULL;
+               }
+
+               g_free(databaseFile);
+       }
+
+       /* Fill list with new database */
+       _nojs_preferences_fill(self);
+
+       /* Set up availability of management buttons */
+       gtk_widget_set_sensitive(priv->deleteAllButton, priv->database!=NULL);
+       gtk_widget_set_sensitive(priv->list, priv->database!=NULL);
+
+       return;
+}
+
+/* Allow-local-pages changed in check-box or manager */
+static void _nojs_preferences_on_allow_local_pages_changed(NoJSPreferences *self,
+                                                                                                                               gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gboolean                                state;
+
+       /* Get toggle state of widget (but block signal for manager) and set in manager */
+       g_signal_handler_block(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+
+       state=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->allowLocalPagesCheckbox));
+       nojs_set_allow_local_pages(priv->manager, state);
+
+       g_signal_handler_unblock(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+}
+
+static void _nojs_preferences_on_manager_allow_local_pages_changed(NoJSPreferences *self,
+                                                                                                                                       GParamSpec *inSpec,
+                                                                                                                                       gpointer inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       NoJS                                    *manager=NOJS(inUserData);
+       gboolean                                state;
+
+       /* Get new value from manager */
+       state=nojs_get_allow_local_pages(manager);
+
+       /* Set toggle in widget (but block signal for toggle) */
+       g_signal_handler_block(priv->allowLocalPagesCheckbox, priv->signalAllowLocalPagesToggledID);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->allowLocalPagesCheckbox), state);
+
+       g_signal_handler_unblock(priv->allowLocalPagesCheckbox, priv->signalAllowLocalPagesToggledID);
+}
+
+/* Block-unknown-domains changed in check-box or manager */
+static void _nojs_preferences_on_block_unknown_domains_changed(NoJSPreferences *self,
+                                                                                                                               gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gboolean                                state;
+       NoJSPolicy                              policy;
+
+       /* Get toggle state of widget (but block signal for manager) and set in manager */
+       g_signal_handler_block(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
+
+       state=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->blockUnknownDomainsCheckbox));
+       policy=(state ? NOJS_POLICY_BLOCK : NOJS_POLICY_ACCEPT);
+       nojs_set_policy_for_unknown_domain(priv->manager, policy);
+
+       g_signal_handler_unblock(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
+}
+
+static void _nojs_preferences_on_manager_unknown_domain_policy_changed(NoJSPreferences *self,
+                                                                                                                                               GParamSpec *inSpec,
+                                                                                                                                               gpointer inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       NoJS                                    *manager=NOJS(inUserData);
+       NoJSPolicy                              policy;
+       gboolean                                state;
+
+       /* Get new value from manager */
+       policy=nojs_get_policy_for_unknown_domain(manager);
+
+       /* Set toggle in widget (but block signal for toggle) */
+       g_signal_handler_block(priv->blockUnknownDomainsCheckbox, priv->signalBlockUnknownDomainsToggledID);
+
+       state=(policy==NOJS_POLICY_BLOCK ? TRUE : FALSE);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->blockUnknownDomainsCheckbox), state);
+
+       g_signal_handler_unblock(priv->blockUnknownDomainsCheckbox, priv->signalBlockUnknownDomainsToggledID);
+}
+
+/* Only-second-level changed in check-box or manager */
+static void _nojs_preferences_on_check_second_level_only_changed(NoJSPreferences *self,
+                                                                                                                                       gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gboolean                                state;
+
+       /* Get toggle state of widget (but block signal for manager) and set in manager */
+       g_signal_handler_block(priv->manager, priv->signalManagerChangedCheckSecondLevelID);
+
+       state=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->checkSecondLevelOnlyCheckbox));
+       nojs_set_only_second_level_domain(priv->manager, state);
+
+       g_signal_handler_unblock(priv->manager, priv->signalManagerChangedCheckSecondLevelID);
+}
+
+static void _nojs_preferences_on_manager_only_second_level_changed(NoJSPreferences *self,
+                                                                                                                                       GParamSpec *inSpec,
+                                                                                                                                       gpointer inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       NoJS                                    *manager=NOJS(inUserData);
+       gboolean                                state;
+
+       /* Get new value from manager */
+       state=nojs_get_only_second_level_domain(manager);
+
+       /* Set toggle in widget (but block signal for toggle) */
+       g_signal_handler_block(priv->checkSecondLevelOnlyCheckbox, priv->signalCheckSecondLevelOnlyToggledID);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkSecondLevelOnlyCheckbox), state);
+
+       g_signal_handler_unblock(priv->checkSecondLevelOnlyCheckbox, priv->signalCheckSecondLevelOnlyToggledID);
+}
+
+static void _nojs_preferences_on_policy_editing_started(NoJSPreferences *self,
+                                                                                                                       GtkCellEditable *editable,
+                                                                                                                       gchar *path,
+                                                                                                                       gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+
+       priv->editingCombo=NULL;
+
+       if(!GTK_IS_COMBO_BOX(editable)) return;
+
+       priv->editingCombo=GTK_WIDGET(editable);
+}
+
+static void _nojs_preferences_on_policy_editing_canceled(NoJSPreferences *self,
+                                                                                                                       gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+
+       priv->editingCombo=NULL;
+}
+
+static void _nojs_preferences_on_policy_edited(NoJSPreferences *self,
+                                                                                               gchar *path,
+                                                                                               gchar *newText,
+                                                                                               gpointer *inUserData)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gchar                                                                                   *domain;
+       GtkTreeIter                                                                             iter;
+       GtkTreeIter                                                                             policyIter;
+
+       g_return_if_fail(priv->database);
+
+       if (priv->editingCombo == NULL) return;
+
+       gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(priv->listStore), &iter, path);
+
+       gtk_tree_model_get(GTK_TREE_MODEL(priv->listStore),
+                                               &iter,
+                                               DOMAIN_COLUMN, &domain,
+                                               -1);
+
+       /* Get policy from combo box */
+       if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->editingCombo), &policyIter))
+       {
+               gchar   *sql;
+               gchar   *error=NULL;
+               gint    success;
+               gint    policy;
+               gchar   *policyName;
+
+               /* Get policy value to set for domain */
+               gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(priv->editingCombo)),
+                                                                                                       &policyIter,
+                                                                                                       0, &policy,
+                                                                                                       1, &policyName,
+                                                                                                       -1);
+
+               g_return_if_fail(g_strcmp0(policyName, newText)==0);
+
+               /* Add domain name and the selected policy to database */
+               sql=sqlite3_mprintf("UPDATE policies SET value = %d WHERE site = '%q';",
+                                                               policy,
+                                                               domain);
+               success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
+
+               /* Show error message if any */
+               if(success==SQLITE_OK)
+               {
+                       gtk_list_store_set(priv->listStore,
+                                                               &iter,
+                                                               POLICY_COLUMN, newText,
+                                                               -1);
+               }
+                       else g_warning(_("SQL fails: %s"), error);
+
+
+               if(error) sqlite3_free(error);
+
+               /* Free allocated resources */
+               sqlite3_free(sql);
+       }
+
+       priv->editingCombo=NULL;
+}
+
+/* Selection in list changed */
+void _nojs_preferences_changed_selection(NoJSPreferences *self,
+                                                                                       GtkTreeSelection *inSelection)
+{
+       gboolean        selected=(gtk_tree_selection_count_selected_rows(inSelection)>0 ? TRUE: FALSE);
+
+       gtk_widget_set_sensitive(self->priv->deleteButton, selected);
+}
+
+/* Delete button was clicked on selection */
+void _nojs_preferences_on_delete_selection(NoJSPreferences *self,
+                                                                                       GtkButton *inButton)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       GList                                   *rows, *row, *refs=NULL;
+       GtkTreeRowReference             *ref;
+       GtkTreeModel                    *model=GTK_TREE_MODEL(priv->listStore);
+       GtkTreeIter                             iter;
+       GtkTreePath                             *path;
+       gchar                                   *domain;
+       gchar                                   *sql;
+       gint                                    success;
+       gchar                                   *error;
+
+       /* Get selected rows in list and create a row reference because
+        * we will modify the model while iterating through selected rows
+        */
+       rows=gtk_tree_selection_get_selected_rows(priv->listSelection, &model);
+       for(row=rows; row; row=row->next)
+       {
+               ref=gtk_tree_row_reference_new(model, (GtkTreePath*)row->data);
+               refs=g_list_prepend(refs, ref);
+       }
+       g_list_foreach(rows,(GFunc)gtk_tree_path_free, NULL);
+       g_list_free(rows);
+
+       /* Delete each selected row by its reference */
+       for(row=refs; row; row=row->next)
+       {
+               /* Get domain from selected row */
+               path=gtk_tree_row_reference_get_path((GtkTreeRowReference*)row->data);
+               gtk_tree_model_get_iter(model, &iter, path);
+               gtk_tree_model_get(model, &iter, DOMAIN_COLUMN, &domain, -1);
+
+               /* Delete domain from database */
+               sql=sqlite3_mprintf("DELETE FROM policies WHERE site='%q';", domain);
+               success=sqlite3_exec(priv->database,
+                                                               sql,
+                                                               NULL,
+                                                               NULL,
+                                                               &error);
+               if(success!=SQLITE_OK || error)
+               {
+                       if(error)
+                       {
+                               g_critical(_("Failed to execute database statement: %s"), error);
+                               sqlite3_free(error);
+                       }
+                               else g_critical(_("Failed to execute database statement: %s"), sqlite3_errmsg(priv->database));
+               }
+               sqlite3_free(sql);
+
+               /* Delete row from model */
+               gtk_list_store_remove(priv->listStore, &iter);
+       }
+       g_list_foreach(refs,(GFunc)gtk_tree_row_reference_free, NULL);
+       g_list_free(refs);
+}
+
+/* Delete all button was clicked */
+void _nojs_preferences_on_delete_all(NoJSPreferences *self,
+                                                                               GtkButton *inButton)
+{
+       NoJSPreferencesPrivate  *priv=self->priv;
+       gint                                    success;
+       gchar                                   *error=NULL;
+       GtkWidget                               *dialog;
+       gint                                    dialogResponse;
+
+       /* Ask user if he really wants to delete all permissions */
+       dialog=gtk_message_dialog_new(GTK_WINDOW(self),
+                                                                       GTK_DIALOG_MODAL,
+                                                                       GTK_MESSAGE_QUESTION,
+                                                                       GTK_BUTTONS_YES_NO,
+                                                                       _("Do you really want to delete all JavaScript permissions?"));
+
+       gtk_window_set_title(GTK_WINDOW(dialog), _("Delete all JavaScript permissions?"));
+       gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PROPERTIES);
+
+       gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+                                                                                               _("This action will delete all JavaScript permissions. "
+                                                                                                 "You will be asked for permissions again for each web site visited."));
+
+       dialogResponse=gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy(dialog);
+
+       if(dialogResponse==GTK_RESPONSE_NO) return;
+
+       /* Delete all permission */
+       success=sqlite3_exec(priv->database,
+                                                       "DELETE FROM policies;",
+                                                       NULL,
+                                                       NULL,
+                                                       &error);
+
+       if(success!=SQLITE_OK || error)
+       {
+               if(error)
+               {
+                       g_critical(_("Failed to execute database statement: %s"), error);
+                       sqlite3_free(error);
+               }
+       }
+
+       /* Re-setup list */
+       _nojs_preferences_fill(self);
+}
+
+/* Sorting callbacks */
+static gint _nojs_preferences_sort_string_callback(GtkTreeModel *inModel,
+                                                                                                       GtkTreeIter *inLeft,
+                                                                                                       GtkTreeIter *inRight,
+                                                                                                       gpointer inUserData)
+{
+       gchar           *left, *right;
+       gint            column=GPOINTER_TO_INT(inUserData);
+       gint            result;
+
+       gtk_tree_model_get(inModel, inLeft, column, &left, -1);
+       gtk_tree_model_get(inModel, inRight, column, &right, -1);
+
+       result=g_strcmp0(left, right);
+
+       g_free(left);
+       g_free(right);
+
+       return(result);
+}
+
+/* IMPLEMENTATION: GObject */
+
+/* Finalize this object */
+static void nojs_preferences_finalize(GObject *inObject)
+{
+       NoJSPreferencesPrivate  *priv=NOJS_PREFERENCES(inObject)->priv;
+
+       /* Dispose allocated resources */
+       if(priv->database) sqlite3_close(priv->database);
+       priv->database=NULL;
+
+       if(priv->manager)
+       {
+               if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
+               priv->signalManagerChangedDatabaseID=0;
+
+               if(priv->signalManagerChangedAllowLocalPagesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+               priv->signalManagerChangedAllowLocalPagesID=0;
+
+               if(priv->signalManagerChangedUnknownDomainPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
+               priv->signalManagerChangedUnknownDomainPolicyID=0;
+
+               if(priv->signalManagerChangedCheckSecondLevelID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedCheckSecondLevelID);
+               priv->signalManagerChangedCheckSecondLevelID=0;
+
+               g_object_unref(priv->manager);
+               priv->manager=NULL;
+       }
+
+       /* Call parent's class finalize method */
+       G_OBJECT_CLASS(nojs_preferences_parent_class)->finalize(inObject);
+}
+
+/* Set/get properties */
+static void nojs_preferences_set_property(GObject *inObject,
+                                                                                       guint inPropID,
+                                                                                       const GValue *inValue,
+                                                                                       GParamSpec *inSpec)
+{
+       NoJSPreferences                 *self=NOJS_PREFERENCES(inObject);
+       NoJSPreferencesPrivate  *priv=self->priv;
+       GObject                                 *manager;
+
+       switch(inPropID)
+       {
+               /* Construct-only properties */
+               case PROP_MANAGER:
+                       /* Release old manager if available and disconnect signals */
+                       if(priv->manager)
+                       {
+                               if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
+                               priv->signalManagerChangedDatabaseID=0;
+
+                               if(priv->signalManagerChangedAllowLocalPagesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+                               priv->signalManagerChangedAllowLocalPagesID=0;
+
+                               if(priv->signalManagerChangedUnknownDomainPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
+                               priv->signalManagerChangedUnknownDomainPolicyID=0;
+
+                               if(priv->signalManagerChangedCheckSecondLevelID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedCheckSecondLevelID);
+                               priv->signalManagerChangedCheckSecondLevelID=0;
+
+                               g_object_unref(priv->manager);
+                               priv->manager=NULL;
+                       }
+
+                       /* Set new JavaScript permission manager and
+                        * listen to changes in database property
+                        */
+                       manager=g_value_get_object(inValue);
+                       if(manager)
+                       {
+                               priv->manager=g_object_ref(manager);
+
+                               priv->signalManagerChangedDatabaseID=
+                                       g_signal_connect_swapped(priv->manager,
+                                                                                               "notify::database-filename",
+                                                                                               G_CALLBACK(_nojs_preferences_on_manager_database_changed),
+                                                                                               self);
+                               _nojs_preferences_on_manager_database_changed(self, NULL, priv->manager);
+
+                               priv->signalManagerChangedAllowLocalPagesID=
+                                       g_signal_connect_swapped(priv->manager,
+                                                                                               "notify::allow-local-pages",
+                                                                                               G_CALLBACK(_nojs_preferences_on_manager_allow_local_pages_changed),
+                                                                                               self);
+                               _nojs_preferences_on_manager_allow_local_pages_changed(self, NULL, priv->manager);
+
+                               priv->signalManagerChangedUnknownDomainPolicyID=
+                                       g_signal_connect_swapped(priv->manager,
+                                                                                               "notify::unknown-domain-policy",
+                                                                                               G_CALLBACK(_nojs_preferences_on_manager_unknown_domain_policy_changed),
+                                                                                               self);
+                               _nojs_preferences_on_manager_unknown_domain_policy_changed(self, NULL, priv->manager);
+
+                               priv->signalManagerChangedCheckSecondLevelID=
+                                       g_signal_connect_swapped(priv->manager,
+                                                                                               "notify::only-second-level",
+                                                                                               G_CALLBACK(_nojs_preferences_on_manager_only_second_level_changed),
+                                                                                               self);
+                               _nojs_preferences_on_manager_only_second_level_changed(self, NULL, priv->manager);
+                       }
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+static void nojs_preferences_get_property(GObject *inObject,
+                                                                                       guint inPropID,
+                                                                                       GValue *outValue,
+                                                                                       GParamSpec *inSpec)
+{
+       NoJSPreferences *self=NOJS_PREFERENCES(inObject);
+
+       switch(inPropID)
+       {
+               case PROP_MANAGER:
+                       g_value_set_object(outValue, self->priv->manager);
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+/* Class initialization
+ * Override functions in parent classes and define properties and signals
+ */
+static void nojs_preferences_class_init(NoJSPreferencesClass *klass)
+{
+       GObjectClass            *gobjectClass=G_OBJECT_CLASS(klass);
+
+       /* Override functions */
+       gobjectClass->finalize=nojs_preferences_finalize;
+       gobjectClass->set_property=nojs_preferences_set_property;
+       gobjectClass->get_property=nojs_preferences_get_property;
+
+       /* Set up private structure */
+       g_type_class_add_private(klass, sizeof(NoJSPreferencesPrivate));
+
+       /* Define properties */
+       NoJSPreferencesProperties[PROP_MANAGER]=
+               g_param_spec_object("manager",
+                                                               _("Manager instance"),
+                                                               _("Instance to global NoJS manager"),
+                                                               TYPE_NOJS,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       g_object_class_install_properties(gobjectClass, PROP_LAST, NoJSPreferencesProperties);
+}
+
+/* Object initialization
+ * Create private structure and set up default values
+ */
+static void nojs_preferences_init(NoJSPreferences *self)
+{
+       NoJSPreferencesPrivate          *priv;
+       GtkTreeSortable                         *sortableList;
+       GtkCellRenderer                         *renderer;
+       GtkTreeViewColumn                       *column;
+       GtkWidget                                       *widget;
+       gchar                                           *dialogTitle;
+       GtkWidget                                       *scrolled;
+       GtkWidget                                       *vbox;
+       GtkWidget                                       *hbox;
+       gint                                            width, height;
+       GtkListStore                            *list;
+       GtkTreeIter                                     listIter;
+
+       priv=self->priv=NOJS_PREFERENCES_GET_PRIVATE(self);
+
+       /* Set up default values */
+       priv->manager=NULL;
+
+       /* Get content area to add gui controls to */
+       priv->contentArea=gtk_dialog_get_content_area(GTK_DIALOG(self));
+#if GTK_CHECK_VERSION (3, 0, 0)
+       vbox=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+       gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
+#else
+       vbox=gtk_vbox_new(FALSE, 0);
+#endif
+
+       /* Set up dialog */
+       dialogTitle=_("Configure NoJS");
+
+       gtk_window_set_title(GTK_WINDOW(self), dialogTitle);
+       gtk_window_set_icon_name(GTK_WINDOW(self), GTK_STOCK_PROPERTIES);
+
+       sokoke_widget_get_text_size(GTK_WIDGET(self), "M", &width, &height);
+       gtk_window_set_default_size(GTK_WINDOW(self), width*52, -1);
+
+       widget=sokoke_xfce_header_new(gtk_window_get_icon_name(GTK_WINDOW(self)), dialogTitle);
+       if(widget) gtk_box_pack_start(GTK_BOX(priv->contentArea), widget, FALSE, FALSE, 0);
+
+       gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+
+       /* Set up description */
+       widget=gtk_label_new(NULL);
+       gtk_label_set_markup(GTK_LABEL(widget),
+            _("Below is a list of all web sites and the policy set for them. "
+                                                       "You can delete policies by marking the entries and clicking on <i>Delete</i>."));
+       gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 4);
+
+       /* Set up domain list */
+       priv->listStore=gtk_list_store_new(N_COLUMN,
+                                                                               G_TYPE_STRING,  /* DOMAIN_COLUMN */
+                                                                               G_TYPE_STRING   /* POLICY_COLUMN */);
+
+       sortableList=GTK_TREE_SORTABLE(priv->listStore);
+       gtk_tree_sortable_set_sort_func(sortableList,
+                                                                               DOMAIN_COLUMN,
+                                                                               (GtkTreeIterCompareFunc)_nojs_preferences_sort_string_callback,
+                                                                               GINT_TO_POINTER(DOMAIN_COLUMN),
+                                                                               NULL);
+       gtk_tree_sortable_set_sort_func(sortableList,
+                                                                               POLICY_COLUMN,
+                                                                               (GtkTreeIterCompareFunc)_nojs_preferences_sort_string_callback,
+                                                                               GINT_TO_POINTER(POLICY_COLUMN),
+                                                                               NULL);
+       gtk_tree_sortable_set_sort_column_id(sortableList, DOMAIN_COLUMN, GTK_SORT_ASCENDING);
+
+       /* Set up domain addition widgets */
+#ifdef HAVE_GTK3
+       hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
+#else
+       hbox=gtk_hbox_new(FALSE, 0);
+#endif
+
+       priv->addDomainEntry=gtk_entry_new();
+       gtk_entry_set_max_length(GTK_ENTRY(priv->addDomainEntry), 64);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainEntry);
+       g_signal_connect_swapped(priv->addDomainEntry, "changed", G_CALLBACK(_nojs_preferences_on_add_domain_entry_changed), self);
+
+       list=gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, NOJS_POLICY_ACCEPT, 1, _("Accept"), -1);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, NOJS_POLICY_ACCEPT_TEMPORARILY, 1, _("Accept for session"), -1);
+       gtk_list_store_append(list, &listIter);
+       gtk_list_store_set(list, &listIter, 0, NOJS_POLICY_BLOCK, 1, _("Block"), -1);
+
+       priv->addDomainPolicyCombo=gtk_combo_box_new_with_model(GTK_TREE_MODEL(list));
+       gtk_combo_box_set_active(GTK_COMBO_BOX(priv->addDomainPolicyCombo), 0);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainPolicyCombo);
+
+       renderer=gtk_cell_renderer_text_new();
+       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, TRUE);
+       gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, "text", 1);
+
+       priv->addDomainButton=gtk_button_new_from_stock(GTK_STOCK_ADD);
+       gtk_widget_set_sensitive(priv->addDomainButton, FALSE);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
+       g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_nojs_preferences_on_add_domain_clicked), self);
+
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
+
+       /* Set up domain list view */
+       priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
+
+#if !GTK_CHECK_VERSION (3, 0, 0)
+       gtk_widget_set_size_request(priv->list, -1, 300);
+#endif
+
+       priv->listSelection=gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->list));
+       gtk_tree_selection_set_mode(priv->listSelection, GTK_SELECTION_MULTIPLE);
+       g_signal_connect_swapped(priv->listSelection, "changed", G_CALLBACK(_nojs_preferences_changed_selection), self);
+
+       renderer=gtk_cell_renderer_text_new();
+       column=gtk_tree_view_column_new_with_attributes(_("Domain"),
+                                                                                                       renderer,
+                                                                                                       "text", DOMAIN_COLUMN,
+                                                                                                       NULL);
+       gtk_tree_view_column_set_sort_column_id(column, DOMAIN_COLUMN);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column);
+
+       renderer=gtk_cell_renderer_combo_new();
+       g_object_set(G_OBJECT(renderer), "model", list, "text-column", 1, "has-entry", false, "editable", true, NULL);
+       g_signal_connect_swapped(renderer, "editing-started", G_CALLBACK(_nojs_preferences_on_policy_editing_started), self);
+       g_signal_connect_swapped(renderer, "editing-canceled", G_CALLBACK(_nojs_preferences_on_policy_editing_canceled), self);
+       g_signal_connect_swapped(renderer, "edited", G_CALLBACK(_nojs_preferences_on_policy_edited), self);
+       column=gtk_tree_view_column_new_with_attributes(_("Policy"),
+                                                                                                       renderer,
+                                                                                                       "text", POLICY_COLUMN,
+                                                                                                       NULL);
+       gtk_tree_view_column_set_sort_column_id(column, POLICY_COLUMN);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column);
+
+       scrolled=gtk_scrolled_window_new(NULL, NULL);
+#if GTK_CHECK_VERSION (3, 0, 0)
+       gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolled), height*10);
+#endif
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_container_add(GTK_CONTAINER(scrolled), priv->list);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 5);
+
+       /* Set up JavaScript domain list management buttons */
+#if GTK_CHECK_VERSION (3, 0, 0)
+       hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
+#else
+       hbox=gtk_hbox_new(FALSE, 0);
+#endif
+
+       priv->deleteButton=gtk_button_new_from_stock(GTK_STOCK_DELETE);
+       gtk_widget_set_sensitive(priv->deleteButton, FALSE);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->deleteButton);
+       g_signal_connect_swapped(priv->deleteButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_selection), self);
+
+       priv->deleteAllButton=gtk_button_new_with_mnemonic(_("Delete _all"));
+       gtk_button_set_image(GTK_BUTTON(priv->deleteAllButton), gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON));
+       gtk_widget_set_sensitive(priv->deleteAllButton, FALSE);
+       gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
+       g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_all), self);
+
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
+
+       /* Add "allow-local-pages" checkbox */
+       priv->allowLocalPagesCheckbox=gtk_check_button_new_with_mnemonic(_("A_llow scripts on local pages"));
+       priv->signalAllowLocalPagesToggledID=g_signal_connect_swapped(priv->allowLocalPagesCheckbox,
+                                                                                                                               "toggled",
+                                                                                                                               G_CALLBACK(_nojs_preferences_on_allow_local_pages_changed),
+                                                                                                                               self);
+       gtk_box_pack_start(GTK_BOX(vbox), priv->allowLocalPagesCheckbox, FALSE, TRUE, 5);
+
+       /* Add "block-unknown-domains" checkbox */
+       priv->blockUnknownDomainsCheckbox=gtk_check_button_new_with_mnemonic(_("Bloc_k scripts at unknown domains by default"));
+       priv->signalBlockUnknownDomainsToggledID=g_signal_connect_swapped(priv->blockUnknownDomainsCheckbox,
+                                                                                                                                               "toggled",
+                                                                                                                                               G_CALLBACK(_nojs_preferences_on_block_unknown_domains_changed),
+                                                                                                                                               self);
+       gtk_box_pack_start(GTK_BOX(vbox), priv->blockUnknownDomainsCheckbox, FALSE, TRUE, 5);
+
+       /* Add "check-second-level-only" checkbox */
+       priv->checkSecondLevelOnlyCheckbox=gtk_check_button_new_with_mnemonic(_("S_et permissions on second-level domain"));
+       priv->signalCheckSecondLevelOnlyToggledID=g_signal_connect_swapped(priv->checkSecondLevelOnlyCheckbox,
+                                                                                                                                               "toggled",
+                                                                                                                                               G_CALLBACK(_nojs_preferences_on_check_second_level_only_changed),
+                                                                                                                                               self);
+       gtk_box_pack_start(GTK_BOX(vbox), priv->checkSecondLevelOnlyCheckbox, FALSE, TRUE, 5);
+
+       /* Finalize setup of content area */
+       gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
+}
+
+/* Implementation: Public API */
+
+/* Create new object */
+GtkWidget* nojs_preferences_new(NoJS *inManager)
+{
+       return(g_object_new(TYPE_NOJS_PREFERENCES,
+                                                       "manager", inManager,
+                                                       NULL));
+}
diff --git a/extensions/nojs/nojs-preferences.h b/extensions/nojs/nojs-preferences.h
new file mode 100644 (file)
index 0000000..2733658
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 __NOJS_PREFERENCES__
+#define __NOJS_PREFERENCES__
+
+#include "config.h"
+#include <midori/midori.h>
+
+#include "nojs.h"
+
+G_BEGIN_DECLS
+
+#define TYPE_NOJS_PREFERENCES                          (nojs_preferences_get_type())
+#define NOJS_PREFERENCES(obj)                          (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_NOJS_PREFERENCES, NoJSPreferences))
+#define IS_NOJS_PREFERENCES(obj)                       (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_NOJS_PREFERENCES))
+#define NOJS_PREFERENCES_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_NOJS_PREFERENCES, NoJSPreferencesClass))
+#define IS_NOJS_PREFERENCES_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_NOJS_PREFERENCES))
+#define NOJS_PREFERENCES_GET_CLASS(obj)                (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_NOJS_PREFERENCES, NoJSPreferencesClass))
+
+typedef struct _NoJSPreferences                                NoJSPreferences;
+typedef struct _NoJSPreferencesClass           NoJSPreferencesClass;
+typedef struct _NoJSPreferencesPrivate         NoJSPreferencesPrivate;
+
+struct _NoJSPreferences
+{
+       /* Parent instance */
+       GtkDialog                               parent_instance;
+
+       /* Private structure */
+       NoJSPreferencesPrivate  *priv;
+};
+
+struct _NoJSPreferencesClass
+{
+       /* Parent class */
+       GtkDialogClass                  parent_class;
+};
+
+/* Public API */
+GType nojs_preferences_get_type(void);
+
+GtkWidget* nojs_preferences_new(NoJS *inManager);
+
+G_END_DECLS
+
+#endif /* __NOJS_PREFERENCES__ */
diff --git a/extensions/nojs/nojs-view.c b/extensions/nojs/nojs-view.c
new file mode 100644 (file)
index 0000000..0086481
--- /dev/null
@@ -0,0 +1,807 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 "nojs-view.h"
+#include "nojs-preferences.h"
+
+/* Define this class in GObject system */
+G_DEFINE_TYPE(NoJSView,
+                               nojs_view,
+                               G_TYPE_OBJECT)
+
+/* Properties */
+enum
+{
+       PROP_0,
+
+       PROP_MANAGER,
+       PROP_BROWSER,
+       PROP_VIEW,
+       PROP_MENU_ICON_STATE,
+
+       PROP_LAST
+};
+
+static GParamSpec* NoJSViewProperties[PROP_LAST]={ 0, };
+
+/* Private structure - access only by public API if needed */
+#define NOJS_VIEW_GET_PRIVATE(obj) \
+       (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_NOJS_VIEW, NoJSViewPrivate))
+
+struct _NoJSViewPrivate
+{
+       /* Extension related */
+       NoJS                            *manager;
+       MidoriBrowser           *browser;
+       MidoriView                      *view;
+
+       GtkWidget                       *menu;
+       gboolean                        menuPolicyWasChanged;
+       NoJSMenuIconState       menuIconState;
+
+       GSList                          *resourceURIs;
+};
+
+/* IMPLEMENTATION: Private variables and methods */
+
+/* Preferences of this extension should be opened */
+static void _nojs_view_on_preferences_response(GtkWidget* inDialog,
+                                                                                               gint inResponse,
+                                                                                               gpointer *inUserData)
+{
+       gtk_widget_destroy(inDialog);
+}
+
+static void _nojs_view_on_open_preferences(NoJSView *self, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+
+       NoJSViewPrivate         *priv=self->priv;
+
+       /* Show preferences window */
+       GtkWidget* dialog;
+
+       dialog=nojs_preferences_new(priv->manager);
+       gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+       g_signal_connect(dialog, "response", G_CALLBACK (_nojs_view_on_preferences_response), self);
+       gtk_widget_show_all(dialog);
+}
+
+/* Selection was done in menu */
+static void _nojs_view_on_menu_selection_done(NoJSView *self, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+
+       NoJSViewPrivate         *priv=self->priv;
+
+       /* Check if any policy was changed and reload page */
+       if(priv->menuPolicyWasChanged!=FALSE)
+       {
+               /* Reset flag that any policy was changed */
+               priv->menuPolicyWasChanged=FALSE;
+
+               /* Reload page */
+               midori_view_reload(priv->view, FALSE);
+g_message("%s: Reloading page %s as policy has changed", __func__, midori_view_get_display_uri(priv->view));
+       }
+}
+
+/* Destroy menu */
+static void _nojs_view_destroy_menu(NoJSView *self)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(self->priv->menu!=NULL);
+
+       NoJSViewPrivate         *priv=self->priv;
+
+       /* Empty menu and list of domains added to menu */
+       gtk_widget_destroy(priv->menu);
+       priv->menu=NULL;
+
+       /* Reset menu icon to default state */
+       priv->menuIconState=NOJS_MENU_ICON_STATE_UNDETERMINED;
+       g_object_notify_by_pspec(G_OBJECT(self), NoJSViewProperties[PROP_MENU_ICON_STATE]);
+}
+
+/* Create empty menu */
+static void _nojs_view_create_empty_menu(NoJSView *self)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(self->priv->menu==NULL);
+
+       NoJSViewPrivate         *priv=self->priv;
+       GtkWidget                       *item;
+
+       /* Create new menu and set up default items */
+       priv->menu=gtk_menu_new();
+
+       item=gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
+       g_signal_connect_swapped(item, "activate", G_CALLBACK(_nojs_view_on_open_preferences), self);
+       gtk_menu_shell_prepend(GTK_MENU_SHELL(priv->menu), item);
+       gtk_widget_show_all(item);
+
+       /* Reset flag that any policy was changed */
+       priv->menuPolicyWasChanged=FALSE;
+
+       /* Reset menu icon to default state */
+       priv->menuIconState=NOJS_MENU_ICON_STATE_UNDETERMINED;
+       g_object_notify_by_pspec(G_OBJECT(self), NoJSViewProperties[PROP_MENU_ICON_STATE]);
+
+       /* Connect signal to menu */
+       g_signal_connect_swapped(priv->menu, "selection-done", G_CALLBACK(_nojs_view_on_menu_selection_done), self);
+}
+
+/* Change visibility state of menu item for a domain depending on policy */
+static gboolean _nojs_view_menu_item_change_policy(NoJSView *self, const gchar *inDomain, NoJSPolicy inPolicy)
+{
+       g_return_val_if_fail(NOJS_IS_VIEW(self), FALSE);
+       g_return_val_if_fail(inDomain, FALSE);
+
+       NoJSViewPrivate         *priv=self->priv;
+       GList                           *items, *iter;
+       gboolean                        updated;
+
+       /* Handle accept-for-session like accept when showing or hiding menu items */
+       if(inPolicy==NOJS_POLICY_ACCEPT_TEMPORARILY) inPolicy=NOJS_POLICY_ACCEPT;
+
+       /* Update menu items */
+       updated=FALSE;
+       items=gtk_container_get_children(GTK_CONTAINER(priv->menu));
+       for(iter=items; iter; iter=iter->next)
+       {
+               /* Only check and update menu items (not separators and so on) */
+               if(GTK_IS_MENU_ITEM(iter->data))
+               {
+                       GtkMenuItem             *item=GTK_MENU_ITEM(iter->data);
+                       const gchar             *itemDomain;
+                       NoJSPolicy              itemPolicy;
+
+                       itemDomain=(const gchar*)g_object_get_data(G_OBJECT(item), "domain");
+                       itemPolicy=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "policy"));
+
+                       /* Handle accept-for-session like accept when showing or hiding menu items */
+                       if(itemPolicy==NOJS_POLICY_ACCEPT_TEMPORARILY) itemPolicy=NOJS_POLICY_ACCEPT;
+
+                       /* If menu item has "domain"-data update its visibility state
+                        * depending on matching policy
+                        */
+                       if(g_strcmp0(itemDomain, inDomain)==0)
+                       {
+                               if(itemPolicy==inPolicy) gtk_widget_hide(GTK_WIDGET(item));
+                                       else gtk_widget_show_all(GTK_WIDGET(item));
+
+                               /* Set flag that at least one menu item was updated */
+                               updated=TRUE;
+                       }
+               }
+       }
+       g_list_free(items);
+
+       /* Return flag indicating if at least one menu item was updated */
+       return(updated);
+}
+
+/* A menu item was selected */
+static void _nojs_view_on_menu_item_activate(NoJSView *self, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(GTK_IS_MENU_ITEM(inUserData));
+
+       NoJSViewPrivate                 *priv=self->priv;
+       GtkMenuItem                             *item=GTK_MENU_ITEM(inUserData);
+       const gchar                             *domain;
+       NoJSPolicy                              policy;
+
+       /* Get domain and policy to set */
+       domain=(const gchar*)g_object_get_data(G_OBJECT(item), "domain");
+       policy=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "policy"));
+       g_return_if_fail(domain);
+       g_return_if_fail(policy>=NOJS_POLICY_ACCEPT && policy<=NOJS_POLICY_BLOCK);
+
+       /* Set policy for domain and update menu items */
+       _nojs_view_menu_item_change_policy(self, domain, policy);
+       nojs_set_policy(priv->manager, domain, policy);
+
+       /* Set flag that a policy was changed */
+       priv->menuPolicyWasChanged=TRUE;
+}
+
+/* Add site to menu */
+static void _nojs_view_add_site_to_menu(NoJSView *self, const gchar *inDomain, NoJSPolicy inPolicy)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(inDomain);
+
+       NoJSViewPrivate         *priv=self->priv;
+       GtkWidget                       *item;
+       gchar                           *itemLabel;
+       GtkWidget                       *itemImage;
+       static gint                     INSERT_POSITION=1;
+       NoJSMenuIconState       newMenuIconState;
+
+       /* Create menu object if not available */
+       if(!priv->menu) _nojs_view_create_empty_menu(self);
+
+       /* Check if domain was already added to menu. If it exists just update it. */
+       if(_nojs_view_menu_item_change_policy(self, inDomain, inPolicy)==TRUE) return;
+
+       /* Add menu item(s) for domain */
+       itemLabel=g_strdup_printf(_("Deny %s"), inDomain);
+       item=gtk_image_menu_item_new_with_label(itemLabel);
+       itemImage=gtk_image_new_from_stock (GTK_STOCK_NO, GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
+       gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
+       gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
+       if(inPolicy!=NOJS_POLICY_BLOCK) gtk_widget_show_all(item);
+       g_object_set_data_full(G_OBJECT(item), "domain", g_strdup(inDomain), (GDestroyNotify)g_free);
+       g_object_set_data(G_OBJECT(item), "policy", GINT_TO_POINTER(NOJS_POLICY_BLOCK));
+       g_signal_connect_swapped(item, "activate", G_CALLBACK(_nojs_view_on_menu_item_activate), self);
+       g_free(itemLabel);
+
+       itemLabel=g_strdup_printf(_("Allow %s"), inDomain);
+       item=gtk_image_menu_item_new_with_label(itemLabel);
+       itemImage=gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
+       gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
+       gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
+       if(inPolicy!=NOJS_POLICY_ACCEPT && inPolicy!=NOJS_POLICY_ACCEPT_TEMPORARILY) gtk_widget_show_all(item);
+       g_object_set_data_full(G_OBJECT(item), "domain", g_strdup(inDomain), (GDestroyNotify)g_free);
+       g_object_set_data(G_OBJECT(item), "policy", GINT_TO_POINTER(NOJS_POLICY_ACCEPT));
+       g_signal_connect_swapped(item, "activate", G_CALLBACK(_nojs_view_on_menu_item_activate), self);
+       g_free(itemLabel);
+
+       itemLabel=g_strdup_printf(_("Allow %s this session"), inDomain);
+       item=gtk_image_menu_item_new_with_label(itemLabel);
+       itemImage=gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
+       gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
+       gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
+       if(inPolicy!=NOJS_POLICY_ACCEPT && inPolicy!=NOJS_POLICY_ACCEPT_TEMPORARILY) gtk_widget_show_all(item);
+       g_object_set_data_full(G_OBJECT(item), "domain", g_strdup(inDomain), (GDestroyNotify)g_free);
+       g_object_set_data(G_OBJECT(item), "policy", GINT_TO_POINTER(NOJS_POLICY_ACCEPT_TEMPORARILY));
+       g_signal_connect_swapped(item, "activate", G_CALLBACK(_nojs_view_on_menu_item_activate), self);
+       g_free(itemLabel);
+
+       /* Add seperator to seperate actions for this domain from the other domains */
+       item=gtk_separator_menu_item_new();
+       gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
+       gtk_widget_show_all(item);
+
+       /* Determine state of status icon */
+       if(priv->menuIconState!=NOJS_MENU_ICON_STATE_MIXED)
+       {
+               switch(inPolicy)
+               {
+                       case NOJS_POLICY_ACCEPT:
+                       case NOJS_POLICY_ACCEPT_TEMPORARILY:
+                               newMenuIconState=NOJS_MENU_ICON_STATE_ALLOWED;
+                               break;
+
+                       case NOJS_POLICY_BLOCK:
+                               newMenuIconState=NOJS_MENU_ICON_STATE_DENIED;
+                               break;
+
+                       default:
+                               newMenuIconState=NOJS_MENU_ICON_STATE_MIXED;
+                               break;
+               }
+
+               if(priv->menuIconState==NOJS_MENU_ICON_STATE_UNDETERMINED ||
+                       priv->menuIconState!=newMenuIconState)
+               {
+                       priv->menuIconState=newMenuIconState;
+                       g_object_notify_by_pspec(G_OBJECT(self), NoJSViewProperties[PROP_MENU_ICON_STATE]);
+               }
+       }
+}
+
+/* Status of loading a site has changed */
+static void _nojs_view_on_load_status_changed(NoJSView *self, GParamSpec *inSpec, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(WEBKIT_IS_WEB_VIEW(inUserData));
+
+       NoJSViewPrivate                 *priv=self->priv;
+       WebKitWebView                   *webkitView=WEBKIT_WEB_VIEW(inUserData);
+       WebKitWebSettings               *settings=webkit_web_view_get_settings(webkitView);
+       WebKitLoadStatus                status;
+       SoupURI                                 *uri;
+
+       /* Get URI of document loading/loaded */
+       uri=soup_uri_new(webkit_web_view_get_uri(webkitView));
+
+       /* Check load status */ 
+       status=webkit_web_view_get_load_status(webkitView);
+
+       /* Check if a view was emptied, e.g. for a new document going to be loaded soon */
+       if(status==WEBKIT_LOAD_PROVISIONAL)
+       {
+               /* Create a new empty menu */
+               _nojs_view_destroy_menu(self);
+               _nojs_view_create_empty_menu(self);
+
+               /* Free list of resource URIs, that's the list of URIs for all resources
+                * of a page
+                */
+               if(priv->resourceURIs)
+               {
+                       g_slist_free_full(priv->resourceURIs, (GDestroyNotify)g_free);
+                       priv->resourceURIs=NULL;
+               }
+       }
+
+       /* Check if document loading is going to start. Do not check special pages. */
+       if(status==WEBKIT_LOAD_COMMITTED &&
+               uri &&
+               uri->scheme &&
+               g_strcmp0(uri->scheme, "about")!=0)
+       {
+               /* Check if domain is black-listed or white-listed and enable or
+                * disable javascript accordingly. But if settings match already
+                * the state it should get do not set it again to avoid reloads of page.
+                */
+               gchar                           *domain;
+               NoJSPolicy                      policy;
+               gboolean                        currentScriptsEnabled;
+               gboolean                        newScriptsEnabled;
+
+               domain=nojs_get_domain(priv->manager, uri);
+               policy=nojs_get_policy(priv->manager, uri);
+               if(policy==NOJS_POLICY_UNDETERMINED)
+               {
+                       policy=nojs_get_policy_for_unknown_domain(priv->manager);
+                       // TODO: Show nick_name of policy (enum) to use in warning
+                       g_warning("Got invalid policy. Using default policy for unknown domains.");
+               }
+
+               newScriptsEnabled=(policy==NOJS_POLICY_BLOCK ? FALSE : TRUE);
+               g_object_get(G_OBJECT(settings), "enable-scripts", &currentScriptsEnabled, NULL);
+
+               if(newScriptsEnabled!=currentScriptsEnabled)
+               {
+                       g_object_set(G_OBJECT(settings), "enable-scripts", newScriptsEnabled, NULL);
+                       // TODO: Set uri also to ensure this uri is going to be reloaded
+               }
+
+               if(domain)
+               {
+                       _nojs_view_add_site_to_menu(self, domain, policy);
+                       g_free(domain);
+               }
+       }
+
+       /* Free allocated resources */
+       if(uri) soup_uri_free(uri);
+}
+
+/* A request is going to sent */
+static void _nojs_view_on_resource_request_starting(NoJSView *self,
+                                                                                                               WebKitWebFrame *inFrame,
+                                                                                                               WebKitWebResource *inResource,
+                                                                                                               WebKitNetworkRequest *inRequest,
+                                                                                                               WebKitNetworkResponse *inResponse,
+                                                                                                               gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+
+       NoJSViewPrivate                 *priv=self->priv;
+       SoupMessage                             *message;
+       SoupURI                                 *uri;
+       gchar                                   *uriText;
+
+       /* Remember resource URIs requesting */
+       message=(inRequest ? webkit_network_request_get_message(inRequest) : NULL);
+       if(message)
+       {
+               uri=soup_message_get_uri(message);
+               if(uri)
+               {
+                       uriText=soup_uri_to_string(uri, FALSE);
+                       priv->resourceURIs=g_slist_prepend(priv->resourceURIs, uriText);
+               }
+       }
+
+       message=(inResponse ? webkit_network_response_get_message(inResponse) : NULL);
+       if(message)
+       {
+               uri=soup_message_get_uri(message);
+               if(uri)
+               {
+                       uriText=soup_uri_to_string(uri, FALSE);
+                       priv->resourceURIs=g_slist_prepend(priv->resourceURIs, uriText);
+               }
+       }
+}
+
+/* A policy has changed */
+static void _nojs_view_on_policy_changed(NoJSView *self, gchar *inDomain, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(inDomain);
+
+       NoJSViewPrivate         *priv=self->priv;
+       GList                           *items, *iter;
+       gboolean                        reloaded;
+
+       /* Check if the policy of a domain has changed this view has referenced resources to */
+       reloaded=FALSE;
+       items=gtk_container_get_children(GTK_CONTAINER(priv->menu));
+       for(iter=items; reloaded==FALSE && iter; iter=iter->next)
+       {
+               if(GTK_IS_MENU_ITEM(iter->data))
+               {
+                       const gchar             *itemDomain;
+
+                       /* Check if domain matches menu item */
+                       itemDomain=(const gchar*)g_object_get_data(G_OBJECT(iter->data), "domain");
+                       if(g_strcmp0(itemDomain, inDomain)==0)
+                       {
+                               /* Found domain in our menu so reload page */
+                               midori_view_reload(priv->view, FALSE);
+                               reloaded=TRUE;
+                       }
+               }
+       }
+       g_list_free(items);
+}
+
+/* A javascript URI is going to loaded or blocked */
+static void _nojs_view_on_uri_load_policy_status(NoJSView *self, gchar *inURI, NoJSPolicy inPolicy, gpointer inUserData)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+
+       NoJSViewPrivate         *priv=self->priv;
+       GSList                          *iter;
+       gchar                           *checkURI;
+
+       /* Check if uri (accepted or blocked) might be one of ours */
+       for(iter=priv->resourceURIs; iter; iter=iter->next)
+       {
+               checkURI=(gchar*)iter->data;
+               if(g_strcmp0(checkURI, inURI)==0)
+               {
+                       SoupURI         *uri;
+                       gchar           *domain;
+
+                       uri=soup_uri_new(inURI);
+                       domain=nojs_get_domain(priv->manager, uri);
+                       if(domain)
+                       {
+                               _nojs_view_add_site_to_menu(self, domain, inPolicy);
+                               g_free(domain);
+                       }
+
+                       soup_uri_free(uri);
+                       break;
+               }
+       }
+}
+
+/* Property "view" has changed */
+static void _nojs_view_on_view_changed(NoJSView *self, MidoriView *inView)
+{
+       NoJSViewPrivate         *priv=self->priv;
+       WebKitWebView           *webkitView;
+
+       /* Disconnect signal on old view */
+       if(priv->view)
+       {
+               webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(priv->view));
+               g_signal_handlers_disconnect_by_data(webkitView, self);
+               g_object_set_data(G_OBJECT(priv->view), "nojs-view-instance", NULL);
+               g_object_unref(priv->view);
+               priv->view=NULL;
+       }
+
+       /* Set new view if valid pointer */
+       if(!inView) return;
+
+       priv->view=g_object_ref(inView);
+       g_object_set_data(G_OBJECT(priv->view), "nojs-view-instance", self);
+
+       /* Listen to changes of load-status in view */
+       webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(priv->view));
+       g_signal_connect_swapped(webkitView, "notify::load-status", G_CALLBACK(_nojs_view_on_load_status_changed), self);
+       g_signal_connect_swapped(webkitView, "resource-request-starting", G_CALLBACK(_nojs_view_on_resource_request_starting), self);
+
+       /* Create empty menu */
+       _nojs_view_destroy_menu(self);
+       _nojs_view_create_empty_menu(self);
+
+       /* Release list of resource URIs */
+       if(priv->resourceURIs)
+       {
+               g_slist_free_full(priv->resourceURIs, (GDestroyNotify)g_free);
+               priv->resourceURIs=NULL;
+       }
+}
+
+/* This extension is going to be deactivated */
+static void _nojs_view_on_extension_deactivated(NoJSView *self, MidoriExtension *inExtension)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+
+       /* Dispose allocated resources by unreferencing ourselve */
+       g_object_unref(self);
+}
+
+/* Property "manager" has changed */
+static void _nojs_view_on_manager_changed(NoJSView *self, NoJS *inNoJS)
+{
+       g_return_if_fail(NOJS_IS_VIEW(self));
+       g_return_if_fail(!inNoJS || IS_NOJS(inNoJS));
+
+       NoJSViewPrivate         *priv=self->priv;
+       MidoriExtension         *extension;
+
+       /* Release reference to old manager and clean up */
+       if(priv->manager)
+       {
+               g_object_get(priv->manager, "extension", &extension, NULL);
+               g_signal_handlers_disconnect_by_data(extension, self);
+               g_object_unref(extension);
+
+               g_signal_handlers_disconnect_by_data(priv->manager, self);
+               g_object_unref(priv->manager);
+               priv->manager=NULL;
+       }
+
+       /* Set new view if valid pointer */
+       if(!inNoJS) return;
+
+       priv->manager=g_object_ref(inNoJS);
+
+       /* Connect signals to manager */
+       g_signal_connect_swapped(priv->manager, "uri-load-policy-status", G_CALLBACK(_nojs_view_on_uri_load_policy_status), self);
+       g_signal_connect_swapped(priv->manager, "policy-changed", G_CALLBACK(_nojs_view_on_policy_changed), self);
+
+       /* Connect signal to get noticed when extension is going to be deactivated
+        * to release all references to GObjects
+        */
+       g_object_get(priv->manager, "extension", &extension, NULL);
+       g_signal_connect_swapped(extension, "deactivate", G_CALLBACK(_nojs_view_on_extension_deactivated), self);
+       g_object_unref(extension);
+}
+
+/* IMPLEMENTATION: GObject */
+
+/* Finalize this object */
+static void nojs_view_finalize(GObject *inObject)
+{
+       NoJSView                                *self=NOJS_VIEW(inObject);
+       NoJSViewPrivate                 *priv=self->priv;
+
+       /* Dispose allocated resources */
+       if(priv->manager)
+       {
+               MidoriExtension         *extension;
+
+               g_object_get(priv->manager, "extension", &extension, NULL);
+               g_signal_handlers_disconnect_by_data(extension, self);
+               g_object_unref(extension);
+
+               g_signal_handlers_disconnect_by_data(priv->manager, self);
+               g_object_unref(priv->manager);
+               priv->manager=NULL;
+       }
+
+       if(priv->browser)
+       {
+               g_object_unref(priv->browser);
+               priv->browser=NULL;
+       }
+
+       if(priv->view)
+       {
+               _nojs_view_on_view_changed(self, NULL);
+       }
+
+       if(priv->menu)
+       {
+               gtk_widget_destroy(priv->menu);
+               priv->menu=NULL;
+       }
+
+       if(priv->resourceURIs)
+       {
+               g_slist_free_full(priv->resourceURIs, (GDestroyNotify)g_free);
+               priv->resourceURIs=NULL;
+       }
+
+       /* Call parent's class finalize method */
+       G_OBJECT_CLASS(nojs_view_parent_class)->finalize(inObject);
+}
+
+/* Set/get properties */
+static void nojs_view_set_property(GObject *inObject,
+                                                                       guint inPropID,
+                                                                       const GValue *inValue,
+                                                                       GParamSpec *inSpec)
+{
+       NoJSView                *self=NOJS_VIEW(inObject);
+
+       switch(inPropID)
+       {
+               /* Construct-only properties */
+               case PROP_MANAGER:
+                       _nojs_view_on_manager_changed(self, NOJS(g_value_get_object(inValue)));
+                       break;
+
+               case PROP_BROWSER:
+                       if(self->priv->browser) g_object_unref(self->priv->browser);
+                       self->priv->browser=g_object_ref(g_value_get_object(inValue));
+                       break;
+
+               case PROP_VIEW:
+                       _nojs_view_on_view_changed(self, MIDORI_VIEW(g_value_get_object(inValue)));
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+static void nojs_view_get_property(GObject *inObject,
+                                                                       guint inPropID,
+                                                                       GValue *outValue,
+                                                                       GParamSpec *inSpec)
+{
+       NoJSView                *self=NOJS_VIEW(inObject);
+
+       switch(inPropID)
+       {
+               case PROP_MANAGER:
+                       g_value_set_object(outValue, self->priv->manager);
+                       break;
+
+               case PROP_BROWSER:
+                       g_value_set_object(outValue, self->priv->browser);
+                       break;
+
+               case PROP_VIEW:
+                       g_value_set_object(outValue, self->priv->view);
+                       break;
+
+               case PROP_MENU_ICON_STATE:
+                       g_value_set_enum(outValue, self->priv->menuIconState);
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+/* Class initialization
+ * Override functions in parent classes and define properties and signals
+ */
+static void nojs_view_class_init(NoJSViewClass *klass)
+{
+       GObjectClass            *gobjectClass=G_OBJECT_CLASS(klass);
+
+       /* Override functions */
+       gobjectClass->finalize=nojs_view_finalize;
+       gobjectClass->set_property=nojs_view_set_property;
+       gobjectClass->get_property=nojs_view_get_property;
+
+       /* Set up private structure */
+       g_type_class_add_private(klass, sizeof(NoJSViewPrivate));
+
+       /* Define properties */
+       NoJSViewProperties[PROP_MANAGER]=
+               g_param_spec_object("manager",
+                                                               _("Manager instance"),
+                                                               _("Instance to global NoJS manager"),
+                                                               TYPE_NOJS,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       NoJSViewProperties[PROP_BROWSER]=
+               g_param_spec_object("browser",
+                                                               _("Browser window"),
+                                                               _("The Midori browser instance this view belongs to"),
+                                                               MIDORI_TYPE_BROWSER,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       NoJSViewProperties[PROP_VIEW]=
+               g_param_spec_object("view",
+                                                               _("View"),
+                                                               _("The Midori view instance this view belongs to"),
+                                                               MIDORI_TYPE_VIEW,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       NoJSViewProperties[PROP_MENU_ICON_STATE]=
+               g_param_spec_enum("menu-icon-state",
+                                                               _("Menu icon state"),
+                                                               _("State of menu icon to show in status bar"),
+                                                               NOJS_TYPE_MENU_ICON_STATE,
+                                                               NOJS_MENU_ICON_STATE_UNDETERMINED,
+                                                               G_PARAM_READABLE);
+
+       g_object_class_install_properties(gobjectClass, PROP_LAST, NoJSViewProperties);
+}
+
+/* Object initialization
+ * Create private structure and set up default values
+ */
+static void nojs_view_init(NoJSView *self)
+{
+       NoJSViewPrivate         *priv;
+
+       priv=self->priv=NOJS_VIEW_GET_PRIVATE(self);
+
+       /* Set up default values */
+       priv->manager=NULL;
+       priv->browser=NULL;
+       priv->view=NULL;
+
+       priv->menu=NULL;
+       priv->menuPolicyWasChanged=FALSE;
+       priv->menuIconState=NOJS_MENU_ICON_STATE_UNDETERMINED;
+
+       priv->resourceURIs=NULL;
+
+       /* Create empty menu */
+       _nojs_view_create_empty_menu(self);
+}
+
+/* Implementation: Public API */
+
+/* Create new object */
+NoJSView* nojs_view_new(NoJS *inNoJS, MidoriBrowser *inBrowser, MidoriView *inView)
+{
+       return(g_object_new(TYPE_NOJS_VIEW,
+                                                       "manager", inNoJS,
+                                                       "browser", inBrowser,
+                                                       "view", inView,
+                                                       NULL));
+}
+
+/* Get menu widget for this view */
+GtkMenu* nojs_view_get_menu(NoJSView *self)
+{
+       g_return_val_if_fail(NOJS_IS_VIEW(self), NULL);
+
+       return(GTK_MENU(self->priv->menu));
+}
+
+/* Get image used for menu icon in status bar */
+NoJSMenuIconState nojs_view_get_menu_icon_state(NoJSView *self)
+{
+       g_return_val_if_fail(NOJS_IS_VIEW(self), NOJS_MENU_ICON_STATE_UNDETERMINED);
+
+       return(self->priv->menuIconState);
+}
+
+/************************************************************************************/
+
+/* Implementation: Enumeration */
+GType nojs_menu_icon_state_get_type(void)
+{
+       static volatile gsize   g_define_type_id__volatile=0;
+
+       if(g_once_init_enter(&g_define_type_id__volatile))
+       {
+               static const GEnumValue values[]=
+               {
+                       { NOJS_MENU_ICON_STATE_UNDETERMINED, "NOJS_MENU_ICON_STATE_UNDETERMINED", N_("Undetermined") },
+                       { NOJS_MENU_ICON_STATE_ALLOWED, "NOJS_MENU_ICON_STATE_ALLOWED", N_("Allowed") },
+                       { NOJS_MENU_ICON_STATE_MIXED, "NOJS_MENU_ICON_STATE_MIXED", N_("Mixed") },
+                       { NOJS_MENU_ICON_STATE_DENIED, "NOJS_MENU_ICON_STATE_DENIED", N_("Denied") },
+                       { 0, NULL, NULL }
+               };
+
+               GType   g_define_type_id=g_enum_register_static(g_intern_static_string("NoJSMenuIconState"), values);
+               g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
+       }
+
+       return(g_define_type_id__volatile);
+}
diff --git a/extensions/nojs/nojs-view.h b/extensions/nojs/nojs-view.h
new file mode 100644 (file)
index 0000000..d88d40d
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 __NOJS_VIEW__
+#define __NOJS_VIEW__
+
+#include "config.h"
+#include "nojs.h"
+#include <midori/midori.h>
+
+G_BEGIN_DECLS
+
+/* NoJS view enums */
+typedef enum
+{
+       NOJS_MENU_ICON_STATE_UNDETERMINED,
+       NOJS_MENU_ICON_STATE_ALLOWED,
+       NOJS_MENU_ICON_STATE_MIXED,
+       NOJS_MENU_ICON_STATE_DENIED
+} NoJSMenuIconState;
+
+/* NoJS view object */
+#define TYPE_NOJS_VIEW                         (nojs_view_get_type())
+#define NOJS_VIEW(obj)                         (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_NOJS_VIEW, NoJSView))
+#define NOJS_IS_VIEW(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_NOJS_VIEW))
+#define NOJS_VIEW_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_NOJS_VIEW, NoJSViewClass))
+#define NOJS_IS_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_NOJS_VIEW))
+#define NOJS_VIEW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_NOJS_VIEW, NoJSViewClass))
+
+typedef struct _NoJSView                       NoJSView;
+typedef struct _NoJSViewClass          NoJSViewClass;
+typedef struct _NoJSViewPrivate                NoJSViewPrivate;
+
+struct _NoJSView
+{
+       /* Parent instance */
+       GObject                         parent_instance;
+
+       /* Private structure */
+       NoJSViewPrivate         *priv;
+};
+
+struct _NoJSViewClass
+{
+       /* Parent class */
+       GObjectClass            parent_class;
+};
+
+/* Public API */
+GType nojs_view_get_type(void);
+
+NoJSView* nojs_view_new(NoJS *inNoJS, MidoriBrowser *inBrowser, MidoriView *inView);
+
+GtkMenu* nojs_view_get_menu(NoJSView *self);
+NoJSMenuIconState nojs_view_get_menu_icon_state(NoJSView *self);
+
+/* Enumeration */
+GType nojs_menu_icon_state_get_type(void) G_GNUC_CONST;
+#define NOJS_TYPE_MENU_ICON_STATE      (nojs_menu_icon_state_get_type())
+
+G_END_DECLS
+
+#endif /* __NOJS_VIEW__ */
diff --git a/extensions/nojs/nojs.c b/extensions/nojs/nojs.c
new file mode 100644 (file)
index 0000000..7e6b39f
--- /dev/null
@@ -0,0 +1,1044 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 "nojs.h"
+#include "nojs-view.h"
+
+#include <errno.h>
+
+/* Define this class in GObject system */
+G_DEFINE_TYPE(NoJS,
+                               nojs,
+                               G_TYPE_OBJECT)
+
+/* Properties */
+enum
+{
+       PROP_0,
+
+       PROP_EXTENSION,
+       PROP_APPLICATION,
+
+       PROP_DATABASE,
+       PROP_DATABASE_FILENAME,
+       PROP_ALLOW_LOCAL_PAGES,
+       PROP_ONLY_SECOND_LEVEL,
+       PROP_UNKNOWN_DOMAIN_POLICY,
+
+       PROP_LAST
+};
+
+static GParamSpec* NoJSProperties[PROP_LAST]={ 0, };
+
+/* Signals */
+enum
+{
+       URI_LOAD_POLICY_STATUS,
+       POLICY_CHANGED,
+
+       SIGNAL_LAST
+};
+
+static guint NoJSSignals[SIGNAL_LAST]={ 0, };
+
+/* Private structure - access only by public API if needed */
+#define NOJS_GET_PRIVATE(obj) \
+       (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_NOJS, NoJSPrivate))
+
+struct _NoJSPrivate
+{
+       /* Extension related */
+       MidoriExtension                                 *extension;
+       MidoriApp                                               *application;
+       sqlite3                                                 *database;
+       gchar                                                   *databaseFilename;
+       gboolean                                                allowLocalPages;
+       gboolean                                                checkOnlySecondLevel;
+       NoJSPolicy                                              unknownDomainPolicy;
+
+       guint                                                   requestStartedSignalID;
+};
+
+/* Taken from http://www.w3.org/html/wg/drafts/html/master/scripting-1.html#scriptingLanguages
+ * A list of javascript mime types
+ */
+static const gchar*                            javascriptTypes[]=      {
+                                                                                                               "application/ecmascript",
+                                                                                                               "application/javascript",
+                                                                                                               "application/x-ecmascript",
+                                                                                                               "application/x-javascript",
+                                                                                                               "text/ecmascript",
+                                                                                                               "text/javascript",
+                                                                                                               "text/javascript1.0",
+                                                                                                               "text/javascript1.1",
+                                                                                                               "text/javascript1.2",
+                                                                                                               "text/javascript1.3",
+                                                                                                               "text/javascript1.4",
+                                                                                                               "text/javascript1.5",
+                                                                                                               "text/jscript",
+                                                                                                               "text/livescript",
+                                                                                                               "text/x-ecmascript",
+                                                                                                               "text/x-javascript",
+                                                                                                               NULL
+                                                                                                       };
+
+/* IMPLEMENTATION: Private variables and methods */
+
+/* Closure for: void (*closure)(NoJS *self, gchar *inURI, NoJSPolicy inPolicy) */
+static void _nojs_closure_VOID__STRING_ENUM(GClosure *inClosure,
+                                                                                       GValue *ioReturnValue G_GNUC_UNUSED,
+                                                                                       guint inNumberValues,
+                                                                                       const GValue *inValues,
+                                                                                       gpointer inInvocationHint G_GNUC_UNUSED,
+                                                                                       gpointer inMarshalData)
+{
+       typedef void (*GMarshalFunc_VOID__STRING_ENUM)(gpointer inObject, gpointer inArg1, gint inArg2, gpointer inUserData);
+
+       register GMarshalFunc_VOID__STRING_ENUM         callback;
+       register GCClosure                                                      *closure=(GCClosure*)inClosure;
+       register gpointer                                                       object, userData;
+
+       g_return_if_fail(inNumberValues==3);
+
+       if(G_CCLOSURE_SWAP_DATA(inClosure))
+       {
+               object=inClosure->data;
+               userData=g_value_peek_pointer(inValues+0);
+       }
+               else
+               {
+                       object=g_value_peek_pointer(inValues+0);
+                       userData=inClosure->data;
+               }
+
+       callback=(GMarshalFunc_VOID__STRING_ENUM)(inMarshalData ? inMarshalData : closure->callback);
+
+       callback(object,
+                               (gchar*)g_value_get_string(inValues+1),
+                               g_value_get_enum(inValues+2),
+                               userData);
+}
+
+/* Show common error dialog */
+static void _nojs_error(NoJS *self, const gchar *inReason)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(inReason);
+
+       GtkWidget               *dialog;
+
+       /* Show confirmation dialog for undetermined cookies */
+       dialog=gtk_message_dialog_new(NULL,
+                                                                       GTK_DIALOG_MODAL,
+                                                                       GTK_MESSAGE_ERROR,
+                                                                       GTK_BUTTONS_OK,
+                                                                       _("A fatal error occurred which prevents "
+                                                                         "the NoJS extension to continue. "
+                                                                         "You should disable it."));
+
+       gtk_window_set_title(GTK_WINDOW(dialog), _("Error in NoJS extension"));
+       gtk_window_set_icon_name(GTK_WINDOW (dialog), "midori");
+
+       gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+                                                                                               "%s:\n%s",
+                                                                                               _("Reason"),
+                                                                                               inReason);
+
+       gtk_dialog_run(GTK_DIALOG(dialog));
+
+       /* Free up allocated resources */
+       gtk_widget_destroy(dialog);
+}
+
+/* Open database containing policies for javascript sites.
+ * Create database and setup table structure if it does not exist yet.
+ */
+static void _nojs_open_database(NoJS *self)
+{
+       g_return_if_fail(IS_NOJS(self));
+
+       NoJSPrivate             *priv=self->priv;
+       const gchar             *configDir;
+       gchar                   *sql;
+       gchar                   *error=NULL;
+       gint                    success;
+
+       /* Close any open database */
+       if(priv->database)
+       {
+               priv->databaseFilename=NULL;
+
+               sqlite3_close(priv->database);
+               priv->database=NULL;
+
+               g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_DATABASE]);
+               g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_DATABASE_FILENAME]);
+       }
+
+       /* Build path to database file */
+       configDir=midori_extension_get_config_dir(priv->extension);
+       if(!configDir)
+               return;
+       
+       if(katze_mkdir_with_parents(configDir, 0700))
+       {
+               g_warning(_("Could not create configuration folder for extension: %s"), g_strerror(errno));
+
+               _nojs_error(self, _("Could not create configuration folder for extension."));
+               return;
+       }
+
+       /* Open database */
+       priv->databaseFilename=g_build_filename(configDir, NOJS_DATABASE, NULL);
+       success=sqlite3_open(priv->databaseFilename, &priv->database);
+       if(success!=SQLITE_OK)
+       {
+               g_warning(_("Could not open database of extension: %s"), sqlite3_errmsg(priv->database));
+
+               g_free(priv->databaseFilename);
+               priv->databaseFilename=NULL;
+
+               if(priv->database) sqlite3_close(priv->database);
+               priv->database=NULL;
+
+               _nojs_error(self, _("Could not open database of extension."));
+               return;
+       }
+
+       /* Create table structure if it does not exist */
+       success=sqlite3_exec(priv->database,
+                                                       "CREATE TABLE IF NOT EXISTS "
+                                                       "policies(site text, value integer);",
+                                                       NULL,
+                                                       NULL,
+                                                       &error);
+
+       if(success==SQLITE_OK)
+       {
+               success=sqlite3_exec(priv->database,
+                                                               "CREATE UNIQUE INDEX IF NOT EXISTS "
+                                                               "site ON policies (site);",
+                                                               NULL,
+                                                               NULL,
+                                                               &error);
+       }
+
+       if(success==SQLITE_OK)
+       {
+               success=sqlite3_exec(priv->database,
+                                                               "PRAGMA journal_mode=TRUNCATE;",
+                                                               NULL,
+                                                               NULL,
+                                                               &error);
+       }
+
+       if(success!=SQLITE_OK || error)
+       {
+               _nojs_error(self, _("Could not set up database structure of extension."));
+
+               if(error)
+               {
+                       g_critical(_("Failed to execute database statement: %s"), error);
+                       sqlite3_free(error);
+               }
+
+               g_free(priv->databaseFilename);
+               priv->databaseFilename=NULL;
+
+               sqlite3_close(priv->database);
+               priv->database=NULL;
+               return;
+       }
+
+       /* Delete all temporarily allowed sites */
+       sql=sqlite3_mprintf("DELETE FROM policies WHERE value=%d;", NOJS_POLICY_ACCEPT_TEMPORARILY);
+       success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
+       if(success!=SQLITE_OK) g_warning(_("SQL fails: %s"), error);
+       if(error) sqlite3_free(error);
+       sqlite3_free(sql);
+
+       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_DATABASE]);
+       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_DATABASE_FILENAME]);
+}
+
+/* A request through libsoup is going to start and http headers must be
+ * checked for content type
+ */
+static void _nojs_on_got_headers(NoJS *self, gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(SOUP_IS_MESSAGE(inUserData));
+
+       NoJSPrivate                             *priv=self->priv;
+       SoupMessage                             *message=SOUP_MESSAGE(inUserData);
+       SoupSession                             *session=webkit_get_default_session();
+       SoupMessageHeaders              *headers;
+       SoupMessageBody                 *body;
+       const gchar                             *contentType;
+       SoupURI                                 *uri;
+       gchar                                   *uriText;
+       NoJSPolicy                              policy;
+       gboolean                                isJS;
+       const gchar                             **iter;
+
+       /* Get headers from message to retrieve content type */
+       g_object_get(message, "response-headers", &headers, NULL);
+       if(!headers)
+       {
+               g_warning("Could not get headers from message to check for javascript.");
+               return;
+       }
+
+       /* Get content type of uri and check if it is a javascript resource */
+       contentType=soup_message_headers_get_content_type(headers, NULL);
+
+       isJS=FALSE;
+       iter=javascriptTypes;
+       while(*iter && !isJS)
+       {
+               isJS=(g_strcmp0(contentType, *iter)==0);
+               iter++;
+       }
+
+       if(!isJS) return;
+
+       /* The document being loaded is javascript so get URI from message,
+        * get policy for domain of URI and emit signal
+        */
+       uri=soup_message_get_uri(message);
+       policy=nojs_get_policy(self, uri);
+
+       if(policy==NOJS_POLICY_UNDETERMINED)
+       {
+               g_warning("Got invalid policy. Using default policy for unknown domains.");
+               policy=priv->unknownDomainPolicy;
+       }
+
+       uriText=soup_uri_to_string(uri, FALSE);
+
+       g_signal_emit(self, NoJSSignals[URI_LOAD_POLICY_STATUS], 0, uriText, policy==NOJS_POLICY_UNDETERMINED ? NOJS_POLICY_BLOCK : policy);
+
+       g_free(uriText);
+
+       /* Return here if policy is any type of accept */
+       if(policy!=NOJS_POLICY_UNDETERMINED && policy!=NOJS_POLICY_BLOCK) return;
+
+       /* Cancel this message */
+       soup_session_cancel_message(session, message, SOUP_STATUS_CANCELLED);
+
+       /* Discard any load data */
+       g_object_get(message, "response-body", &body, NULL);
+       if(body) soup_message_body_truncate(body);
+}
+
+static void _nojs_on_request_started(NoJS *self,
+                                                                               SoupMessage *inMessage,
+                                                                               SoupSocket *inSocket,
+                                                                               gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(SOUP_IS_MESSAGE(inMessage));
+
+       /* Connect to "got-headers" to cancel loading javascript documents early */
+       g_signal_connect_swapped(inMessage, "got-headers", G_CALLBACK(_nojs_on_got_headers), self);
+}
+
+/* The icon in statusbar was clicked */
+static void _nojs_on_statusbar_icon_clicked(MidoriBrowser *inBrowser, gpointer inUserData)
+{
+       g_return_if_fail(MIDORI_IS_BROWSER(inBrowser));
+
+       MidoriView              *activeView;
+       NoJSView                *view;
+       GtkMenu                 *menu;
+
+       /* Get current active midori view */
+       activeView=MIDORI_VIEW(midori_browser_get_current_tab(inBrowser));
+       g_return_if_fail(MIDORI_IS_VIEW(activeView));
+
+       /* Get NoJS view of current active midori view */
+       view=NOJS_VIEW(g_object_get_data(G_OBJECT(activeView), "nojs-view-instance"));
+       g_return_if_fail(NOJS_IS_VIEW(view));
+
+       /* Get menu of current view */
+       menu=nojs_view_get_menu(view);
+       g_return_if_fail(menu);
+
+       /* Show menu */
+       gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+}
+
+gchar* nojs_get_icon_path (const gchar* icon)
+{
+    gchar* nojs_dir = midori_paths_get_res_filename("nojs");
+    return g_build_filename (nojs_dir, icon, NULL);
+}
+
+/* Menu icon of a view has changed */
+static void _nojs_on_menu_icon_changed(MidoriBrowser *inBrowser, GParamSpec *inSpec, gpointer inUserData)
+{
+       g_return_if_fail(MIDORI_IS_BROWSER(inBrowser));
+       g_return_if_fail(NOJS_IS_VIEW(inUserData));
+
+       NoJSView                        *view=NOJS_VIEW(inUserData);
+       NoJSMenuIconState       menuIconState;
+       GtkWidget                       *statusbarIcon;
+       GtkWidget                       *buttonImage;
+       gchar                           *imageFilename;
+
+       /* Get icon in status bar of this browser */
+       statusbarIcon=GTK_WIDGET(g_object_get_data(G_OBJECT(inBrowser), "nojs-statusicon"));
+       g_return_if_fail(GTK_IS_WIDGET(statusbarIcon));
+
+       /* Get menu icon state of view */
+       menuIconState=nojs_view_get_menu_icon_state(view);
+
+       /* Create image for statusbar button */
+       imageFilename=NULL;
+       switch(menuIconState)
+       {
+               case NOJS_MENU_ICON_STATE_ALLOWED:
+                       imageFilename=nojs_get_icon_path("nojs-statusicon-allowed.png");
+                       break;
+
+               case NOJS_MENU_ICON_STATE_MIXED:
+                       imageFilename=nojs_get_icon_path("nojs-statusicon-mixed.png");
+                       break;
+
+               case NOJS_MENU_ICON_STATE_DENIED:
+               case NOJS_MENU_ICON_STATE_UNDETERMINED:
+                       imageFilename=nojs_get_icon_path("nojs-statusicon-denied.png");
+                       break;
+       }
+
+       buttonImage=gtk_image_new_from_file(imageFilename);
+       g_free(imageFilename);
+
+       /* Set image at statusbar button */
+       gtk_button_set_image(GTK_BUTTON(statusbarIcon), buttonImage);
+}
+
+/* A tab in browser was activated */
+static void _nojs_on_switch_tab(NoJS *self, MidoriView *inOldView, MidoriView *inNewView, gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(MIDORI_IS_BROWSER(inUserData));
+
+       MidoriBrowser           *browser=MIDORI_BROWSER(inUserData);
+       NoJSView                        *view;
+
+       /* Disconnect signal handlers from old view */
+       if(inOldView)
+       {
+               /* Get NoJS view of old view */
+               view=(NoJSView*)g_object_get_data(G_OBJECT(inOldView), "nojs-view-instance");
+               g_return_if_fail(NOJS_IS_VIEW(view));
+
+               /* Disconnect signal handlers */
+               g_signal_handlers_disconnect_by_func(view, G_CALLBACK(_nojs_on_menu_icon_changed), browser);
+       }
+
+       /* Get NoJS view of new view */
+       view=(NoJSView*)g_object_get_data(G_OBJECT(inNewView), "nojs-view-instance");
+       g_return_if_fail(NOJS_IS_VIEW(view));
+
+       /* Connect signals */
+       g_signal_connect_swapped(view, "notify::menu-icon-state", G_CALLBACK(_nojs_on_menu_icon_changed), browser);
+
+       /* Update menu icon*/
+       _nojs_on_menu_icon_changed(browser, NULL, view);
+}
+
+/* A tab of a browser was removed */
+static void _nojs_on_remove_tab(NoJS *self, MidoriView *inView, gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+
+       NoJSView                *view;
+
+       /* Get NoJS view of current active midori view */
+       view=NOJS_VIEW(g_object_get_data(G_OBJECT(inView), "nojs-view-instance"));
+       g_return_if_fail(NOJS_IS_VIEW(view));
+
+       g_object_unref(view);
+}
+
+/* A tab of a browser was added */
+static void _nojs_on_add_tab(NoJS *self, MidoriView *inView, gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(MIDORI_IS_BROWSER(inUserData));
+
+       /* Create nojs view and add to tab */
+       MidoriBrowser   *browser=MIDORI_BROWSER(inUserData);
+
+       nojs_view_new(self, browser, inView);
+}
+
+/* A browser window was added */
+static void _nojs_on_add_browser(NoJS *self, MidoriBrowser *inBrowser, gpointer inUserData)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(MIDORI_IS_BROWSER(inBrowser));
+
+       GList                   *tabs, *iter;
+       GtkWidget               *statusbar;
+       GtkWidget               *statusbarIcon;
+       MidoriView              *view;
+       NoJSView                *nojsView;
+
+       /* Set up all current available tabs in browser */
+       tabs=midori_browser_get_tabs(inBrowser);
+       for(iter=tabs; iter; iter=g_list_next(iter)) _nojs_on_add_tab(self, iter->data, inBrowser);
+       g_list_free(tabs);
+
+       /* Add status bar icon to browser */
+       g_object_get(inBrowser, "statusbar", &statusbar, NULL);
+       if(statusbar)
+       {
+               /* Create and set up status icon */
+               statusbarIcon=gtk_button_new();
+               gtk_button_set_relief(GTK_BUTTON(statusbarIcon), GTK_RELIEF_NONE);
+               gtk_widget_show_all(statusbarIcon);
+               gtk_box_pack_end(GTK_BOX(statusbar), statusbarIcon, FALSE, FALSE, 0);
+               g_object_set_data_full(G_OBJECT(inBrowser), "nojs-statusicon", g_object_ref(statusbarIcon), (GDestroyNotify)gtk_widget_destroy);
+
+               /* Connect signals */
+               g_signal_connect_swapped(statusbarIcon, "clicked", G_CALLBACK(_nojs_on_statusbar_icon_clicked), inBrowser);
+
+               /* Release our reference to statusbar and status icon */
+               g_object_unref(statusbarIcon);
+               g_object_unref(statusbar);
+
+               /* Update menu icon*/
+               view=MIDORI_VIEW(midori_browser_get_current_tab(inBrowser));
+               if(view)
+               {
+                       nojsView=(NoJSView*)g_object_get_data(G_OBJECT(view), "nojs-view-instance");
+                       if(nojsView) _nojs_on_menu_icon_changed(inBrowser, NULL, nojsView);
+               }
+       }
+
+       /* Listen to new tabs opened in browser */
+       g_signal_connect_swapped(inBrowser, "add-tab", G_CALLBACK(_nojs_on_add_tab), self);
+       g_signal_connect_swapped(inBrowser, "switch-tab", G_CALLBACK(_nojs_on_switch_tab), self);
+       g_signal_connect_swapped(inBrowser, "remove-tab", G_CALLBACK(_nojs_on_remove_tab), self);
+}
+
+/* Application property has changed */
+static void _nojs_on_application_changed(NoJS *self)
+{
+       g_return_if_fail(IS_NOJS(self));
+
+       NoJSPrivate             *priv=NOJS(self)->priv;
+       GList                   *browsers, *iter;
+
+       /* Set up all current open browser windows */
+       browsers=midori_app_get_browsers(priv->application);
+       for(iter=browsers; iter; iter=g_list_next(iter)) _nojs_on_add_browser(self, MIDORI_BROWSER(iter->data), priv->application);
+       g_list_free(browsers);
+
+       /* Listen to new browser windows opened */
+       g_signal_connect_swapped(priv->application, "add-browser", G_CALLBACK(_nojs_on_add_browser), self);
+
+       /* Notify about property change */
+       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_APPLICATION]);
+}
+
+/* IMPLEMENTATION: GObject */
+
+/* Finalize this object */
+static void nojs_finalize(GObject *inObject)
+{
+       NoJS                    *self=NOJS(inObject);
+       NoJSPrivate             *priv=self->priv;
+       GList                   *browsers, *browser;
+       GList                   *tabs, *tab;
+       WebKitWebView   *webkitView;
+       SoupSession             *session;
+
+       /* Dispose allocated resources */
+       session=webkit_get_default_session();
+       g_signal_handlers_disconnect_by_data(session, self);
+
+       if(priv->databaseFilename)
+       {
+               g_free(priv->databaseFilename);
+               priv->databaseFilename=NULL;
+       }
+
+       if(priv->database)
+       {
+               sqlite3_close(priv->database);
+               priv->database=NULL;
+       }
+
+       if(priv->application)
+       {
+               g_signal_handlers_disconnect_by_data(priv->application, self);
+
+               browsers=midori_app_get_browsers(priv->application);
+               for(browser=browsers; browser; browser=g_list_next(browser))
+               {
+                       g_signal_handlers_disconnect_by_data(browser->data, self);
+                       g_object_set_data(G_OBJECT(browser->data), "nojs-statusicon", NULL);
+
+                       tabs=midori_browser_get_tabs(MIDORI_BROWSER(browser->data));
+                       for(tab=tabs; tab; tab=g_list_next(tab))
+                       {
+                               g_signal_handlers_disconnect_by_data(tab->data, self);
+
+                               webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(MIDORI_VIEW(tab->data)));
+                               g_signal_handlers_disconnect_by_data(webkitView, self);
+                       }
+                       g_list_free(tabs);
+               }
+               g_list_free(browsers);
+
+               priv->application=NULL;
+       }
+
+       /* Call parent's class finalize method */
+       G_OBJECT_CLASS(nojs_parent_class)->finalize(inObject);
+}
+
+/* Set/get properties */
+static void nojs_set_property(GObject *inObject,
+                                                               guint inPropID,
+                                                               const GValue *inValue,
+                                                               GParamSpec *inSpec)
+{
+       NoJS            *self=NOJS(inObject);
+       
+       switch(inPropID)
+       {
+               /* Construct-only properties */
+               case PROP_EXTENSION:
+                       self->priv->extension=g_value_get_object(inValue);
+                       _nojs_open_database(self);
+                       break;
+
+               case PROP_APPLICATION:
+                       self->priv->application=g_value_get_object(inValue);
+                       _nojs_on_application_changed(self);
+                       break;
+
+               case PROP_ALLOW_LOCAL_PAGES:
+                       self->priv->allowLocalPages=g_value_get_boolean(inValue);
+                       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_LOCAL_PAGES]);
+                       break;
+
+               case PROP_ONLY_SECOND_LEVEL:
+                       self->priv->checkOnlySecondLevel=g_value_get_boolean(inValue);
+                       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ONLY_SECOND_LEVEL]);
+                       break;
+
+               case PROP_UNKNOWN_DOMAIN_POLICY:
+                       self->priv->unknownDomainPolicy=g_value_get_enum(inValue);
+                       g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_UNKNOWN_DOMAIN_POLICY]);
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+static void nojs_get_property(GObject *inObject,
+                                                               guint inPropID,
+                                                               GValue *outValue,
+                                                               GParamSpec *inSpec)
+{
+       NoJS            *self=NOJS(inObject);
+
+       switch(inPropID)
+       {
+               case PROP_EXTENSION:
+                       g_value_set_object(outValue, self->priv->extension);
+                       break;
+
+               case PROP_APPLICATION:
+                       g_value_set_object(outValue, self->priv->application);
+                       break;
+
+               case PROP_DATABASE:
+                       g_value_set_pointer(outValue, self->priv->database);
+                       break;
+
+               case PROP_DATABASE_FILENAME:
+                       g_value_set_string(outValue, self->priv->databaseFilename);
+                       break;
+
+               case PROP_ALLOW_LOCAL_PAGES:
+                       g_value_set_boolean(outValue, self->priv->allowLocalPages);
+                       break;
+
+               case PROP_ONLY_SECOND_LEVEL:
+                       g_value_set_boolean(outValue, self->priv->checkOnlySecondLevel);
+                       break;
+
+               case PROP_UNKNOWN_DOMAIN_POLICY:
+                       g_value_set_enum(outValue, self->priv->unknownDomainPolicy);
+                       break;
+
+               default:
+                       G_OBJECT_WARN_INVALID_PROPERTY_ID(inObject, inPropID, inSpec);
+                       break;
+       }
+}
+
+/* Class initialization
+ * Override functions in parent classes and define properties and signals
+ */
+static void nojs_class_init(NoJSClass *klass)
+{
+       GObjectClass            *gobjectClass=G_OBJECT_CLASS(klass);
+
+       /* Override functions */
+       gobjectClass->finalize=nojs_finalize;
+       gobjectClass->set_property=nojs_set_property;
+       gobjectClass->get_property=nojs_get_property;
+
+       /* Set up private structure */
+       g_type_class_add_private(klass, sizeof(NoJSPrivate));
+
+       /* Define properties */
+       NoJSProperties[PROP_EXTENSION]=
+               g_param_spec_object("extension",
+                                                               _("Extension instance"),
+                                                               _("The Midori extension instance for this extension"),
+                                                               MIDORI_TYPE_EXTENSION,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       NoJSProperties[PROP_APPLICATION]=
+               g_param_spec_object("application",
+                                                               _("Application instance"),
+                                                               _("The Midori application instance this extension belongs to"),
+                                                               MIDORI_TYPE_APP,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+       NoJSProperties[PROP_DATABASE]=
+               g_param_spec_pointer("database",
+                                                               _("Database instance"),
+                                                               _("Pointer to sqlite database instance used by this extension"),
+                                                               G_PARAM_READABLE);
+
+       NoJSProperties[PROP_DATABASE_FILENAME]=
+               g_param_spec_string("database-filename",
+                                                               _("Database path"),
+                                                               _("Path to sqlite database instance used by this extension"),
+                                                               NULL,
+                                                               G_PARAM_READABLE);
+
+       NoJSProperties[PROP_ALLOW_LOCAL_PAGES]=
+               g_param_spec_boolean("allow-local-pages",
+                                                               _("Allow local pages"),
+                                                               _("Allow scripts to run on local (file://) pages"),
+                                                               TRUE,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+
+       NoJSProperties[PROP_ONLY_SECOND_LEVEL]=
+               g_param_spec_boolean("only-second-level",
+                                                               _("Only second level"),
+                                                               _("Reduce each domain to its second-level (e.g. www.example.org to example.org) for comparison"),
+                                                               TRUE,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+
+       NoJSProperties[PROP_UNKNOWN_DOMAIN_POLICY]=
+               g_param_spec_enum("unknown-domain-policy",
+                                                               _("Unknown domain policy"),
+                                                               _("Policy to use for unknown domains"),
+                                                               NOJS_TYPE_POLICY,
+                                                               NOJS_POLICY_BLOCK,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+
+       g_object_class_install_properties(gobjectClass, PROP_LAST, NoJSProperties);
+
+       /* Define signals */
+
+       /* Why does this signal exist?
+        * 
+        * The problem I faced when developing this extension was
+        * that I needed to cancel a SoupMessage as soon as possible
+        * (when http headers were received).
+        * I tried to connect to signal "resource-response-received"
+        * of WebKitWebView but the SoupMessage instance was not
+        * exactly the same which were sent or received by SoupSession.
+        * So I could not cancel the SoupMessage or better: I cancelled
+        * a SoupMessage which is not be handled so it had no effect.
+        * The body of SoupMessage was still being loaded and javascript
+        * was executed. I think the problem is that webkit-gtk creates
+        * a copy of the real SoupMessage which is going to be sent and
+        * received.
+        * 
+        * So I decided to connect to signal "got-headers" of every
+        * SoupMessage sent by the default SoupSession which I notice
+        * by connecting to signal "request-started" of SoupSession. Each
+        * NoJSView connects to signal "resource-request-starting" of
+        * WebKitWebView to remember each URI going to be loaded. When
+        * a SoupMessage hits "got-headers" and is a javascript resource
+        * I can cancel the message immediately and clear the body which
+        * causes webkit-gtk to copy a empty body if it does at all as the
+        * SoupMessage was cancelled. Then I emit this signal
+        * "uri-load-policy-status" to notify each view but the cancellation.
+        * (It also notifies all views if it is going to load to keep the
+        * menu in right state.) Each view will check if it _could_ be a
+        * resource itself requested and will update its menu accordingly.
+        * It might happen that a request will match two views because only
+        * the URI will be checked by the view because I cannot determine
+        * to which view the SoupMessage belongs to. But it doesn't matter
+        * because if a javascript resource was denied or allowed in one view
+        * it is likely be denied or allowed in other views too ;)
+        */
+       NoJSSignals[URI_LOAD_POLICY_STATUS]=
+               g_signal_new("uri-load-policy-status",
+                                               G_TYPE_FROM_CLASS(klass),
+                                               G_SIGNAL_RUN_LAST,
+                                               G_STRUCT_OFFSET(NoJSClass, uri_load_policy_status),
+                                               NULL,
+                                               NULL,
+                                               _nojs_closure_VOID__STRING_ENUM,
+                                               G_TYPE_NONE,
+                                               2,
+                                               G_TYPE_STRING,
+                                               NOJS_TYPE_POLICY);
+
+       NoJSSignals[POLICY_CHANGED]=
+               g_signal_new("policy-changed",
+                                               G_TYPE_FROM_CLASS(klass),
+                                               G_SIGNAL_RUN_LAST,
+                                               G_STRUCT_OFFSET(NoJSClass, policy_changed),
+                                               NULL,
+                                               NULL,
+                                               g_cclosure_marshal_VOID__STRING,
+                                               G_TYPE_NONE,
+                                               1,
+                                               G_TYPE_STRING);
+}
+
+/* Object initialization
+ * Create private structure and set up default values
+ */
+
+static void nojs_init(NoJS *self)
+{
+       NoJSPrivate             *priv;
+       SoupSession             *session;
+
+       priv=self->priv=NOJS_GET_PRIVATE(self);
+
+       /* Set up default values */
+       priv->database=NULL;
+       priv->databaseFilename=NULL;
+       priv->allowLocalPages=TRUE;
+       priv->checkOnlySecondLevel=TRUE;
+       priv->unknownDomainPolicy=NOJS_POLICY_BLOCK;
+
+       /* Connect to signals on session to be able to cancel messages
+        * loading javascript documents
+        */
+       session=webkit_get_default_session();
+       g_signal_connect_swapped(session, "request-started", G_CALLBACK(_nojs_on_request_started), self);
+}
+
+/* Implementation: Public API */
+
+/* Create new object */
+NoJS* nojs_new(MidoriExtension *inExtension, MidoriApp *inApp)
+{
+       return(g_object_new(TYPE_NOJS,
+                                                       "extension", inExtension,
+                                                       "application", inApp,
+                                                       NULL));
+}
+
+/* Retrieves domain from uri depending on preferences (e.g. only second level domain) */
+gchar* nojs_get_domain(NoJS *self, SoupURI *inURI)
+{
+       g_return_val_if_fail(IS_NOJS(self), NULL);
+       g_return_val_if_fail(inURI, NULL);
+
+       NoJSPrivate                     *priv=self->priv;
+       const gchar                     *realDomain;
+       gchar                           *finalDomain;
+
+       /* Get domain of site to lookup */
+       realDomain=soup_uri_get_host(inURI);
+
+       if(priv->checkOnlySecondLevel)
+               finalDomain=midori_uri_get_base_domain(realDomain);
+    else
+               finalDomain=midori_uri_to_ascii(realDomain);
+
+       /* Return domain */
+       return(finalDomain);
+}
+
+/* Get/set policy for javascript from site */
+gint nojs_get_policy(NoJS *self, SoupURI *inURI)
+{
+       g_return_val_if_fail(IS_NOJS(self), NOJS_POLICY_UNDETERMINED);
+       g_return_val_if_fail(inURI, NOJS_POLICY_UNDETERMINED);
+
+       NoJSPrivate                     *priv=self->priv;
+       sqlite3_stmt            *statement=NULL;
+       gint                            error;
+       gint                            policy=NOJS_POLICY_UNDETERMINED;
+       gchar                           *inDomain;
+
+       /* Check to allow local pages */
+       if(soup_uri_get_scheme(inURI) == SOUP_URI_SCHEME_FILE)
+       {
+               if(priv->allowLocalPages) return(NOJS_POLICY_ACCEPT);
+               else return(priv->unknownDomainPolicy);
+       }
+
+       /* Check for open database */
+       g_return_val_if_fail(priv->database, policy);
+
+       /* Get domain from URI */
+       inDomain=nojs_get_domain(self, inURI);
+
+       /* Lookup policy for site in database */
+       error=sqlite3_prepare_v2(priv->database,
+                                                               "SELECT site, value FROM policies WHERE site LIKE ? LIMIT 1;",
+                                                               -1,
+                                                               &statement,
+                                                               NULL);
+       if(statement && error==SQLITE_OK) error=sqlite3_bind_text(statement, 1, inDomain, -1, NULL);
+       if(statement && error==SQLITE_OK)
+       {
+               if(sqlite3_step(statement)==SQLITE_ROW) policy=sqlite3_column_int(statement, 1);
+       }
+               else g_warning(_("SQL fails: %s"), sqlite3_errmsg(priv->database));
+
+       sqlite3_finalize(statement);
+
+       /* If we have not found a policy for the domain then it is an unknown domain.
+        * Get default policy for unknown domains.
+        */
+       if(policy==NOJS_POLICY_UNDETERMINED) policy=priv->unknownDomainPolicy;
+
+       return(policy);
+}
+
+void nojs_set_policy(NoJS *self, const gchar *inDomain, NoJSPolicy inPolicy)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(inDomain);
+       g_return_if_fail(inPolicy>=NOJS_POLICY_ACCEPT && inPolicy<=NOJS_POLICY_BLOCK);
+
+       NoJSPrivate                     *priv=self->priv;
+       gchar                           *sql;
+       gchar                           *error=NULL;
+       gint                            success;
+
+       /* Check for open database */
+       g_return_if_fail(priv->database);
+
+       /* Update policy in database */
+       sql=sqlite3_mprintf("INSERT OR REPLACE INTO policies (site, value) VALUES ('%q', %d);",
+                                                       inDomain,
+                                                       inPolicy);
+       success=sqlite3_exec(priv->database, sql, NULL, NULL, &error);
+       if(success!=SQLITE_OK) g_warning(_("SQL fails: %s"), error);
+       if(error) sqlite3_free(error);
+       sqlite3_free(sql);
+
+       /* Emit signal to notify about policy change */
+       if(success==SQLITE_OK) g_signal_emit(self, NoJSSignals[POLICY_CHANGED], 0, inDomain);
+}
+
+/* Get/set default policy for unknown domains */
+NoJSPolicy nojs_get_policy_for_unknown_domain(NoJS *self)
+{
+       g_return_val_if_fail(IS_NOJS(self), NOJS_POLICY_UNDETERMINED);
+
+       return(self->priv->unknownDomainPolicy);
+}
+
+void nojs_set_policy_for_unknown_domain(NoJS *self, NoJSPolicy inPolicy)
+{
+       g_return_if_fail(IS_NOJS(self));
+       g_return_if_fail(inPolicy>=NOJS_POLICY_ACCEPT && inPolicy<=NOJS_POLICY_BLOCK);
+
+       if(self->priv->unknownDomainPolicy!=inPolicy)
+       {
+               self->priv->unknownDomainPolicy=inPolicy;
+               midori_extension_set_integer(self->priv->extension, "unknown-domain-policy", inPolicy);
+               g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_UNKNOWN_DOMAIN_POLICY]);
+       }
+}
+
+/* Get/set flag to allow javascript on local pages */
+gboolean nojs_get_allow_local_pages(NoJS *self)
+{
+       g_return_val_if_fail(IS_NOJS(self), TRUE);
+
+       return(self->priv->allowLocalPages);
+}
+
+void nojs_set_allow_local_pages(NoJS *self, gboolean inAllow)
+{
+       g_return_if_fail(IS_NOJS(self));
+
+       if(self->priv->allowLocalPages!=inAllow)
+       {
+               self->priv->allowLocalPages=inAllow;
+               midori_extension_set_boolean(self->priv->extension, "allow-local-pages", inAllow);
+               g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_LOCAL_PAGES]);
+       }
+}
+
+/* Get/set flag to check for second-level domains only */
+gboolean nojs_get_only_second_level_domain(NoJS *self)
+{
+       g_return_val_if_fail(IS_NOJS(self), TRUE);
+
+       return(self->priv->checkOnlySecondLevel);
+}
+
+void nojs_set_only_second_level_domain(NoJS *self, gboolean inOnlySecondLevel)
+{
+       g_return_if_fail(IS_NOJS(self));
+
+       if(self->priv->checkOnlySecondLevel!=inOnlySecondLevel)
+       {
+               self->priv->checkOnlySecondLevel=inOnlySecondLevel;
+               midori_extension_set_boolean(self->priv->extension, "only-second-level", inOnlySecondLevel);
+               g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ONLY_SECOND_LEVEL]);
+       }
+}
+
+/************************************************************************************/
+
+/* Implementation: Enumeration */
+GType nojs_policy_get_type(void)
+{
+       static volatile gsize   g_define_type_id__volatile=0;
+
+       if(g_once_init_enter(&g_define_type_id__volatile))
+       {
+               static const GEnumValue values[]=
+               {
+                       { NOJS_POLICY_UNDETERMINED, "NOJS_POLICY_UNDETERMINED", N_("Undetermined") },
+                       { NOJS_POLICY_ACCEPT, "NOJS_POLICY_ACCEPT", N_("Accept") },
+                       { NOJS_POLICY_ACCEPT_TEMPORARILY, "NOJS_POLICY_ACCEPT_TEMPORARILY", N_("Accept temporarily") },
+                       { NOJS_POLICY_BLOCK, "NOJS_POLICY_BLOCK", N_("Block") },
+                       { 0, NULL, NULL }
+               };
+
+               GType   g_define_type_id=g_enum_register_static(g_intern_static_string("NoJSPolicy"), values);
+               g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
+       }
+
+       return(g_define_type_id__volatile);
+}
diff --git a/extensions/nojs/nojs.h b/extensions/nojs/nojs.h
new file mode 100644 (file)
index 0000000..20bf737
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ Copyright (C) 2013 Stephan Haller <nomad@froevel.de>
+
+ 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 __NOJS__
+#define __NOJS__
+
+#include "config.h"
+#include <midori/midori.h>
+
+#define NOJS_DATABASE  "nojs.db"
+
+G_BEGIN_DECLS
+
+/* NoJS manager enums */
+typedef enum
+{
+       NOJS_POLICY_UNDETERMINED,
+       NOJS_POLICY_ACCEPT,
+       NOJS_POLICY_ACCEPT_TEMPORARILY,
+       NOJS_POLICY_BLOCK
+} NoJSPolicy;
+
+/* NoJS manager object */
+#define TYPE_NOJS                              (nojs_get_type())
+#define NOJS(obj)                              (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_NOJS, NoJS))
+#define IS_NOJS(obj)                   (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_NOJS))
+#define NOJS_CLASS(klass)              (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_NOJS, NoJSClass))
+#define IS_NOJS_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_NOJS))
+#define NOJS_GET_CLASS(obj)            (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_NOJS, NoJSClass))
+
+typedef struct _NoJS                   NoJS;
+typedef struct _NoJSClass              NoJSClass;
+typedef struct _NoJSPrivate            NoJSPrivate;
+
+struct _NoJS
+{
+       /* Parent instance */
+       GObject                 parent_instance;
+
+       /* Private structure */
+       NoJSPrivate             *priv;
+};
+
+struct _NoJSClass
+{
+       /* Parent class */
+       GObjectClass    parent_class;
+
+       /* Virtual functions */
+       void (*uri_load_policy_status)(NoJS *self, gchar *inURI, NoJSPolicy inPolicy);
+       void (*policy_changed)(NoJS *self, gchar *inDomain);
+};
+
+/* Public API */
+GType nojs_get_type(void);
+
+NoJS* nojs_new(MidoriExtension *inExtension, MidoriApp *inApp);
+
+gchar* nojs_get_domain(NoJS *self, SoupURI *inURI);
+
+gint nojs_get_policy(NoJS *self, SoupURI *inURI);
+void nojs_set_policy(NoJS *self, const gchar *inDomain, NoJSPolicy inPolicy);
+
+NoJSPolicy nojs_get_policy_for_unknown_domain(NoJS *self);
+void nojs_set_policy_for_unknown_domain(NoJS *self, NoJSPolicy inPolicy);
+
+gboolean nojs_get_allow_local_pages(NoJS *self);
+void nojs_set_allow_local_pages(NoJS *self, gboolean inAllow);
+
+gboolean nojs_get_only_second_level_domain(NoJS *self);
+void nojs_set_only_second_level_domain(NoJS *self, gboolean inOnlySecondLevel);
+
+gchar* nojs_get_icon_path (const gchar* icon);
+
+/* Enumeration */
+GType nojs_policy_get_type(void) G_GNUC_CONST;
+#define NOJS_TYPE_POLICY       (nojs_policy_get_type())
+
+G_END_DECLS
+
+#endif /* __NOJS__ */
diff --git a/extensions/notes.vala b/extensions/notes.vala
new file mode 100644 (file)
index 0000000..f0ccfe6
--- /dev/null
@@ -0,0 +1,459 @@
+/*
+   Copyright (C) 2013 Paweł Forysiuk <tuxator@o2.pl>
+
+   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 ClipNotes {
+
+    Midori.Database database;
+    unowned Sqlite.Database db;
+    Gtk.ListStore notes_list_store;
+    Note? current_note;
+
+    class Note : GLib.Object {
+        public int64 id { get; set; }
+        public string title { get; set; }
+        public string? uri { get; set; default = null; }
+        public string content { get; set; default = ""; }
+
+        public void add (string title, string? uri, string note_content)
+        {
+            GLib.DateTime time = new DateTime.now_local ();
+            string sqlcmd = "INSERT INTO `notes` (`uri`, `title`, `note_content`, `tstamp` ) VALUES (:uri, :title, :note_content, :tstamp);";
+            Midori.DatabaseStatement statement;
+            try {
+                statement = database.prepare (sqlcmd,
+                    ":uri", typeof (string), uri,
+                    ":title", typeof (string), title,
+                    ":note_content", typeof (string), note_content,
+                    ":tstamp", typeof (int64), time.to_unix ());
+
+                statement.step ();
+
+                append_note (this);
+            } catch (Error error) {
+                critical (_("Failed to add new note to database: %s\n"), error.message);
+            }
+
+            this.id = db.last_insert_rowid ();
+            this.uri = uri;
+            this.title = title;
+            this.content = note_content;
+        }
+
+        public void remove ()
+        {
+            string sqlcmd = "DELETE FROM `notes` WHERE id= :id;";
+            Midori.DatabaseStatement statement;
+            try {
+                statement = database.prepare (sqlcmd,
+                    ":id", typeof (int64), this.id);
+
+                statement.step ();
+                remove_note (this.id);
+            } catch (Error error) {
+                critical (_("Falied to remove note from database: %s\n"), error.message);
+            }
+        }
+
+        public void rename (string new_title)
+        {
+            string sqlcmd = "UPDATE `notes` SET title= :title WHERE id = :id;";
+            Midori.DatabaseStatement statement;
+            try {
+                statement = database.prepare (sqlcmd,
+                    ":id", typeof (int64), this.id,
+                    ":title", typeof (string), new_title);
+                statement.step ();
+            } catch (Error error) {
+                critical (_("Falied to rename note: %s\n"), error.message);
+            }
+
+            this.title = new_title;
+        }
+
+        public void update (string new_content)
+        {
+            string sqlcmd = "UPDATE `notes` SET note_content= :content WHERE id = :id;";
+            Midori.DatabaseStatement statement;
+            try {
+                statement = database.prepare (sqlcmd,
+                    ":id", typeof (int64), this.id,
+                    ":content", typeof (string), new_content);
+                statement.step ();
+            } catch (Error error) {
+                critical (_("Falied to update note: %s\n"), error.message);
+            }
+            this.content = new_content;
+        }
+    }
+
+    void append_note (Note note)
+    {
+        /* Strip LRE leading character */
+        if (note.title != null && note.title.has_prefix ("‪"))
+            note.title = note.title.replace ("‪", "");
+
+        Gtk.TreeIter iter;
+        notes_list_store.append (out iter);
+        notes_list_store.set (iter, 0, note);
+    }
+
+    void remove_note (int64 id)
+    {
+        Gtk.TreeIter iter;
+        if (notes_list_store.iter_children (out iter, null)) {
+            do {
+                Note note;
+                notes_list_store.get (iter, 0, out note);
+                if (id == note.id) {
+                    if (current_note == note) {
+                        current_note = null;
+                    }
+                    notes_list_store.remove (iter);
+                    break;
+                }
+            } while (notes_list_store.iter_next (ref iter));
+        }
+     }
+
+
+    private class Sidebar : Gtk.VBox, Midori.Viewable {
+        Gtk.Toolbar? toolbar = null;
+        Gtk.Label note_label;
+        Gtk.TreeView notes_tree_view;
+        Gtk.TextView note_text_view = new Gtk.TextView ();
+
+        public unowned string get_stock_id () {
+            return Gtk.STOCK_EDIT;
+        }
+
+        public unowned string get_label () {
+            return _("Notes");
+        }
+
+        public Gtk.Widget get_toolbar () {
+            if (toolbar == null) {
+                toolbar = new Gtk.Toolbar ();
+                var new_note_button = new Gtk.ToolButton.from_stock (Gtk.STOCK_EDIT);
+                new_note_button.label = _("New Note");
+                new_note_button.tooltip_text = _("Creates a new empty note, unrelated to opened pages");
+                new_note_button.use_underline  = true;
+                new_note_button.is_important = true;
+                new_note_button.show ();
+                new_note_button.clicked.connect (() => {
+                    var note = new Note ();
+                    note.add (_("New note"), null, "");
+                });
+                toolbar.insert (new_note_button, -1);
+            }
+            return toolbar;
+        }
+
+        internal void title_edited (Gtk.CellRendererText renderer, string? path_str, string? new_title) {
+            var path = new Gtk.TreePath.from_string (path_str);
+            Gtk.TreeIter iter;
+            notes_list_store.get_iter (out iter, path);
+            Note note;
+            notes_list_store.get (iter, 0, out note);
+            note.rename (new_title);
+            notes_list_store.set (iter, 0, note);
+        }
+
+        public Sidebar () {
+            Gtk.TreeViewColumn column;
+
+            notes_list_store = new Gtk.ListStore (1, typeof (Note));
+            notes_tree_view = new Gtk.TreeView.with_model (notes_list_store);
+            notes_tree_view.headers_visible = true;
+            notes_tree_view.button_press_event.connect (button_pressed);
+            notes_tree_view.get_selection().changed.connect (selection_changed);
+
+            notes_list_store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+            notes_list_store.set_sort_func (0, tree_sort_func);
+
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_icon = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_icon, false);
+            column.set_cell_data_func (renderer_icon, on_render_icon);
+            notes_tree_view.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererText renderer_title = new Gtk.CellRendererText ();
+            renderer_title.editable = true;
+            renderer_title.edited.connect (title_edited);
+            column.set_title (_("Notes"));
+            column.pack_start (renderer_title, true);
+            column.set_cell_data_func (renderer_title, on_render_note_title);
+            notes_tree_view.append_column (column);
+
+            try {
+                string sqlcmd = "SELECT id, uri, title, note_content FROM notes";
+                var statement = database.prepare (sqlcmd);
+                while (statement.step ()) {
+                    var note = new Note ();
+                    note.id = statement.get_int64 ("id");
+                    note.uri = statement.get_string ("uri");
+                    note.title = statement.get_string ("title");
+                    note.content = statement.get_string ("note_content");
+
+                    append_note (note);
+                }
+            } catch (Error error) {
+                critical (_("Failed to select from notes database: %s\n"), error.message);
+            }
+
+            notes_tree_view.show ();
+            pack_start (notes_tree_view, false, false, 0);
+
+            note_label = new Gtk.Label (null);
+            note_label.show ();
+            pack_start (note_label, false, false, 0);
+
+            note_text_view.set_wrap_mode (Gtk.WrapMode.WORD);
+            note_text_view.show ();
+            note_text_view.focus_out_event.connect (focus_lost);
+            pack_start (note_text_view, true, true, 0);
+        }
+
+        int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
+            Note note1, note2;
+            model.get (a, 0, out note1);
+            model.get (b, 0, out note2);
+            return strcmp (note1.title, note2.title);
+        }
+
+        void save_current_note () {
+            if (current_note != null) {
+                string note_content = note_text_view.buffer.text;
+                if (note_content != current_note.content)
+                    current_note.update (note_content);
+            }
+        }
+
+        bool focus_lost (Gdk.EventFocus event) {
+            save_current_note ();
+            return false;
+        }
+
+        private void on_render_note_title (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            Note note;
+            model.get (iter, 0, out note);
+            renderer.set ("markup", GLib.Markup.printf_escaped ("%s", note.title),
+                "ellipsize", Pango.EllipsizeMode.END);
+        }
+
+        private void on_render_icon (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            Note note;
+            model.get (iter, 0, out note);
+
+            var pixbuf = Midori.Paths.get_icon (note.uri, null);
+            if (pixbuf != null) {
+                int icon_width = 16, icon_height = 16;
+                Gtk.icon_size_lookup_for_settings (get_settings (),
+                    Gtk.IconSize.MENU, out icon_width, out icon_height);
+                pixbuf = pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.TILES);
+            }
+            renderer.set ("pixbuf", pixbuf);
+        }
+
+        private void selection_changed (Gtk.TreeSelection selection)
+        {
+            save_current_note ();
+            show_note_content (selection);
+        }
+
+        bool button_pressed (Gdk.EventButton event) {
+            if (event.button == 1) {
+                if (event.type == Gdk.EventType.2BUTTON_PRESS) {
+                    return show_note_webpage_in_new_tab (event, false);
+                }
+            }
+            if (event.button == 2)
+                return show_note_webpage_in_new_tab (event, true);
+            if (event.button == 3)
+                return show_popup_menu (event);
+            return false;
+        }
+
+        bool show_note_content (Gtk.TreeSelection selection) {
+            Gtk.TreeIter iter;
+            if (selection.get_selected (null, out iter)) {
+                Note note;
+                notes_list_store.get (iter, 0, out note);
+
+                if (note != current_note) {
+                    note_text_view.buffer.text = note.content;
+                    current_note = note;
+                }
+
+                return true;
+            } else {
+                note_text_view.buffer.text = "";
+            }
+            return false;
+        }
+
+        bool show_note_webpage_in_new_tab (Gdk.EventButton? event, bool new_tab) {
+            Gtk.TreeIter iter;
+            if (notes_tree_view.get_selection ().get_selected (null, out iter)) {
+                Note note;
+                notes_list_store.get (iter, 0, out note);
+                if (note.uri != null) {
+                    var browser = Midori.Browser.get_for_widget (notes_tree_view);
+                    if (new_tab) {
+                        browser.add_uri (note.uri);
+                    } else {
+                        var tab = browser.tab as Midori.View;
+                        tab.set_uri (note.uri);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        bool show_popup_menu (Gdk.EventButton? event) {
+            return_val_if_fail (event.window == notes_tree_view.get_bin_window(), false);
+            Gtk.TreePath path = null;
+            notes_tree_view.get_path_at_pos ((int)event.x, (int)event.y, out path,
+                                             null, null, null);
+            if (path != null) {
+                Gtk.TreeIter iter;
+                notes_list_store.get_iter (out iter, path);
+                Note note;
+                notes_list_store.get (iter, 0, out note);
+
+                var menu = new Gtk.Menu ();
+
+                var menuitem = new Gtk.ImageMenuItem.with_label (_("Rename note"));
+                var image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
+                menuitem.always_show_image = true;
+                menuitem.set_image (image);
+                menuitem.activate.connect (() => {
+                    notes_tree_view.set_cursor (path,
+                                                notes_tree_view.get_column (1), true);
+                });
+                menu.append (menuitem);
+
+
+                menuitem = new Gtk.ImageMenuItem.with_label (_("Copy note to clipboard"));
+                image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
+                menuitem.always_show_image = true;
+                menuitem.set_image (image);
+                menuitem.activate.connect (() => {
+                    get_clipboard (Gdk.SELECTION_CLIPBOARD).set_text (note.content, -1);
+                });
+                menu.append (menuitem);
+
+
+                menuitem = new Gtk.ImageMenuItem.with_label (_("Remove note"));
+                image = new Gtk.Image.from_stock (Gtk.STOCK_DELETE, Gtk.IconSize.MENU);
+                menuitem.always_show_image = true;
+                menuitem.set_image (image);
+                menuitem.activate.connect (() => {
+                    note.remove ();
+                });
+                menu.append (menuitem);
+
+                menu.show_all ();
+                Katze.widget_popup (notes_tree_view, menu, null, Katze.MenuPos.CURSOR);
+                return true;
+            }
+            return false;
+        }
+    }
+
+
+    private class Manager : Midori.Extension {
+        internal GLib.List<Gtk.Widget> widgets;
+
+        void tab_added (Midori.Browser browser, Midori.Tab tab) {
+
+            tab.context_menu.connect (add_menu_items);
+
+        }
+
+        void add_menu_items (Midori.Tab tab, WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+#if !HAVE_WEBKIT2
+            if ((hit_test_result.context & WebKit.HitTestResultContext.SELECTION) == 0)
+                return;
+#endif
+
+            var view = tab as Midori.View;
+            var action = new Gtk.Action ("Notes", _("Copy selection as note"), null, null);
+            action.activate.connect ((action)=> {
+                if (view.has_selection () == true)
+                {
+                    string selected_text = view.get_selected_text ();
+                    string uri = view.get_display_uri ();
+                    string title = view.get_display_title ();
+                    var note = new Note();
+                    note.add (title, uri, selected_text);
+                }
+            });
+
+            menu.add (action);
+        }
+
+        void browser_added (Midori.Browser browser) {
+            var viewable = new Sidebar ();
+            viewable.show ();
+            browser.panel.append_page (viewable);
+            widgets.append (viewable);
+
+            foreach (var tab in browser.get_tabs ())
+                tab_added (browser, tab);
+
+            browser.add_tab.connect (tab_added);
+        }
+
+        void activated (Midori.App app) {
+            string config_path = this.get_config_dir () ?? ":memory:";
+            string db_path = GLib.Path.build_path (Path.DIR_SEPARATOR_S, config_path, "notes.db");
+            try {
+                database = new Midori.Database (db_path);
+            } catch (Midori.DatabaseError schema_error) {
+                error (schema_error.message);
+            }
+            db = database.db;
+
+            widgets = new GLib.List<Gtk.Widget> ();
+            app.add_browser.connect (browser_added);
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+        }
+
+        void deactivated () {
+            var app = get_app ();
+            app.add_browser.disconnect (browser_added);
+            foreach (var widget in widgets)
+                widget.destroy ();
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("Notes"),
+                         description: _("Save text clips from websites as notes"),
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "Paweł Forysiuk");
+
+            this.activate.connect (activated);
+            this.deactivate.connect (deactivated);
+        }
+    }
+
+}
+
+public Midori.Extension extension_init () {
+    return new ClipNotes.Manager ();
+}
index adebb77931e4e820ec0c8062211eeecc523dd0be..264d0b46b3182e01ed5547b775ed9355aeb84883 100644 (file)
@@ -9,7 +9,6 @@
    See the file COPYING for the full license text.
 */
 
-#if HAVE_WEBKIT_1_3_8
 namespace NSPlugins {
     private int active_plugins = 0;
 
@@ -53,10 +52,8 @@ namespace NSPlugins {
         }
     }
 }
-#endif
 
 public Katze.Array? extension_init () {
-#if HAVE_WEBKIT_1_3_8
     if (!Midori.WebSettings.has_plugin_support ())
         return null;
 
@@ -70,8 +67,5 @@ public Katze.Array? extension_init () {
         extensions.add_item (new NSPlugins.Extension (plugin));
     }
     return extensions;
-#else
-    return null;
-#endif
 }
 
diff --git a/extensions/open-with.vala b/extensions/open-with.vala
new file mode 100644 (file)
index 0000000..c3ab2d9
--- /dev/null
@@ -0,0 +1,833 @@
+/*
+   Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   See the file COPYING for the full license text.
+*/
+
+#if HAVE_WIN32
+namespace Sokoke {
+    extern static Gdk.Pixbuf get_gdk_pixbuf_from_win32_executable (string path);
+}
+#endif
+
+namespace ExternalApplications {
+    /* Spawn the application specified by @app_info on the uri, trying to
+       remember the association between the content-type and the application
+       chosen
+       Returns whether the application was spawned successfully. */
+    bool open_app_info (AppInfo app_info, string uri, string content_type) {
+        Midori.URI.recursive_fork_protection (uri, true);
+
+        try {
+            var uris = new List<File> ();
+            uris.append (File.new_for_uri (uri));
+            app_info.launch (uris, null);
+        } catch (Error error) {
+            warning ("Failed to open \"%s\": %s", uri, error.message);
+            return false;
+        }
+        /* Failing to save the association is a non-fatal error so report success */
+        try {
+            new Associations ().remember (content_type, app_info);
+        } catch (Error error) {
+            warning ("Failed to save association for \"%s\": %s", uri, error.message);
+        }
+        return true;
+    }
+
+    class Associations : Object {
+#if HAVE_WIN32
+        string config_dir;
+        string filename;
+        KeyFile keyfile;
+
+        public Associations () {
+            config_dir = Midori.Paths.get_extension_config_dir ("open-with");
+            filename = Path.build_filename (config_dir, "config");
+            keyfile = new KeyFile ();
+
+            try {
+                keyfile.load_from_file (filename, KeyFileFlags.NONE);
+            } catch (FileError.NOENT exist_error) {
+                /* It's no error if no config file exists */
+            } catch (Error error) {
+                warning ("Failed to load associations: %s", error.message);
+            }
+        }
+
+        /* Determine a handler command-line for @content_type and spawn it on @uri.
+           Returns whether a handler was found and spawned successfully. */
+        public bool open (string content_type, string uri) {
+            Midori.URI.recursive_fork_protection (uri, true);
+            try {
+                string commandline = keyfile.get_string ("mimes", content_type);
+                if ("%u" in commandline)
+                    commandline = commandline.replace ("%u", Shell.quote (uri));
+                else if ("%F" in commandline)
+                    commandline = commandline.replace ("%F", Shell.quote (Filename.from_uri (uri)));
+                return Process.spawn_command_line_async (commandline);
+            } catch (KeyFileError error) {
+                /* Not remembered before */
+                return false;
+            } catch (Error error) {
+                warning ("Failed to open \"%s\": %s", uri, error.message);
+                return false;
+            }
+        }
+
+        /* Save @app_info in the persistent store as the handler for @content_type */
+        public void remember (string content_type, AppInfo app_info) throws Error {
+            keyfile.set_string ("mimes", content_type, get_commandline (app_info));
+            FileUtils.set_contents (filename, keyfile.to_data ());
+        }
+
+        /* Save @commandline in the persistent store as the handler for @content_type */
+        public void remember_custom_commandline (string content_type, string commandline, string name, string uri) {
+            keyfile.set_string ("mimes", content_type, commandline);
+            try {
+                FileUtils.set_contents (filename, keyfile.to_data ());
+            } catch (Error error) {
+                warning ("Failed to remember custom command line for \"%s\": %s", uri, error.message);
+            }
+            open (content_type, uri);
+        }
+    }
+#else
+        public Associations () {
+        }
+
+        /* Find a handler application for @content_type and spawn it on @uri.
+           Returns whether a handler was found and spawned successfully. */
+        public bool open (string content_type, string uri) {
+            var app_info = AppInfo.get_default_for_type (content_type, false);
+            if (app_info == null)
+                return false;
+            return open_app_info (app_info, uri, content_type);
+        }
+
+        /* Save @app_info as the last-used handler for @content_type */
+        public void remember (string content_type, AppInfo app_info) throws Error {
+            app_info.set_as_last_used_for_type (content_type);
+            app_info.set_as_default_for_type (content_type);
+        }
+
+        /* Save @commandline as a new system MIME handler for @content_type */
+        public void remember_custom_commandline (string content_type, string commandline, string name, string uri) {
+            try {
+                var app_info = AppInfo.create_from_commandline (commandline, name,
+                    "%u" in commandline ? AppInfoCreateFlags.SUPPORTS_URIS : AppInfoCreateFlags.NONE);
+                open_app_info (app_info, uri, content_type);
+            } catch (Error error) {
+                warning ("Failed to remember custom command line for \"%s\": %s", uri, error.message);
+            }
+        }
+    }
+#endif
+
+    static string get_commandline (AppInfo app_info) {
+        return app_info.get_commandline () ?? app_info.get_executable ();
+    }
+
+    /* Generate markup of the application's name followed by a description line. */
+    static string describe_app_info (AppInfo app_info) {
+        string name = app_info.get_display_name () ?? (Path.get_basename (app_info.get_executable ()));
+        string desc = app_info.get_description () ?? get_commandline (app_info);
+        return Markup.printf_escaped ("<b>%s</b>\n%s", name, desc);
+    }
+
+    static Icon? app_info_get_icon (AppInfo app_info) {
+        #if HAVE_WIN32
+        return Sokoke.get_gdk_pixbuf_from_win32_executable (app_info.get_executable ());
+        #else
+        return app_info.get_icon ();
+        #endif
+    }
+
+    class CustomizerDialog : Gtk.Dialog {
+        public Gtk.Entry name_entry;
+        public Gtk.Entry commandline_entry;
+
+        public CustomizerDialog (AppInfo app_info, Gtk.Widget widget) {
+            var browser = Midori.Browser.get_for_widget (widget);
+            transient_for = browser;
+
+            title = _("Custom…");
+#if !HAVE_GTK3
+            has_separator = false;
+#endif
+            destroy_with_parent = true;
+            set_icon_name (Gtk.STOCK_OPEN);
+            resizable = false;
+            add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                         Gtk.STOCK_SAVE, Gtk.ResponseType.ACCEPT);
+
+            var vbox = new Gtk.VBox (false, 8);
+            vbox.border_width = 8;
+            (get_content_area () as Gtk.Box).pack_start (vbox, true, true, 8);
+
+            var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
+            var label = new Gtk.Label (_("Name:"));
+            sizegroup.add_widget (label);
+            label.set_alignment (0.0f, 0.5f);
+            vbox.pack_start (label, false, false, 0);
+            name_entry = new Gtk.Entry ();
+            name_entry.activates_default = true;
+            sizegroup.add_widget (name_entry);
+            vbox.pack_start (name_entry, true, true, 0);
+
+            label = new Gtk.Label (_("Command Line:"));
+            sizegroup.add_widget (label);
+            label.set_alignment (0.0f, 0.5f);
+            vbox.pack_start (label, false, false, 0);
+            commandline_entry = new Gtk.Entry ();
+            commandline_entry.activates_default = true;
+            sizegroup.add_widget (name_entry);
+            sizegroup.add_widget (commandline_entry);
+            vbox.pack_start (commandline_entry, true, true, 0);
+            get_content_area ().show_all ();
+            set_default_response (Gtk.ResponseType.ACCEPT);
+
+            name_entry.text = app_info.get_name ();
+            commandline_entry.text = get_commandline (app_info);
+        }
+    }
+
+    private class Chooser : Gtk.VBox {
+        Gtk.ListStore store = new Gtk.ListStore (1, typeof (AppInfo));
+        Gtk.TreeView treeview;
+        List<AppInfo> available;
+        string content_type;
+        string uri;
+
+        public Chooser (string uri, string content_type) {
+            this.content_type = content_type;
+            this.uri = uri;
+
+            Gtk.TreeViewColumn column;
+
+            treeview = new Gtk.TreeView.with_model (store);
+            treeview.headers_visible = false;
+
+            store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+            store.set_sort_func (0, tree_sort_func);
+
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_icon = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_icon, false);
+            column.set_cell_data_func (renderer_icon, on_render_icon);
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
+            Gtk.CellRendererText renderer_text = new Gtk.CellRendererText ();
+            column.pack_start (renderer_text, true);
+            column.set_expand (true);
+            column.set_cell_data_func (renderer_text, on_render_text);
+            treeview.append_column (column);
+
+            treeview.row_activated.connect (row_activated);
+            treeview.show ();
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            scrolled.add (treeview);
+            pack_start (scrolled);
+            int height;
+            treeview.create_pango_layout ("a\nb").get_pixel_size (null, out height);
+            scrolled.set_size_request (-1, height * 5);
+            treeview.button_release_event.connect (button_released);
+            treeview.tooltip_text = _("Right-click a suggestion to customize it");
+
+            available = new List<AppInfo> ();
+            foreach (var app_info in AppInfo.get_all_for_type (content_type))
+                launcher_added (app_info, uri);
+
+            if (store.iter_n_children (null) < 1) {
+                foreach (var app_info in AppInfo.get_all ())
+                    launcher_added (app_info, uri);
+            }
+        }
+
+        bool button_released (Gdk.EventButton event) {
+            if (event.button == 3)
+                return show_popup_menu (event);
+            return false;
+        }
+
+        bool show_popup_menu (Gdk.EventButton? event) {
+            Gtk.TreeIter iter;
+            if (treeview.get_selection ().get_selected (null, out iter)) {
+                AppInfo app_info;
+                store.get (iter, 0, out app_info);
+
+                var menu = new Gtk.Menu ();
+                var menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Custom…"));
+                menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
+                menuitem.activate.connect (() => {
+                    customize_app_info (app_info, content_type, uri);
+                });
+                menu.append (menuitem);
+                menu.show_all ();
+                Katze.widget_popup (treeview, menu, null, Katze.MenuPos.CURSOR);
+
+                return true;
+            }
+            return false;
+        }
+
+        void customize_app_info (AppInfo app_info, string content_type, string uri) {
+            var dialog = new CustomizerDialog (app_info, this);
+            bool accept = dialog.run () == Gtk.ResponseType.ACCEPT;
+            if (accept) {
+                string name = dialog.name_entry.text;
+                string commandline = dialog.commandline_entry.text;
+                new Associations ().remember_custom_commandline (content_type, commandline, name, uri);
+                customized (app_info, content_type, uri);
+            }
+            dialog.destroy ();
+        }
+
+        public List<AppInfo> get_available () {
+            return available.copy ();
+        }
+
+        public AppInfo get_app_info () {
+            Gtk.TreeIter iter;
+            if (treeview.get_selection ().get_selected (null, out iter)) {
+                AppInfo app_info;
+                store.get (iter, 0, out app_info);
+                return app_info;
+            }
+            assert_not_reached ();
+        }
+
+        void on_render_icon (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            AppInfo app_info;
+            model.get (iter, 0, out app_info);
+
+            renderer.set ("gicon", app_info_get_icon (app_info),
+                          "stock-size", Gtk.IconSize.DIALOG,
+                          "xpad", 4);
+        }
+
+        void on_render_text (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            AppInfo app_info;
+            model.get (iter, 0, out app_info);
+            renderer.set ("markup", describe_app_info (app_info),
+                          "ellipsize", Pango.EllipsizeMode.END);
+        }
+
+        void launcher_added (AppInfo app_info, string uri) {
+            if (!app_info.should_show ())
+                return;
+
+            Gtk.TreeIter iter;
+            store.append (out iter);
+            store.set (iter, 0, app_info);
+
+            available.append (app_info);
+        }
+
+        int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
+            AppInfo app_info1, app_info2;
+            model.get (a, 0, out app_info1);
+            model.get (b, 0, out app_info2);
+            return strcmp (app_info1.get_display_name (), app_info2.get_display_name ());
+        }
+
+        void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (store.get_iter (out iter, path)) {
+                AppInfo app_info;
+                store.get (iter, 0, out app_info);
+                selected (app_info);
+            }
+        }
+
+        public signal void selected (AppInfo app_info);
+        public signal void customized (AppInfo app_info, string content_type, string uri);
+    }
+
+    class ChooserDialog : Gtk.Dialog {
+        public Chooser chooser { get; private set; }
+
+        public ChooserDialog (string uri, string content_type, Gtk.Widget widget) {
+            string filename;
+            if (uri.has_prefix ("file://"))
+                filename = Midori.Download.get_basename_for_display (uri);
+            else
+                filename = uri;
+
+            var browser = Midori.Browser.get_for_widget (widget);
+            transient_for = browser;
+
+            title = _("Choose application");
+#if !HAVE_GTK3
+            has_separator = false;
+#endif
+            destroy_with_parent = true;
+            set_icon_name (Gtk.STOCK_OPEN);
+            resizable = true;
+            add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                         Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT);
+
+            var vbox = new Gtk.VBox (false, 8);
+            vbox.border_width = 8;
+            (get_content_area () as Gtk.Box).pack_start (vbox, true, true, 8);
+            var label = new Gtk.Label (_("Select an application to open \"%s\"".printf (filename)));
+            label.ellipsize = Pango.EllipsizeMode.MIDDLE;
+            vbox.pack_start (label, false, false, 0);
+            if (uri == "")
+                label.no_show_all = true;
+            chooser = new Chooser (uri, content_type);
+            vbox.pack_start (chooser, true, true, 0);
+
+            get_content_area ().show_all ();
+
+            Gtk.Requisition req;
+#if HAVE_GTK3
+            get_content_area ().get_preferred_size (null, out req);
+#else
+            get_content_area ().size_request (out req);
+#endif
+            (this as Gtk.Window).set_default_size (req.width*2, req.height*3/2);
+
+            set_default_response (Gtk.ResponseType.ACCEPT);
+            chooser.selected.connect ((app_info) => {
+                response (Gtk.ResponseType.ACCEPT);
+            });
+            chooser.customized.connect ((app_info, content_type, uri) => {
+                response (Gtk.ResponseType.CANCEL);
+            });
+        }
+
+        public AppInfo? open_with () {
+            show ();
+            bool accept = run () == Gtk.ResponseType.ACCEPT;
+            hide ();
+
+            if (!accept)
+                return null;
+            return chooser.get_app_info ();
+        }
+    }
+
+    class ChooserButton : Gtk.Button {
+        public AppInfo? app_info { get; set; }
+        public string? commandline { get; set; }
+        ChooserDialog dialog;
+        Gtk.Label app_name;
+        Gtk.Image icon;
+
+        public ChooserButton (string mime_type, string? commandline) {
+            string content_type = ContentType.from_mime_type (mime_type);
+            dialog = new ChooserDialog ("", content_type, this);
+            app_info = null;
+            foreach (var candidate in dialog.chooser.get_available ()) {
+                if (get_commandline (candidate) == commandline)
+                    app_info = candidate;
+            }
+
+            var hbox = new Gtk.HBox (false, 4);
+            icon = new Gtk.Image ();
+            hbox.pack_start (icon, false, false, 0);
+            app_name = new Gtk.Label (null);
+            app_name.use_markup = true;
+            app_name.ellipsize = Pango.EllipsizeMode.END;
+            hbox.pack_start (app_name, true, true, 0);
+            add (hbox);
+            show_all ();
+            update_label ();
+
+            clicked.connect (() => {
+                dialog.transient_for = this.get_toplevel () as Gtk.Window;
+                app_info = dialog.open_with ();
+                string new_commandline = app_info != null ? get_commandline (app_info) : null;
+                commandline = new_commandline;
+                selected (new_commandline);
+                update_label ();
+            });
+        }
+
+        void update_label () {
+            app_name.label = app_info != null ? describe_app_info (app_info).replace ("\n", " ") : _("None");
+            icon.set_from_gicon (app_info != null ? app_info_get_icon (app_info) : null, Gtk.IconSize.BUTTON);
+        }
+
+        public signal void selected (string? commandline);
+    }
+
+    class Types : Gtk.VBox {
+        public Gtk.ListStore store = new Gtk.ListStore (2, typeof (string), typeof (AppInfo));
+        Gtk.TreeView treeview;
+
+        public Types () {
+            Gtk.TreeViewColumn column;
+
+            treeview = new Gtk.TreeView.with_model (store);
+            treeview.headers_visible = false;
+
+            store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+            store.set_sort_func (0, tree_sort_func);
+
+            column = new Gtk.TreeViewColumn ();
+            column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
+            Gtk.CellRendererPixbuf renderer_type_icon = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_type_icon, false);
+            column.set_cell_data_func (renderer_type_icon, on_render_type_icon);
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
+            Gtk.CellRendererText renderer_type_text = new Gtk.CellRendererText ();
+            column.pack_start (renderer_type_text, true);
+            column.set_cell_data_func (renderer_type_text, on_render_type_text);
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
+            Gtk.CellRendererPixbuf renderer_icon = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_icon, false);
+            column.set_cell_data_func (renderer_icon, on_render_icon);
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            column.set_sizing (Gtk.TreeViewColumnSizing.AUTOSIZE);
+            Gtk.CellRendererText renderer_text = new Gtk.CellRendererText ();
+            column.pack_start (renderer_text, true);
+            column.set_expand (true);
+            column.set_cell_data_func (renderer_text, on_render_text);
+            treeview.append_column (column);
+
+            treeview.row_activated.connect (row_activated);
+            treeview.show ();
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            scrolled.add (treeview);
+            pack_start (scrolled);
+            int height;
+            treeview.create_pango_layout ("a\nb").get_pixel_size (null, out height);
+            scrolled.set_size_request (-1, height * 5);
+
+            foreach (string content_type in ContentType.list_registered ())
+                launcher_added (content_type);
+            foreach (string scheme in Vfs.get_default ().get_supported_uri_schemes ())
+                launcher_added ("x-scheme-handler/" + scheme);
+
+            treeview.size_allocate.connect_after ((allocation) => {
+                treeview.columns_autosize ();
+            });
+        }
+
+        void on_render_type_icon (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            string content_type;
+            store.get (iter, 0, out content_type);
+
+            renderer.set ("gicon", ContentType.get_icon (content_type),
+                          "stock-size", Gtk.IconSize.BUTTON,
+                          "xpad", 4);
+        }
+
+        void on_render_type_text (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            string content_type;
+            AppInfo app_info;
+            store.get (iter, 0, out content_type, 1, out app_info);
+
+            string desc, mime_type;
+            if (content_type.has_prefix ("x-scheme-handler/")) {
+                desc = content_type.split ("/")[1] + "://";
+                mime_type = "";
+            } else {
+                desc = ContentType.get_description (content_type);
+                mime_type = ContentType.get_mime_type (content_type);
+            }
+
+            renderer.set ("markup",
+                Markup.printf_escaped ("<b>%s</b>\n%s",
+                    desc, mime_type),
+#if HAVE_GTK3
+                          "max-width-chars", 30,
+#else
+                          "width-chars", 30,
+#endif
+                          "ellipsize", Pango.EllipsizeMode.END);
+        }
+
+        void on_render_icon (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            AppInfo app_info;
+            model.get (iter, 1, out app_info);
+
+            renderer.set ("gicon", app_info_get_icon (app_info),
+                          "stock-size", Gtk.IconSize.MENU,
+                          "xpad", 4);
+        }
+
+        void on_render_text (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            AppInfo app_info;
+            model.get (iter, 1, out app_info);
+            renderer.set ("markup", describe_app_info (app_info),
+                          "ellipsize", Pango.EllipsizeMode.END);
+        }
+
+        void launcher_added (string content_type) {
+            var app_info = AppInfo.get_default_for_type (content_type, false);
+            if (app_info == null)
+                return;
+
+            Gtk.TreeIter iter;
+            store.append (out iter);
+            store.set (iter, 0, content_type, 1, app_info);
+        }
+
+        int tree_sort_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
+            string content_type1, content_type2;
+            model.get (a, 0, out content_type1);
+            model.get (b, 0, out content_type2);
+            return strcmp (content_type1, content_type2);
+        }
+
+        void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (store.get_iter (out iter, path)) {
+                string content_type;
+                store.get (iter, 0, out content_type);
+                selected (content_type, iter);
+            }
+        }
+
+        public signal void selected (string content_type, Gtk.TreeIter iter);
+    }
+
+
+    private class Manager : Midori.Extension {
+        enum NextStep {
+            TRY_OPEN,
+            OPEN_WITH
+        }
+
+        bool open_uri (Midori.Tab tab, string uri) {
+            return open_with_type (uri, get_content_type (uri, null), tab, NextStep.TRY_OPEN);
+        }
+
+        bool navigation_requested (Midori.Tab tab, string uri) {
+            if (uri.has_prefix ("file://") || Midori.URI.is_http (uri) || Midori.URI.is_blank (uri))
+                return false;
+
+            string content_type = get_content_type (uri, null);
+            open_with_type (uri, content_type, tab, NextStep.TRY_OPEN);
+            return true;
+        }
+
+        string get_content_type (string uri, string? mime_type) {
+            if (!uri.has_prefix ("file://") && !Midori.URI.is_http (uri)) {
+                string protocol = uri.split(":", 2)[0];
+                return "x-scheme-handler/" + protocol;
+            } else if (mime_type == null) {
+                string filename;
+                bool uncertain;
+                try {
+                    filename = Filename.from_uri (uri);
+                } catch (Error error) {
+                    filename = uri;
+                }
+                return ContentType.guess (filename, null, out uncertain);
+            }
+            return ContentType.from_mime_type (mime_type);
+        }
+
+        /* Returns %TRUE if the attempt to download and open failed immediately, %FALSE otherwise */
+        bool open_with_type (string uri, string content_type, Gtk.Widget widget, NextStep next_step) {
+            #if HAVE_WEBKIT2
+            return open_now (uri, content_type, widget, next_step);
+            #else
+            if (!Midori.URI.is_http (uri))
+                return open_now (uri, content_type, widget, next_step);
+
+            var download = new WebKit.Download (new WebKit.NetworkRequest (uri));
+            download.destination_uri = Midori.Download.prepare_destination_uri (download, null);
+            if (!Midori.Download.has_enough_space (download, download.destination_uri))
+                return false;
+
+            download.notify["status"].connect ((pspec) => {
+                if (download.status == WebKit.DownloadStatus.FINISHED) {
+                    open_now (download.destination_uri, content_type, widget, next_step);
+                }
+                else if (download.status == WebKit.DownloadStatus.ERROR)
+                    Midori.show_message_dialog (Gtk.MessageType.ERROR,
+                        _("Download error"),
+                        _("Cannot open '%s' because the download failed."
+                          ).printf (download.destination_uri), false);
+            });
+            download.start ();
+            return true;
+            #endif
+        }
+
+        /* If @next_step is %NextStep.TRY_OPEN, tries to pick a handler automatically.
+           If the automatic handler did not exist or could not run, asks for an application.
+           Returns whether an application was found and launched successfully. */
+        bool open_now (string uri, string content_type, Gtk.Widget widget, NextStep next_step) {
+            if (next_step == NextStep.TRY_OPEN && (new Associations ()).open (content_type, uri))
+                return true;
+            /* if opening directly failed or wasn't tried, ask for an association */
+            if (open_with (uri, content_type, widget) != null)
+                return true;
+            return false;
+        }
+
+        /* Returns the application chosen to open the uri+content_type if the application
+           was spawned successfully, %NULL if none was chosen or running was unsuccessful. */
+        AppInfo? open_with (string uri, string content_type, Gtk.Widget widget) {
+            var dialog = new ChooserDialog (uri, content_type, widget);
+
+            var app_info = dialog.open_with ();
+            dialog.destroy ();
+
+            if (uri == "")
+                return app_info;
+
+            if (app_info == null)
+                return app_info;
+
+            return open_app_info (app_info, uri, content_type) ? app_info : null;
+        }
+
+        void context_menu (Midori.Tab tab, WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+            if ((hit_test_result.context & WebKit.HitTestResultContext.LINK) != 0)  {
+                string uri = hit_test_result.link_uri;
+                var action = new Gtk.Action ("OpenWith", _("Open _with…"), null, null);
+                action.activate.connect ((action) => {
+                    open_with_type (uri, get_content_type (uri, null), tab, NextStep.OPEN_WITH);
+                });
+                menu.add (action);
+            }
+#if !HAVE_WEBKIT2
+            if ((hit_test_result.context & WebKit.HitTestResultContext.IMAGE) != 0) {
+                string uri = hit_test_result.image_uri;
+                var action = new Gtk.Action ("OpenImageInViewer", _("Open in Image _Viewer"), null, null);
+                action.activate.connect ((action) => {
+                    open_with_type (uri, get_content_type (uri, null), tab, NextStep.TRY_OPEN);
+                });
+                menu.add (action);
+            }
+#endif
+        }
+
+        void show_preferences (Katze.Preferences preferences) {
+            var settings = get_app ().settings;
+            var category = preferences.add_category (_("File Types"), Gtk.STOCK_FILE);
+            preferences.add_group (null);
+
+            var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
+            var label = new Gtk.Label (_("Text Editor"));
+            sizegroup.add_widget (label);
+            label.set_alignment (0.0f, 0.5f);
+            preferences.add_widget (label, "indented");
+            var entry = new ChooserButton ("text/plain", settings.text_editor);
+            sizegroup.add_widget (entry);
+            entry.selected.connect ((commandline) => {
+                settings.text_editor = commandline;
+            });
+            preferences.add_widget (entry, "spanned");
+
+            label = new Gtk.Label (_("News Aggregator"));
+            sizegroup.add_widget (label);
+            label.set_alignment (0.0f, 0.5f);
+            preferences.add_widget (label, "indented");
+            entry = new ChooserButton ("application/rss+xml", settings.news_aggregator);
+            sizegroup.add_widget (entry);
+            entry.selected.connect ((commandline) => {
+                settings.news_aggregator = commandline;
+            });
+            preferences.add_widget (entry, "spanned");
+
+            var types = new Types ();
+            types.selected.connect ((content_type, iter) => {
+                var app_info = open_with ("", content_type, preferences);
+                if (app_info == null)
+                    return;
+                try {
+                    app_info.set_as_default_for_type (content_type);
+                    types.store.set (iter, 1, app_info);
+                } catch (Error error) {
+                    warning ("Failed to select default for \"%s\": %s", content_type, error.message);
+                }
+            });
+            category.pack_start (types, true, true, 0);
+            types.show_all ();
+        }
+
+        public void tab_added (Midori.Browser browser, Midori.View view) {
+            view.navigation_requested.connect_after (navigation_requested);
+            view.open_uri.connect (open_uri);
+            view.context_menu.connect (context_menu);
+        }
+
+        public void tab_removed (Midori.Browser browser, Midori.View view) {
+            view.navigation_requested.disconnect (navigation_requested);
+            view.open_uri.disconnect (open_uri);
+            view.context_menu.disconnect (context_menu);
+        }
+
+        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);
+            browser.show_preferences.connect (show_preferences);
+        }
+
+        void activated (Midori.App app) {
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+        }
+
+        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);
+            browser.show_preferences.disconnect (show_preferences);
+        }
+
+        void deactivated () {
+            var app = get_app ();
+            foreach (var browser in app.get_browsers ())
+                browser_removed (browser);
+            app.add_browser.disconnect (browser_added);
+
+        }
+
+        internal Manager () {
+            GLib.Object (name: "External Applications",
+                         description: "Choose what to open unknown file types with",
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "Christian Dywan <christian@twotoasts.de>");
+
+            this.activate.connect (activated);
+            this.deactivate.connect (deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new ExternalApplications.Manager ();
+}
+
index f76dbf6906d2a047c8e64ee0f1bb734b9491db71..a94a262ee79d07b196350959f1bbd7b76e047e88 100644 (file)
@@ -48,21 +48,12 @@ clock_set_current_time (MidoriBrowser* browser)
     GtkWidget* label = g_object_get_data (G_OBJECT (browser), "clock-label");
     const gchar* format = midori_extension_get_string (extension, "format");
 
-    #if GLIB_CHECK_VERSION (2, 26, 0)
     GDateTime* date = g_date_time_new_now_local ();
     gint seconds = g_date_time_get_seconds (date);
     gchar* pretty = g_date_time_format (date, format);
     gtk_label_set_label (GTK_LABEL (label), pretty);
     g_free (pretty);
     g_date_time_unref (date);
-    #else
-    time_t rawtime = time (NULL);
-    struct tm *tm = localtime (&rawtime);
-    gint seconds = tm->tm_sec;
-    char date_fmt[512];
-    strftime (date_fmt, sizeof (date_fmt), format, tm);
-    gtk_label_set_label (GTK_LABEL (label), date_fmt);
-    #endif
 
     if (g_strstr_len (format, -1, "%c")
      || g_strstr_len (format, -1, "%N")
index 6be3ff2af4f8c849f4a4d1b373bc5db65466cc14..229341239b1e7010020f8ce503dd3a684bb06a62 100644 (file)
@@ -126,7 +126,7 @@ statusbar_features_property_proxy (MidoriWebSettings* settings,
     else if (!strcmp (property, "zoom-level"))
     {
         MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
-        gint i;
+        guint 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++)
index 7b429f6a19615f77f2c97dbdcf20f0f6f7fbef4e..6e199bf1593d2ffc2b3653f6bb1b852eccf17ab6 100644 (file)
@@ -288,20 +288,6 @@ tab_panel_settings_notify_cb (MidoriWebSettings* settings,
         gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, buttons, -1);
 }
 
-static void
-tab_panel_toggle_toolbook (GtkWidget* toolbar)
-{
-        /* Hack to ensure correct toolbar visibility */
-        GtkWidget* toolbook = gtk_widget_get_parent (toolbar);
-        if (gtk_notebook_get_current_page (GTK_NOTEBOOK (toolbook))
-         == gtk_notebook_page_num (GTK_NOTEBOOK (toolbook), toolbar))
-        {
-            GList* items = gtk_container_get_children (GTK_CONTAINER (toolbar));
-            sokoke_widget_set_visible (toolbook, items != NULL);
-            g_list_free (items);
-        }
-}
-
 static void
 tab_panel_remove_view (MidoriBrowser* browser,
                        GtkWidget*     view,
@@ -310,9 +296,7 @@ tab_panel_remove_view (MidoriBrowser* browser,
     if (minimized)
     {
         GtkToolItem* toolitem = tab_panel_get_toolitem_for_view (view);
-        GtkWidget* toolbar = tab_panel_get_toolbar_for_browser (browser);
         gtk_widget_destroy (GTK_WIDGET (toolitem));
-        tab_panel_toggle_toolbook (toolbar);
     }
     else
     {
@@ -443,7 +427,6 @@ tab_panel_browser_add_tab_cb (MidoriBrowser*   browser,
         g_object_set_data (G_OBJECT (view), "tab-panel-ext-toolitem", toolitem);
         gtk_widget_show (GTK_WIDGET (toolitem));
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-        tab_panel_toggle_toolbook (toolbar);
         g_signal_connect (toolitem, "clicked",
             G_CALLBACK (tab_panel_toolitem_clicked_cb), view);
         g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event",
@@ -574,10 +557,17 @@ tab_panel_app_add_browser_cb (MidoriApp*       app,
 
     toolbar = gtk_toolbar_new ();
     g_object_set_data (G_OBJECT (browser), "tab-panel-ext-toolbar", toolbar);
-    gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-    gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
     gtk_widget_show (toolbar);
 
+    GtkActionGroup* actions = midori_browser_get_action_group (browser);
+    GtkAction* action = gtk_action_group_get_action (actions, "TabNew");
+    GtkWidget* toolitem = gtk_action_create_tool_item (action);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (toolitem), -1);
+
+    action = gtk_action_group_get_action (actions, "Separator");
+    toolitem = gtk_action_create_tool_item (action);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (toolitem), -1);
+
     /*
     TODO: Implement optional thumbnail images
     toolitem = gtk_toggle_tool_button_new_from_stock (STOCK_IMAGE);
diff --git a/extensions/tabby.vala b/extensions/tabby.vala
new file mode 100644 (file)
index 0000000..fb0785e
--- /dev/null
@@ -0,0 +1,807 @@
+/*
+   Copyright (C) 2013 André Stösel <andre@stoesel.de>
+
+   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 Tabby {
+    int IDLE_RESTORE_COUNT = 13;
+    /* FixMe: don't use a global object */
+    Midori.App? APP;
+
+    /* function called from Manager object */
+    public interface IStorage : GLib.Object {
+        public abstract Katze.Array get_saved_sessions ();
+        public abstract Base.Session get_new_session ();
+        public abstract void restore_last_sessions ();
+        public abstract void import_session (Katze.Array tabs);
+    }
+
+    public interface ISession : GLib.Object {
+        public abstract Katze.Array get_tabs ();
+        /* Add one tab to the database */
+        public abstract void add_item (Katze.Item item);
+        /* Attach to a browser */
+        public abstract void attach (Midori.Browser browser);
+        /* Attach to a browser and populate it with tabs from the database */
+        public abstract void restore (Midori.Browser browser);
+        /* Remove all tabs from the database */
+        public abstract void remove ();
+        /* Run when a browser is closed */
+        public abstract void close ();
+    }
+
+    public enum SessionState {
+        OPEN,
+        CLOSED,
+        RESTORING
+    }
+
+    namespace Base {
+        /* each base class should connect to all necessary signals and provide an abstract function to handle them */
+
+        public abstract class Storage : GLib.Object, IStorage {
+            public Midori.App app { get; construct; }
+
+            public abstract Katze.Array get_saved_sessions ();
+            public abstract Base.Session get_new_session ();
+
+            public void start_new_session () {
+                Katze.Array sessions = new Katze.Array (typeof (Session));
+                this.init_sessions (sessions);
+            }
+
+            public void restore_last_sessions () {
+                Katze.Array sessions = this.get_saved_sessions ();
+                this.init_sessions (sessions);
+            }
+
+            private void init_sessions (Katze.Array sessions) {
+                if (sessions.is_empty ()) {
+                    sessions.add_item (this.get_new_session ());
+                }
+
+                GLib.List<unowned Katze.Item> items = sessions.get_items ();
+                foreach (Katze.Item item in items) {
+                    Session session = item as Session;
+                    Midori.Browser browser = this.app.create_browser ();
+
+                    /* FixMe: tabby-session should be set in .restore and .attch */
+                    browser.set_data<Base.Session> ("tabby-session", session as Base.Session);
+
+                    app.add_browser (browser);
+                    browser.show ();
+
+                    session.restore (browser);
+                }
+            }
+
+            public virtual void import_session (Katze.Array tabs) {
+                Session session = this.get_new_session ();
+                GLib.List<unowned Katze.Item> items = tabs.get_items ();
+                double i = 0;
+                foreach (Katze.Item item in items) {
+                    item.set_meta_string ("sorting", i.to_string());
+                    // See midori_browser_step_history: don't add to history
+                    item.set_meta_string ("history-step", "ignore");
+                    i += 1024;
+                    session.add_item (item);
+                }
+            }
+        }
+
+        public abstract class Session : GLib.Object, ISession {
+            protected GLib.SList<double?> tab_sorting;
+
+            public Midori.Browser? browser { get; protected set; default = null; }
+            public SessionState state { get; protected set; default = SessionState.CLOSED; }
+
+            public abstract void add_item (Katze.Item item);
+            public abstract void uri_changed (Midori.View view, string uri);
+            public abstract void data_changed (Midori.View view);
+            public abstract void tab_added (Midori.Browser browser, Midori.View view);
+            public abstract void tab_removed (Midori.Browser browser, Midori.View view);
+            public abstract void tab_switched (Midori.View? old_view, Midori.View? new_view);
+            public abstract void tab_reordered (Gtk.Widget tab, uint pos);
+
+            public abstract void remove ();
+
+            public abstract Katze.Array get_tabs ();
+            public abstract double get_max_sorting ();
+
+            public void attach (Midori.Browser browser) {
+                this.browser = browser;
+
+                browser.add_tab.connect_after (this.tab_added);
+                browser.add_tab.connect (this.helper_data_changed);
+
+                browser.remove_tab.connect (this.tab_removed);
+                browser.switch_tab.connect (this.tab_switched);
+                browser.delete_event.connect_after(this.delete_event);
+                browser.notebook.page_reordered.connect_after (this.tab_reordered);
+
+                this.state = SessionState.OPEN;
+
+                foreach (Midori.View view in browser.get_tabs ()) {
+                    this.tab_added (browser, view);
+                    this.helper_data_changed (browser, view);
+                }
+            }
+
+            public void restore (Midori.Browser browser) {
+                this.browser = browser;
+
+                Katze.Array tabs = this.get_tabs ();
+                unowned Katze.Array? open_uris = browser.get_data ("tabby-open-uris");
+
+                if(tabs.is_empty () && open_uris == null) {
+                    /* Using get here to avoid MidoriMidoriStartup in generated C with Vala 0.20.1 */
+                    int load_on_startup;
+                    APP.settings.get ("load-on-startup", out load_on_startup);
+
+                    Katze.Item item = new Katze.Item ();
+
+                    if (load_on_startup == Midori.MidoriStartup.BLANK_PAGE) {
+                        item.uri = "about:dial";
+                    } else {
+                        item.uri = "about:home";
+                    }
+
+                    tabs.add_item (item);
+                }
+
+                browser.add_tab.connect_after (this.tab_added);
+                browser.add_tab.connect (this.helper_data_changed);
+
+                browser.remove_tab.connect (this.tab_removed);
+                browser.switch_tab.connect (this.tab_switched);
+                browser.delete_event.connect_after(this.delete_event);
+                browser.notebook.page_reordered.connect_after (this.tab_reordered);
+
+                GLib.List<unowned Katze.Item> items = new GLib.List<unowned Katze.Item> ();
+                if (open_uris != null) {
+                    items.concat (open_uris.get_items ());
+                }
+                items.concat (tabs.get_items ());
+                unowned GLib.List<unowned Katze.Item> u_items = items;
+
+                bool delay = false;
+                bool should_delay = false;
+
+                int load_on_startup;
+                APP.settings.get ("load-on-startup", out load_on_startup);
+                should_delay = load_on_startup == Midori.MidoriStartup.DELAYED_PAGES;
+
+                if (APP.crashed == true) {
+                    delay = true;
+                    should_delay = true;
+                }
+
+                this.state = SessionState.RESTORING;
+
+                GLib.Idle.add (() => {
+                    /* Note: we need to use `items` for something to maintain a valid reference */
+                    GLib.PtrArray new_tabs = new GLib.PtrArray ();
+                    if (items.length () > 0) {
+                        for (int i = 0; i < IDLE_RESTORE_COUNT; i++) {
+                            if (u_items == null) {
+                                this.helper_reorder_tabs (new_tabs);
+                                this.state = SessionState.OPEN;
+                                return false;
+                            }
+
+                            Katze.Item t_item = u_items.data<Katze.Item>;
+
+                            t_item.set_meta_integer ("append", 1);
+
+                            if (delay && should_delay)
+                                t_item.set_meta_integer ("delay", Midori.Delay.DELAYED);
+                            else
+                                delay = true;
+
+                            unowned Gtk.Widget tab = browser.add_item (t_item);
+                            new_tabs.add (tab);
+
+                            u_items = u_items.next;
+                        }
+                        this.helper_reorder_tabs (new_tabs);
+                    }
+                    if (u_items == null) {
+                        this.state = SessionState.OPEN;
+                        return false;
+                    }
+                    return true;
+                });
+            }
+
+            public virtual void close () {
+                if (this.state == SessionState.CLOSED) {
+                    assert (this.browser == null);
+                } else {
+                    this.state = SessionState.CLOSED;
+
+                    this.browser.add_tab.disconnect (this.tab_added);
+                    this.browser.add_tab.disconnect (this.helper_data_changed);
+                    this.browser.remove_tab.disconnect (this.tab_removed);
+                    this.browser.switch_tab.disconnect (this.tab_switched);
+                    this.browser.delete_event.disconnect (this.delete_event);
+                    this.browser.notebook.page_reordered.disconnect (this.tab_reordered);
+
+                    this.browser = null;
+                }
+            }
+
+#if HAVE_GTK3
+            protected bool delete_event (Gtk.Widget widget, Gdk.EventAny event) {
+#else
+            protected bool delete_event (Gtk.Widget widget, Gdk.Event event) {
+#endif
+
+                this.close ();
+                return false;
+
+            }
+
+            protected double get_tab_sorting (Midori.View view) {
+                int this_pos = this.browser.notebook.page_num (view);
+                Midori.View prev_view = this.browser.notebook.get_nth_page (this_pos - 1) as Midori.View;
+                Midori.View next_view = this.browser.notebook.get_nth_page (this_pos + 1) as Midori.View;
+
+                string prev_meta_sorting = null;
+                string next_meta_sorting = null;
+                double prev_sorting, next_sorting, this_sorting;
+
+                if (prev_view != null) {
+                    unowned Katze.Item prev_item = prev_view.get_proxy_item ();
+                    prev_meta_sorting = prev_item.get_meta_string ("sorting");
+                }
+
+                if (prev_meta_sorting == null)
+                    if (this.state == SessionState.RESTORING)
+                        prev_sorting = this.get_max_sorting ();
+                    else
+                        prev_sorting = double.parse ("0");
+                else
+                    prev_sorting = double.parse (prev_meta_sorting);
+
+                if (next_view != null) {
+                    unowned Katze.Item next_item = next_view.get_proxy_item ();
+                    next_meta_sorting = next_item.get_meta_string ("sorting");
+                }
+
+                if (next_meta_sorting == null)
+                    next_sorting = prev_sorting + 2048;
+                else
+                    next_sorting = double.parse (next_meta_sorting);
+
+                this_sorting = prev_sorting + (next_sorting - prev_sorting) / 2;
+
+                return this_sorting;
+            }
+
+            private void load_status (GLib.Object _view, ParamSpec pspec) {
+                Midori.View view = (Midori.View)_view;
+
+                if (view.load_status == Midori.LoadStatus.PROVISIONAL) {
+                    unowned Katze.Item item = view.get_proxy_item ();
+
+                    int64 delay = item.get_meta_integer ("delay");
+                    if (delay == Midori.Delay.UNDELAYED) {
+                        view.web_view.notify["uri"].connect ( () => {
+                                this.uri_changed (view, view.web_view.uri);
+                            });
+                        view.web_view.notify["title"].connect ( () => {
+                                this.data_changed (view);
+                            });
+
+                    }
+
+                    view.notify["load-status"].disconnect (load_status);
+                }
+            }
+
+            private void helper_data_changed (Midori.Browser browser, Midori.View view) {
+               view.notify["load-status"].connect (load_status);
+
+               view.new_view.connect (this.helper_duplicate_tab);
+            }
+
+            private void helper_reorder_tabs (GLib.PtrArray new_tabs) {
+                CompareDataFunc<double?> helper_compare_data = (a, b) => {
+                    if (a > b)
+                        return 1;
+                    else if(a < b)
+                        return -1;
+                    return 0;
+                };
+
+                GLib.CompareFunc<double?> helper_compare_func = (a,b) => {
+                    return a == b ? 0 : -1;
+                };
+
+                this.browser.notebook.page_reordered.disconnect (this.tab_reordered);
+                for(var i = 0; i < new_tabs.len; i++) {
+                    Midori.View tab = new_tabs.index(i) as Midori.View;
+
+                    unowned Katze.Item item = tab.get_proxy_item ();
+
+                    double sorting;
+                    string? sorting_string = item.get_meta_string ("sorting");
+                    if (sorting_string != null) { /* we have to use a seperate if condition to avoid a `possibly unassigned local variable` error */
+                        if (double.try_parse (item.get_meta_string ("sorting"), out sorting)) {
+                            this.tab_sorting.insert_sorted_with_data (sorting, helper_compare_data);
+
+                            int index = this.tab_sorting.position (this.tab_sorting.find_custom (sorting, helper_compare_func));
+
+                            this.browser.notebook.reorder_child (tab, index);
+                        }
+                    }
+                }
+                this.browser.notebook.page_reordered.connect_after (this.tab_reordered);
+            }
+
+            private void helper_duplicate_tab (Midori.View view, Midori.View new_view, Midori.NewView where, bool user_initiated) {
+                unowned Katze.Item item = view.get_proxy_item ();
+                unowned Katze.Item new_item = new_view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                int64 new_tab_id = new_item.get_meta_integer ("tabby-id");
+
+                if (tab_id > 0 && tab_id == new_tab_id) {
+                    new_item.set_meta_integer ("tabby-id", 0);
+                }
+            }
+
+            construct {
+                this.tab_sorting = new GLib.SList<double?> ();
+            }
+        }
+    }
+
+    namespace Local {
+        private class Session : Base.Session {
+            public int64 id { get; private set; }
+            private Midori.Database database;
+
+            public override void add_item (Katze.Item item) {
+                GLib.DateTime time = new DateTime.now_local ();
+                string? sorting = item.get_meta_string ("sorting") ?? "1";
+                string sqlcmd = "INSERT INTO `tabs` (`crdate`, `tstamp`, `session_id`, `uri`, `title`, `sorting`) VALUES (:crdate, :tstamp, :session_id, :uri, :title, :sorting);";
+
+                int64 tstamp = item.get_meta_integer ("tabby-tstamp");
+                if (tstamp < 0) { // new tab without focus
+                    tstamp = 0;
+                }
+
+                try {
+                    var statement = database.prepare (sqlcmd,
+                        ":crdate", typeof (int64), time.to_unix (),
+                        ":tstamp", typeof (int64), tstamp,
+                        ":session_id", typeof (int64), this.id,
+                        ":uri", typeof (string), item.uri,
+                        ":title", typeof (string), item.name,
+                        ":sorting", typeof (double), double.parse (sorting));
+                    statement.exec ();
+                    int64 tab_id = statement.row_id ();
+                    item.set_meta_integer ("tabby-id", tab_id);
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            protected override void uri_changed (Midori.View view, string uri) {
+                unowned Katze.Item item = view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                string sqlcmd = "UPDATE `tabs` SET uri = :uri WHERE session_id = :session_id AND id = :tab_id;";
+                try {
+                    database.prepare (sqlcmd,
+                                      ":uri", typeof (string), uri,
+                                      ":session_id", typeof (int64), this.id,
+                                      ":tab_id", typeof (int64), tab_id).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            protected override void data_changed (Midori.View view) {
+                unowned Katze.Item item = view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                string sqlcmd = "UPDATE `tabs` SET title = :title WHERE session_id = :session_id AND id = :tab_id;";
+                try {
+                    database.prepare (sqlcmd,
+                                      ":title", typeof (string), view.get_display_title (),
+                                      ":session_id", typeof (int64), this.id,
+                                      ":tab_id", typeof (int64), tab_id).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            protected override void tab_added (Midori.Browser browser, Midori.View view) {
+                unowned Katze.Item item = view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                if (tab_id < 1) {
+                    double sorting = this.get_tab_sorting (view);
+                    item.set_meta_string ("sorting", sorting.to_string ());
+                    this.add_item (item);
+                }
+           }
+
+            protected override void tab_removed (Midori.Browser browser, Midori.View view) {
+                unowned Katze.Item item = view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                /* FixMe: mark as deleted */
+                string sqlcmd = "DELETE FROM `tabs` WHERE session_id = :session_id AND id = :tab_id;";
+                try {
+                    database.prepare (sqlcmd,
+                                      ":session_id", typeof (int64), this.id,
+                                      ":tab_id", typeof (int64), tab_id).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            protected override void tab_switched (Midori.View? old_view, Midori.View? new_view) {
+                GLib.DateTime time = new DateTime.now_local ();
+                unowned Katze.Item item = new_view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                int64 tstamp = time.to_unix();
+                item.set_meta_integer ("tabby-tstamp", tstamp);
+                string sqlcmd = "UPDATE `tabs` SET tstamp = :tstamp WHERE session_id = :session_id AND id = :tab_id;";
+                try {
+                    database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id,
+                        ":tab_id", typeof (int64), tab_id,
+                        ":tstamp", typeof (int64), tstamp).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            protected override void tab_reordered (Gtk.Widget tab, uint pos) {
+                Midori.View view = tab as Midori.View;
+
+                double sorting = this.get_tab_sorting (view);
+                unowned Katze.Item item = view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                string sqlcmd = "UPDATE `tabs` SET sorting = :sorting WHERE session_id = :session_id AND id = :tab_id;";
+                try {
+                    database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id,
+                        ":tab_id", typeof (int64), tab_id,
+                        ":sorting", typeof (double), sorting).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+
+                item.set_meta_string ("sorting", sorting.to_string ());
+            }
+
+            public override void remove() {
+                string sqlcmd = """
+                    DELETE FROM `tabs` WHERE session_id = :session_id;
+                    DELETE FROM `sessions` WHERE id = :session_id;
+                    """;
+                try {
+                    database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id). exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            public override void close () {
+                /* base.close may unset this.browser, so hold onto it */
+                Midori.Browser? my_browser = this.browser;
+                base.close ();
+
+                bool should_break = true;
+                if (my_browser != null && !my_browser.destroy_with_parent) {
+                    foreach (Midori.Browser browser in APP.get_browsers ()) {
+                        if (browser != my_browser && !browser.destroy_with_parent) {
+                            should_break = false;
+                            break;
+                        }
+                    }
+
+                    if (should_break) {
+                        return;
+                    }
+                }
+
+                GLib.DateTime time = new DateTime.now_local ();
+                string sqlcmd = "UPDATE `sessions` SET closed = 1, tstamp = :tstamp WHERE id = :session_id;";
+                try {
+                    database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id,
+                        ":tstamp", typeof (int64), time.to_unix ()).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            public override Katze.Array get_tabs() {
+                Katze.Array tabs = new Katze.Array (typeof (Katze.Item));
+
+                string sqlcmd = "SELECT id, uri, title, sorting FROM tabs WHERE session_id = :session_id ORDER BY tstamp DESC";
+                try {
+                    var statement = database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id);
+                    while (statement.step ()) {
+                        Katze.Item item = new Katze.Item ();
+                        int64 id = statement.get_int64 ("id");
+                        string uri = statement.get_string ("uri");
+                        string title = statement.get_string ("title");
+                        double sorting = statement.get_double ("sorting");
+                        item.uri = uri;
+                        item.name = title;
+                        item.set_meta_integer ("tabby-id", id);
+                        item.set_meta_string ("sorting", sorting.to_string ());
+                        // See midori_browser_step_history: don't add to history
+                        item.set_meta_string ("history-step", "ignore");
+                        tabs.add_item (item);
+                    }
+                } catch (Error error) {
+                    critical (_("Failed to select from database: %s"), error.message);
+                }
+                return tabs;
+            }
+
+            public override double get_max_sorting () {
+                string sqlcmd = "SELECT MAX(sorting) FROM tabs WHERE session_id = :session_id";
+                try {
+                    var statement = database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id);
+                    statement.step ();
+                    double sorting;
+                    string? sorting_string = statement.get_int64 ("MAX(sorting)").to_string ();
+                    if (sorting_string != null) {
+                        /* we have to use a seperate if condition to avoid
+                           a `possibly unassigned local variable` error */
+                        if (double.try_parse (sorting_string, out sorting)) {
+                            return sorting;
+                        }
+                    }
+                } catch (Error error) {
+                    critical (_("Failed to select from database: %s"), error.message);
+                }
+
+                 return double.parse ("0");
+            }
+
+            internal Session (Midori.Database database) {
+                this.database = database;
+
+                GLib.DateTime time = new DateTime.now_local ();
+
+                string sqlcmd = "INSERT INTO `sessions` (`tstamp`) VALUES (:tstamp);";
+
+                try {
+                    var statement = database.prepare (sqlcmd,
+                        ":tstamp", typeof (int64), time.to_unix ());
+                    statement.exec ();
+                    this.id = statement.row_id ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+
+            internal Session.with_id (Midori.Database database, int64 id) {
+                this.database = database;
+                this.id = id;
+
+                GLib.DateTime time = new DateTime.now_local ();
+                string sqlcmd = "UPDATE `sessions` SET closed = 0, tstamp = :tstamp WHERE id = :session_id;";
+
+                try {
+                    database.prepare (sqlcmd,
+                        ":session_id", typeof (int64), this.id,
+                        ":tstamp", typeof (int64), time.to_unix ()).exec ();
+                } catch (Error error) {
+                    critical (_("Failed to update database: %s"), error.message);
+                }
+            }
+        }
+
+        private class Storage : Base.Storage {
+            private Midori.Database database;
+
+            public override Katze.Array get_saved_sessions () {
+                Katze.Array sessions = new Katze.Array (typeof (Session));
+
+                string sqlcmd = """
+                    SELECT id, closed FROM sessions WHERE closed = 0
+                    UNION
+                    SELECT * FROM (SELECT id, closed FROM sessions WHERE closed = 1 ORDER BY tstamp DESC LIMIT 1)
+                    ORDER BY closed;
+                """;
+                try {
+                    var statement = database.prepare (sqlcmd);
+                    while (statement.step ()) {
+                        int64 id = statement.get_int64 ("id");
+                        int64 closed = statement.get_int64 ("closed");
+                        if (closed == 0 || sessions.is_empty ()) {
+                            sessions.add_item (new Session.with_id (this.database, id));
+                        }
+                    }
+                } catch (Error error) {
+                    critical (_("Failed to select from database: %s"), error.message);
+                }
+
+                if (sessions.is_empty ()) {
+                    sessions.add_item (new Session (this.database));
+                }
+
+                return sessions;
+            }
+
+            public override void import_session (Katze.Array tabs) {
+                try {
+                    database.transaction (()=>{
+                        base.import_session(tabs); return true;
+                    });
+                } catch (Error error) {
+                    critical (_("Failed to select from database: %s"), error.message);
+                }
+            }
+
+            public override Base.Session get_new_session () {
+                return new Session (this.database) as Base.Session;
+            }
+
+            internal Storage (Midori.App app) {
+                GLib.Object (app: app);
+
+                try {
+                    database = new Midori.Database ("tabby.db");
+                } catch (Midori.DatabaseError schema_error) {
+                    error (schema_error.message);
+                }
+
+                if (database.first_use) {
+                    string config_file = Midori.Paths.get_config_filename_for_reading ("session.xbel");
+                    try {
+                        Katze.Array old_session = new Katze.Array (typeof (Katze.Item));
+                        Midori.array_from_file (old_session, config_file, "xbel-tiny");
+                        this.import_session (old_session);
+                    } catch (GLib.FileError file_error) {
+                        /* no old session.xbel -> could be a new profile -> ignore it */
+                    } catch (GLib.Error error) {
+                        critical (_("Failed to import legacy session: %s"), error.message);
+                    }
+                }
+            }
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        private Base.Storage storage;
+        private bool load_session () {
+            /* Using get here to avoid MidoriMidoriStartup in generated C with Vala 0.20.1 */
+            int load_on_startup;
+            APP.settings.get ("load-on-startup", out load_on_startup);
+            if (load_on_startup == Midori.MidoriStartup.BLANK_PAGE
+             || load_on_startup == Midori.MidoriStartup.HOMEPAGE) {
+                this.storage.start_new_session ();
+            } else {
+                this.storage.restore_last_sessions ();
+            }
+
+            /* FIXME: execute_commands should be called before session creation */
+            GLib.Idle.add (this.execute_commands);
+
+            return false;
+        }
+
+        private bool execute_commands () {
+            Midori.App app = this.get_app ();
+            unowned string?[] commands = app.get_data ("execute-commands");
+
+            if (commands != null) {
+                app.send_command (commands);
+            }
+
+            return false;
+        }
+
+        private void set_open_uris (Midori.Browser browser) {
+            Midori.App app = this.get_app ();
+            unowned string?[] uris = app.get_data ("open-uris");
+
+            if (uris != null) {
+                Katze.Array tabs = new Katze.Array (typeof (Katze.Item));
+
+                for(int i = 0; uris[i] != null; i++) {
+                    Katze.Item item = new Katze.Item ();
+                    item.name = uris[i];
+                    item.uri = Midori.Sokoke.magic_uri (uris[i], true, true);
+                    if (item.uri != null) {
+                        tabs.add_item (item);
+                    }
+                }
+                if (!tabs.is_empty()) {
+                    browser.set_data ("tabby-open-uris", tabs);
+                }
+            }
+
+            app.add_browser.disconnect (this.set_open_uris);
+        }
+
+        private void browser_added (Midori.Browser browser) {
+            Base.Session? session = browser.get_data<Base.Session> ("tabby-session");
+            if (session == null) {
+                session = this.storage.get_new_session () as Base.Session;
+                browser.set_data<Base.Session> ("tabby-session", session);
+                session.attach (browser);
+            }
+        }
+
+        private void browser_removed (Midori.Browser browser) {
+            Base.Session? session = browser.get_data<Base.Session> ("tabby-session");
+            if (session == null) {
+                GLib.warning ("missing session");
+            } else {
+                session.close ();
+
+                /* Using get here to avoid MidoriMidoriStartup in generated C with Vala 0.20.1 */
+                int load_on_startup;
+                APP.settings.get ("load-on-startup", out load_on_startup);
+
+                if (browser.destroy_with_parent
+                 || load_on_startup < Midori.MidoriStartup.LAST_OPEN_PAGES) {
+                    /* Remove js popups and close if not restoring on startup */
+                    session.remove ();
+                }
+            }
+        }
+
+        private void activated (Midori.App app) {
+            APP = app;
+            unowned string? restore_count = GLib.Environment.get_variable ("TABBY_RESTORE_COUNT");
+            if (restore_count != null) {
+                int count = int.parse (restore_count);
+                if (count >= 1) {
+                    IDLE_RESTORE_COUNT = count;
+                }
+            }
+
+            /* FixMe: provide an option to replace Local.Storage with IStorage based Objects */
+            this.storage = new Local.Storage (this.get_app ()) as Base.Storage;
+
+            app.add_browser.connect (this.set_open_uris);
+            app.add_browser.connect (this.browser_added);
+            app.remove_browser.connect (this.browser_removed);
+
+            GLib.Idle.add (this.load_session);
+        }
+
+        private void deactivated () {
+            /* set_open_uris will disconnect itself if called,
+               but it may have been called before we are deactivated */
+            APP.add_browser.disconnect (this.set_open_uris);
+            APP.add_browser.disconnect (this.browser_added);
+            APP.remove_browser.disconnect (this.browser_removed);
+            APP = null;
+
+            this.storage = null;
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("Tabby"),
+                         description: _("Tab and session management."),
+                         version: "0.1",
+                         authors: "André Stösel <andre@stoesel.de>");
+
+            this.activate.connect (this.activated);
+            this.deactivate.connect (this.deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new Tabby.Manager ();
+}
diff --git a/extensions/tabs2one.c b/extensions/tabs2one.c
new file mode 100644 (file)
index 0000000..2017da2
--- /dev/null
@@ -0,0 +1,410 @@
+/*
+ Copyright (C) 2013 Eder Sosa <eder.sohe@gmail.com>
+
+ 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/midori.h>
+
+typedef struct
+{
+    gchar* folder;
+    gchar* filename;
+    gchar* uri;
+} tabs2onePriv;
+
+static tabs2onePriv* priv;
+
+tabs2onePriv*
+tabs2one_private_new ()
+{
+    tabs2onePriv* priv = g_slice_new (tabs2onePriv);
+    priv->folder = NULL;
+    priv->filename = NULL;
+    priv->uri = NULL;
+
+    return priv;
+}
+
+void tabs2one_private_destroy (tabs2onePriv* priv)
+{
+    katze_assign (priv->folder, NULL);
+    katze_assign (priv->filename, NULL);
+    katze_assign (priv->uri, NULL);
+    g_slice_free (tabs2onePriv, priv);
+}
+
+static void
+tabs2one_dom_click_restore_item_cb (WebKitDOMNode  *element,
+                                    WebKitDOMEvent *dom_event,
+                                    WebKitWebView  *webview);
+
+static void
+tabs2one_dom_click_remove_item_cb (WebKitDOMNode *element,
+                                   WebKitDOMEvent *dom_event,
+                                   WebKitWebView  *webview);
+
+static gchar*
+tabs2one_id_generator (void)
+{
+    GString* id = g_string_new("");
+    GRand* generator = g_rand_new();
+    gint32 id1 = g_rand_int_range (generator, 1000, 9999);
+    gint32 id2 = g_rand_int_range (generator, 1000, 9999);
+    g_rand_free(generator);
+    g_string_printf(id, "%i-%i", id1, id2);
+    return g_string_free(id, FALSE);
+}
+
+static void
+tabs2one_dom_create_item (WebKitDOMDocument* doc,
+                          const gchar* icon,
+                          const gchar* uri,
+                          const gchar* title)
+{
+    WebKitDOMElement* body = webkit_dom_document_query_selector(doc, "body", NULL);
+    WebKitDOMElement* item = webkit_dom_document_create_element(doc, "div", NULL);
+    WebKitDOMElement* favicon = webkit_dom_document_create_element(doc, "img", NULL);
+    WebKitDOMElement* link = webkit_dom_document_create_element(doc, "a", NULL);
+    WebKitDOMElement* close_link = webkit_dom_document_create_element(doc, "a", NULL);
+    WebKitDOMElement* close_button = webkit_dom_document_create_element (doc, "img", NULL);
+    WebKitDOMElement* br = webkit_dom_document_create_element(doc, "br", NULL);
+    WebKitDOMText* content = webkit_dom_document_create_text_node(doc, title);
+
+    webkit_dom_element_set_attribute(item, "id", tabs2one_id_generator(), NULL);
+    webkit_dom_element_set_attribute(item, "class", "item", NULL);
+    webkit_dom_element_set_attribute(item, "style", "padding: 5px;", NULL);
+
+    webkit_dom_element_set_attribute(close_link, "class", "close-link", NULL);
+    webkit_dom_element_set_attribute(close_link, "target", "_blank", NULL);
+    webkit_dom_element_set_attribute(close_link, "href", "about:blank", NULL);
+    webkit_dom_element_set_attribute(close_button, "src", "res://close.png", NULL);
+    webkit_dom_element_set_attribute(close_button, "width", "16px", NULL);
+    webkit_dom_element_set_attribute(close_button, "height", "16px", NULL);
+
+    webkit_dom_element_set_attribute(favicon, "src", icon, NULL);
+    webkit_dom_element_set_attribute(favicon, "width", "16px", NULL);
+    webkit_dom_element_set_attribute(favicon, "height", "16px", NULL);
+    webkit_dom_element_set_attribute(favicon, "style", "padding-left: 5px;", NULL);
+
+    webkit_dom_element_set_attribute(link, "class", "restore-link",NULL);
+    webkit_dom_element_set_attribute(link, "href", uri, NULL);
+    webkit_dom_element_set_attribute(link, "style", "padding-left: 5px;", NULL);
+    webkit_dom_element_set_attribute(link, "target", "_blank", NULL);
+
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(link), WEBKIT_DOM_NODE(content), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(item), WEBKIT_DOM_NODE(close_link), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(close_link), WEBKIT_DOM_NODE(close_button), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(item), WEBKIT_DOM_NODE(favicon), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(item), WEBKIT_DOM_NODE(link), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(item), WEBKIT_DOM_NODE(br), NULL);
+    webkit_dom_node_append_child(WEBKIT_DOM_NODE(body), WEBKIT_DOM_NODE(item), NULL);
+}
+
+static void
+tabs2one_cache_create_dir (void)
+{
+    midori_paths_mkdir_with_parents (priv->folder, 0700);
+}
+
+static gchar*
+tabs2one_cache_get_filename (void)
+{
+    return priv->filename;
+}
+
+static gchar*
+tabs2one_cache_get_uri (void)
+{
+    return priv->uri;
+}
+
+static bool
+tabs2one_cache_exist (void)
+{
+    return g_file_test (priv->filename, G_FILE_TEST_EXISTS);
+}
+
+static gboolean
+tabs2one_is_uri_tabs2one_tab (const gchar* uri)
+{
+    return g_str_equal (uri, tabs2one_cache_get_uri ());
+}
+
+static void
+tabs2one_dom_add_click_listeners (WebKitDOMDocument* doc,
+                                  WebKitWebView* webview)
+{
+    WebKitDOMNodeList *elements = webkit_dom_document_query_selector_all(doc, ".restore-link", NULL);
+
+    int i;
+
+    for (i = 0; i < webkit_dom_node_list_get_length(elements); i++)
+    {
+        WebKitDOMNode *element = webkit_dom_node_list_item(elements, i);
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(element), "click",
+            G_CALLBACK (tabs2one_dom_click_restore_item_cb), TRUE, webview);
+    }
+
+    elements = webkit_dom_document_query_selector_all(doc, ".close-link", NULL);
+    for (i = 0; i < webkit_dom_node_list_get_length(elements); i++)
+    {
+        WebKitDOMNode *element = webkit_dom_node_list_item(elements, i);
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(element), "click",
+            G_CALLBACK (tabs2one_dom_click_remove_item_cb), TRUE, webview);
+    }
+}
+
+static bool
+tabs2one_cache_write_file (WebKitWebView* webview)
+{
+    WebKitDOMDocument* doc = webkit_web_view_get_dom_document(webview);
+    WebKitDOMHTMLDocument* dochtml = (WebKitDOMHTMLDocument*)doc;
+    WebKitDOMHTMLElement* elementhtml = (WebKitDOMHTMLElement*)dochtml;
+    const gchar* content = webkit_dom_html_element_get_inner_html(elementhtml);
+    if (content == NULL)
+        return FALSE;
+
+    tabs2one_dom_add_click_listeners (doc, webview);
+
+    return g_file_set_contents(tabs2one_cache_get_filename (), content, -1, NULL);
+}
+
+static void
+tabs2one_onload_create_items_cb(WebKitWebView*  webview,
+                                WebKitWebFrame* webframe,
+                                MidoriBrowser*  browser)
+{
+    WebKitDOMDocument* doc = webkit_web_view_get_dom_document(webview);
+
+    const gchar* icon;
+    const gchar* title;
+    const gchar* uri;
+
+    GList* tabs = midori_browser_get_tabs (browser);
+    for (; tabs; tabs = g_list_next (tabs))
+    {
+        icon = midori_view_get_icon_uri (tabs->data);
+        if (icon == NULL) icon = "";
+        title = midori_view_get_display_title (tabs->data);
+        uri = midori_view_get_display_uri (tabs->data);
+
+        if (!tabs2one_is_uri_tabs2one_tab (uri))
+        {
+            if (!midori_uri_is_blank (uri))
+                tabs2one_dom_create_item(doc, icon, uri, title);
+        }
+    }
+
+
+    if (tabs2one_cache_write_file (webview))
+    {
+        tabs = midori_browser_get_tabs (browser);
+        while ((tabs = g_list_next (tabs)))
+            midori_browser_close_tab (browser, tabs->data);
+
+        tabs2one_dom_add_click_listeners (doc, webview);
+        midori_browser_set_current_uri (browser, tabs2one_cache_get_uri ());
+    }
+
+    g_list_free(tabs);
+}
+
+static void
+tabs2one_reload_connected_events_cb(WebKitWebView*  webview,
+                                    WebKitWebFrame* frame,
+                                    MidoriView*     view)
+{
+    const gchar* uri = midori_view_get_display_uri(view);
+
+    if (tabs2one_is_uri_tabs2one_tab (uri))
+    {
+        WebKitDOMDocument* doc = webkit_web_view_get_dom_document(webview);
+        tabs2one_dom_add_click_listeners (doc, webview);
+    }
+}
+
+
+static void
+tabs2one_add_tab_cb (MidoriBrowser*   browser,
+                     MidoriView*      view,
+                     MidoriExtension* extension)
+{
+    WebKitWebView* webview = WEBKIT_WEB_VIEW (midori_view_get_web_view(view));
+    g_signal_connect (webview, "document-load-finished",
+        G_CALLBACK (tabs2one_reload_connected_events_cb), view);
+}
+
+static void
+tabs2one_dom_click_restore_item_cb (WebKitDOMNode  *element,
+                                    WebKitDOMEvent *dom_event,
+                                    WebKitWebView  *webview)
+{
+    webkit_dom_event_prevent_default (dom_event);
+    MidoriView* view = midori_view_get_for_widget (GTK_WIDGET (webview));
+    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (webview));
+    WebKitDOMNode* item = webkit_dom_node_get_parent_node (element);
+    WebKitDOMNode* body = webkit_dom_node_get_parent_node (item);
+    const gchar* uri = webkit_dom_element_get_attribute(WEBKIT_DOM_ELEMENT(element), "href");
+    midori_browser_add_uri (browser, uri);
+
+    WebKitDOMDocument* doc = webkit_web_view_get_dom_document (webview);
+    webkit_dom_node_remove_child(body, item, NULL);
+    tabs2one_cache_write_file (webview);
+
+    WebKitDOMNodeList *elements = webkit_dom_document_query_selector_all(doc, ".restore-link", NULL);
+    if (webkit_dom_node_list_get_length(elements) <= 0){
+        midori_browser_close_tab(browser, GTK_WIDGET(view));
+    }
+}
+
+static void
+tabs2one_dom_click_remove_item_cb (WebKitDOMNode  *element,
+                                   WebKitDOMEvent *dom_event,
+                                   WebKitWebView  *webview)
+{
+    webkit_dom_event_prevent_default (dom_event);
+    MidoriView* view = midori_view_get_for_widget (GTK_WIDGET (webview));
+    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (webview));
+    WebKitDOMNode* item = webkit_dom_node_get_parent_node (element);
+    WebKitDOMNode* body = webkit_dom_node_get_parent_node (item);
+
+    WebKitDOMDocument* doc = webkit_web_view_get_dom_document (webview);
+    webkit_dom_node_remove_child(body, item, NULL);
+    tabs2one_cache_write_file (webview);
+
+    WebKitDOMNodeList *elements = webkit_dom_document_query_selector_all(doc, ".close-link", NULL);
+    if (webkit_dom_node_list_get_length(elements) <= 0){
+        midori_browser_close_tab(browser, GTK_WIDGET(view));
+    }
+}
+
+static void
+tabs2one_apply_cb (GtkWidget*     menuitem,
+                   MidoriBrowser* browser)
+{
+    GtkWidget* tab = NULL;
+
+    if (!tabs2one_cache_exist ())
+    {
+        GString* tpl = g_string_new ("<html>\n<title>");
+
+        g_string_append_printf (tpl, "%s", _("Tabs to One"));
+        g_string_append (tpl, "</title>\n<head><meta charset=\"utf-8\"></head><body>\n");
+        g_string_append_printf (tpl, "<h2>%s</h2>\n", _("Tabs you collected so far"));
+        g_string_append_printf (tpl, "<div><span>%s</span></div>\n", _("Clicking an item restores a tab."));
+        g_string_append (tpl, "</body>\n</html>\n");
+
+        g_file_set_contents(tabs2one_cache_get_filename (), g_string_free (tpl, FALSE), -1, NULL);
+    }
+
+    tab = midori_browser_add_uri (browser, tabs2one_cache_get_uri ());
+
+    WebKitWebView* webview = WEBKIT_WEB_VIEW (midori_view_get_web_view(MIDORI_VIEW (tab)));
+    midori_browser_set_current_tab (browser, tab);
+
+     g_signal_connect (webview, "document-load-finished",
+        G_CALLBACK (tabs2one_onload_create_items_cb), browser);
+}
+
+static void
+tabs2one_app_add_browser_cb (MidoriApp*       app,
+                             MidoriBrowser*   browser,
+                             MidoriExtension* extension);
+
+static void
+tabs2one_browser_populate_tool_menu_cb (MidoriBrowser*   browser,
+                                        GtkWidget*       menu,
+                                        MidoriExtension* extension)
+{
+    GtkWidget* menuitem = gtk_menu_item_new_with_mnemonic (_("Tabs to _One"));
+
+    g_signal_connect (menuitem, "activate",
+        G_CALLBACK (tabs2one_apply_cb), browser);
+    gtk_widget_show (menuitem);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+}
+
+static void
+tabs2one_deactivate_cb (MidoriExtension* extension,
+                        MidoriBrowser*   browser)
+{
+    MidoriApp* app = midori_extension_get_app (extension);
+
+    g_signal_handlers_disconnect_by_func (
+        browser, tabs2one_browser_populate_tool_menu_cb, extension);
+    g_signal_handlers_disconnect_by_func (
+        extension, tabs2one_deactivate_cb, browser);
+    g_signal_handlers_disconnect_by_func (
+        app, tabs2one_app_add_browser_cb, extension);
+    g_signal_handlers_disconnect_by_func (
+        browser, tabs2one_add_tab_cb, extension);
+
+    tabs2one_private_destroy (priv);
+}
+
+static void
+tabs2one_app_add_browser_cb (MidoriApp*       app,
+                             MidoriBrowser*   browser,
+                             MidoriExtension* extension)
+{
+    g_signal_connect (browser, "populate-tool-menu",
+        G_CALLBACK (tabs2one_browser_populate_tool_menu_cb), extension);
+    g_signal_connect (extension, "deactivate",
+        G_CALLBACK (tabs2one_deactivate_cb), browser);
+    g_signal_connect_after (browser, "add-tab",
+        G_CALLBACK (tabs2one_add_tab_cb), extension);
+
+    tabs2one_cache_create_dir();
+}
+
+static void
+tabs2one_activate_cb (MidoriExtension* extension,
+                      MidoriApp*       app)
+{
+    const gchar* config_dir = midori_extension_get_config_dir (extension);
+    priv = tabs2one_private_new ();
+    KatzeArray* browsers;
+    MidoriBrowser* browser;
+    gchar* filename, *uri;
+
+    filename = g_build_filename (config_dir, "tabs2one.html", NULL);
+    uri = g_filename_to_uri (filename, NULL, NULL);
+
+    priv->filename = g_strdup (filename);
+    priv->uri = g_strdup (uri);
+    priv->folder = g_strdup (config_dir);
+
+    browsers = katze_object_get_object (app, "browsers");
+    KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
+        tabs2one_app_add_browser_cb (app, browser, extension);
+    g_object_unref (browsers);
+    g_signal_connect (app, "add-browser",
+        G_CALLBACK (tabs2one_app_add_browser_cb), extension);
+
+    g_free (filename);
+    g_free (uri);
+}
+
+MidoriExtension*
+extension_init (void)
+{
+    MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
+        "name", _("Tabs to One"),
+        "description", _("Closes all open tabs and creates new tab with tabs links"),
+        "version", "0.1" MIDORI_VERSION_SUFFIX,
+        "authors", "Eder Sosa <eder.sohe@gmail.com>",
+        NULL);
+
+    g_signal_connect (extension, "activate",
+        G_CALLBACK (tabs2one_activate_cb), NULL);
+
+    return extension;
+}
index 8966a70e06eec027ac06b305cabc2637b9d6a5b6..5aebc0581c91c3bf3cc9046e7d4d4169e9fd2ba2 100644 (file)
@@ -32,6 +32,12 @@ typedef struct
        MidoriBrowser *browser;
 } TBEditorWidget;
 
+typedef struct
+{
+       GSList *used_items, *all_items;
+       TBEditorWidget *tbw;
+} TBEditorWindow;
+
 enum
 {
        TB_EDITOR_COL_ACTION,
@@ -40,6 +46,8 @@ enum
        TB_EDITOR_COLS_MAX
 };
 
+static TBEditorWindow  *tbe_window=NULL;
+
 static const GtkTargetEntry tb_editor_dnd_targets[] =
 {
        { "MIDORI_TB_EDITOR_ROW", 0, 0 }
@@ -104,12 +112,8 @@ 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++;
        }
@@ -177,7 +181,6 @@ static void tb_editor_btn_remove_clicked_cb(GtkWidget *button, TBEditorWidget *t
        if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used))
        {
                gtk_tree_model_get(model_used, &iter_used, TB_EDITOR_COL_ACTION, &action_name, -1);
-               if (g_strcmp0(action_name, "Location") != 0)
                {
                        if (gtk_list_store_remove(tbw->store_used, &iter_used))
                                gtk_tree_selection_select_iter(selection_used, &iter_used);
@@ -286,10 +289,6 @@ static void tb_editor_drag_data_rcvd_cb(GtkWidget *widget, GdkDragContext *conte
 
                text = (gchar*) gtk_selection_data_get_data (data);
 
-               /* We allow re-ordering the Location item but not removing it from the list. */
-               if (g_strcmp0(text, "Location") == 0 && widget != tbw->drag_source)
-                       return;
-
                is_sep = (g_strcmp0(text, "Separator") == 0);
                /* If the source of the action is equal to the target, we do just re-order and so need
                 * to delete the separator to get it moved, not just copied. */
@@ -514,64 +513,81 @@ static TBEditorWidget *tb_editor_create_dialog(MidoriBrowser *parent)
        return tbw;
 }
 
+static void tb_editor_response_cb(GtkWidget* inDialog,
+                                                                       gint inResponse,
+                                                                       gpointer inUserData)
+{
+       gtk_widget_destroy(tbe_window->tbw->dialog);
+
+       g_slist_foreach(tbe_window->used_items, (GFunc) g_free, NULL);
+       g_slist_foreach(tbe_window->all_items, (GFunc) g_free, NULL);
+       g_slist_free(tbe_window->used_items);
+       g_slist_free(tbe_window->all_items);
+       tb_editor_free_path(tbe_window->tbw);
+       g_free(tbe_window->tbw);
+
+       g_free(tbe_window);
+       tbe_window=NULL;
+}
 
 static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, MidoriBrowser *browser)
 {
-       GSList *node, *used_items, *all_items;
-       GtkTreeIter iter;
-       GtkTreePath *path;
-       TBEditorWidget *tbw;
+       /* create toolbar-editor window if not available */
+       if(tbe_window==NULL)
+       {
+               GSList *node;
+               GtkTreeIter iter;
+               GtkTreePath *path;
 
-       /* read the current active toolbar items */
-       used_items = tb_editor_parse_active_items(browser);
+               /* create storage for window data */
+               tbe_window=g_new0(TBEditorWindow, 1);
 
-       /* get all available actions */
-       all_items = tb_editor_get_available_actions(browser);
+               /* read the current active toolbar items */
+               tbe_window->used_items = tb_editor_parse_active_items(browser);
 
-       /* create the GUI */
-       tbw = tb_editor_create_dialog(browser);
+               /* get all available actions */
+               tbe_window->all_items = tb_editor_get_available_actions(browser);
 
-       /* cache some pointers, this is safe enough since the dialog is run modally */
-       tbw->action_group = midori_browser_get_action_group(browser);
-       tbw->browser = browser;
+               /* create the GUI */
+               tbe_window->tbw = tb_editor_create_dialog(browser);
 
-       /* fill the stores */
-       for (node = all_items; node != NULL; node = node->next)
-       {
-               if (strcmp(node->data, "Separator") == 0 ||
-                       g_slist_find_custom(used_items, node->data, (GCompareFunc) strcmp) == NULL)
+               /* cache some pointers, this is safe enough since the dialog is run modally */
+               tbe_window->tbw->action_group = midori_browser_get_action_group(browser);
+               tbe_window->tbw->browser = browser;
+
+               /* fill the stores */
+               for (node = tbe_window->all_items; node != NULL; node = node->next)
                {
-                       gtk_list_store_append(tbw->store_available, &iter);
-                       tb_editor_set_item_values(tbw, node->data, tbw->store_available, &iter);
+                       if (strcmp(node->data, "Separator") == 0 ||
+                               g_slist_find_custom(tbe_window->used_items, node->data, (GCompareFunc) strcmp) == NULL)
+                       {
+                               gtk_list_store_append(tbe_window->tbw->store_available, &iter);
+                               tb_editor_set_item_values(tbe_window->tbw, node->data, tbe_window->tbw->store_available, &iter);
+                       }
                }
+               for (node = tbe_window->used_items; node != NULL; node = node->next)
+               {
+                       gtk_list_store_append(tbe_window->tbw->store_used, &iter);
+                       tb_editor_set_item_values(tbe_window->tbw, node->data, tbe_window->tbw->store_used, &iter);
+               }
+               /* select first item */
+               path = gtk_tree_path_new_from_string("0");
+               gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbe_window->tbw->tree_used), path);
+               gtk_tree_path_free(path);
+
+               /* connect the changed signals after populating the store */
+               g_signal_connect(tbe_window->tbw->store_used, "row-changed",
+                       G_CALLBACK(tb_editor_available_items_changed_cb), tbe_window->tbw);
+               g_signal_connect(tbe_window->tbw->store_used, "row-deleted",
+                       G_CALLBACK(tb_editor_available_items_deleted_cb), tbe_window->tbw);
+
+               /* connect signal for detecting window close */
+               g_signal_connect(tbe_window->tbw->dialog, "response", G_CALLBACK (tb_editor_response_cb), NULL);
        }
-       for (node = used_items; node != NULL; node = node->next)
-       {
-               gtk_list_store_append(tbw->store_used, &iter);
-               tb_editor_set_item_values(tbw, node->data, tbw->store_used, &iter);
-       }
-       /* select first item */
-       path = gtk_tree_path_new_from_string("0");
-       gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path);
-       gtk_tree_path_free(path);
-
-       /* connect the changed signals after populating the store */
-       g_signal_connect(tbw->store_used, "row-changed",
-               G_CALLBACK(tb_editor_available_items_changed_cb), tbw);
-       g_signal_connect(tbw->store_used, "row-deleted",
-               G_CALLBACK(tb_editor_available_items_deleted_cb), tbw);
 
-       /* run it */
-       gtk_dialog_run(GTK_DIALOG(tbw->dialog));
-
-       gtk_widget_destroy(tbw->dialog);
-
-       g_slist_foreach(used_items, (GFunc) g_free, NULL);
-       g_slist_foreach(all_items, (GFunc) g_free, NULL);
-       g_slist_free(used_items);
-       g_slist_free(all_items);
-       tb_editor_free_path(tbw);
-       g_free(tbw);
+       /* show dialog and make it modal */
+       gtk_window_set_modal(GTK_WINDOW(tbe_window->tbw->dialog), TRUE);
+       gtk_widget_show_all(tbe_window->tbw->dialog);
 }
 
 static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu,
index e5c6a92413e51896c9503218df8dbe290c7e7723..098c355ead92dedcb10ac49e07b9450e76f94c1a 100644 (file)
@@ -14,15 +14,19 @@ namespace Gtk {
 }
 
 namespace Sokoke {
-    extern static bool show_uri (Gdk.Screen screen, string uri, uint32 timestamp) throws Error;
     extern static void widget_get_text_size (Gtk.Widget widget, string sample, out int width, out int height);
 }
 
 namespace Transfers {
     private class Transfer : GLib.Object {
+        internal uint poll_source = 0;
         internal WebKit.Download download;
 
-        internal signal void changed ();
+        internal virtual signal void changed ()
+        {
+            string tooltip = Midori.Download.calculate_tooltip (download);
+            this.set_data ("tooltip", tooltip);
+        }
         internal signal void remove ();
         internal signal void removed ();
 
@@ -51,27 +55,35 @@ namespace Transfers {
 #endif
 
         internal Transfer (WebKit.Download download) {
+            poll_source = Timeout.add(1000/10, () => {
+                changed ();
+                return true;
+            });
             this.download = download;
             #if HAVE_WEBKIT2
-            download.notify["estimated-progress"].connect (transfer_changed);
             download.finished.connect (() => {
                 succeeded = finished = true;
                 changed ();
+                Source.remove (poll_source);
+                poll_source = 0;
             });
             download.failed.connect (() => {
                 succeeded = false;
                 finished = true;
                 changed ();
+                Source.remove (poll_source);
+                poll_source = 0;
             });
             #else
-            download.notify["status"].connect (transfer_changed);
-            download.notify["progress"].connect (transfer_changed);
+            download.notify["status"].connect (() => {
+                changed ();
+                if (download.status == WebKit.DownloadStatus.FINISHED || download.status == WebKit.DownloadStatus.ERROR) {
+                    Source.remove (poll_source);
+                    poll_source = 0;
+                }
+            });
             #endif
         }
-
-        void transfer_changed (GLib.ParamSpec pspec) {
-            changed ();
-        }
     }
 
     static bool pending_transfers (Katze.Array array) {
@@ -174,8 +186,13 @@ namespace Transfers {
                 Transfer transfer;
                 store.get (iter, 0, out transfer);
 
-                if (Midori.Download.action_clear (transfer.download, treeview))
-                    transfer.remove ();
+                try {
+                    if (Midori.Download.action_clear (transfer.download, treeview))
+                        transfer.remove ();
+                } catch (Error error) {
+                    // Failure to open is the only known possibility here
+                    GLib.warning (_("Failed to open download: %s"), error.message);
+                }
             }
         }
 
@@ -198,7 +215,11 @@ namespace Transfers {
                 var menu = new Gtk.Menu ();
                 var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_OPEN, null);
                 menuitem.activate.connect (() => {
-                    Midori.Download.open (transfer.download, treeview);
+                    try {
+                        Midori.Download.open (transfer.download, treeview);
+                    } catch (Error error_open) {
+                        GLib.warning (_("Failed to open download: %s"), error_open.message);
+                    }
                 });
                 menuitem.sensitive = transfer.succeeded;
                 menu.append (menuitem);
@@ -206,7 +227,7 @@ namespace Transfers {
                 menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_DIRECTORY, Gtk.IconSize.MENU);
                 menuitem.activate.connect (() => {
                     var folder = GLib.File.new_for_uri (transfer.destination);
-                    Sokoke.show_uri (get_screen (), folder.get_parent ().get_uri (), 0);
+                    (Midori.Browser.get_for_widget (this).tab as Midori.Tab).open_uri (folder.get_parent ().get_uri ());
                 });
                 menu.append (menuitem);
                 menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Copy Link Loc_ation"));
@@ -232,7 +253,7 @@ namespace Transfers {
             return (transfer1.finished ? 1 : 0) - (transfer2.finished ? 1 : 0);
         }
 
-        void transfer_changed () {
+        void transfer_changed (GLib.Object item) {
             treeview.queue_draw ();
         }
 
@@ -241,7 +262,7 @@ namespace Transfers {
             Gtk.TreeIter iter;
             store.append (out iter);
             store.set (iter, 0, transfer);
-            transfer.changed.connect (transfer_changed);
+            transfer.changed.connect (() => transfer_changed (transfer));
             clear.sensitive = true;
         }
 
@@ -281,8 +302,7 @@ namespace Transfers {
 
             Transfer transfer;
             model.get (iter, 0, out transfer);
-            string tooltip = Midori.Download.get_tooltip (transfer.download);
-            renderer.set ("text", tooltip,
+            renderer.set ("text", transfer.get_data<string>("tooltip") ?? "",
                           "value", (int)(transfer.progress * 100));
         }
 
@@ -312,7 +332,7 @@ namespace Transfers {
             progress.show_text = true;
 #endif
             progress.ellipsize = Pango.EllipsizeMode.MIDDLE;
-            string filename = Path.get_basename (transfer.destination);
+            string filename = Midori.Download.get_basename_for_display (transfer.destination);
             progress.text = filename;
             int width;
             Sokoke.widget_get_text_size (progress, "M", out width, null);
@@ -336,13 +356,18 @@ namespace Transfers {
         }
 
         void button_clicked () {
-            if (Midori.Download.action_clear (transfer.download, button))
-                transfer.remove ();
+            try {
+                if (Midori.Download.action_clear (transfer.download, button))
+                    transfer.remove ();
+            } catch (Error error) {
+                // Failure to open is the only known possibility here
+                GLib.warning (_("Failed to open download: %s"), error.message);
+            }
         }
 
         void transfer_changed () {
             progress.fraction = Midori.Download.get_progress (transfer.download);
-            progress.tooltip_text = Midori.Download.get_tooltip (transfer.download);
+            progress.tooltip_text = transfer.get_data<string>("tooltip") ?? "";
             string stock_id = Midori.Download.action_stock_id (transfer.download);
             icon.set_from_stock (stock_id, Gtk.IconSize.MENU);
         }
@@ -411,6 +436,8 @@ namespace Transfers {
     private class Manager : Midori.Extension {
         internal Katze.Array array;
         internal GLib.List<Gtk.Widget> widgets;
+        internal GLib.List<string> notifications;
+        internal uint notification_timeout;
 
         void download_added (WebKit.Download download) {
             var transfer = new Transfer (download);
@@ -420,16 +447,36 @@ namespace Transfers {
             array.add_item (transfer);
         }
 
+        bool notification_timeout_triggered () {
+            notification_timeout = 0;
+            if (notifications.length () > 0) {
+                string filename = notifications.nth_data(0);
+                string msg;
+                if (notifications.length () == 1)
+                    msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
+                else
+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
+                get_app ().send_notification (_("Transfer completed"), msg);
+                notifications = new GLib.List<string> ();
+            }
+            return false;
+        }
+
         void transfer_changed (Transfer transfer) {
             if (transfer.succeeded) {
                 /* FIXME: The following 2 blocks ought to be done in core */
                 if (transfer.action == Midori.DownloadType.OPEN) {
-                    if (Midori.Download.action_clear (transfer.download, widgets.nth_data (0)))
-                        transfer.remove ();
+                    try {
+                        if (Midori.Download.action_clear (transfer.download, widgets.nth_data (0)))
+                            transfer.remove ();
+                    } catch (Error error) {
+                        // Failure to open is the only known possibility here
+                        GLib.warning (_("Failed to open download: %s"), error.message);
+                    }
                 }
 
                 string uri = transfer.destination;
-                string filename = Path.get_basename (uri);
+                string filename = Midori.Download.get_basename_for_display (uri);
                 var item = new Katze.Item ();
                 item.uri = uri;
                 item.name = filename;
@@ -437,8 +484,11 @@ namespace Transfers {
                 if (!Midori.Download.has_wrong_checksum (transfer.download))
                     Gtk.RecentManager.get_default ().add_item (uri);
 
-                string msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
-                get_app ().send_notification (_("Transfer completed"), msg);
+                notifications.append (filename);
+                if (notification_timeout == 0) {
+                    notification_timeout_triggered ();
+                    notification_timeout = Midori.Timeout.add_seconds (60, notification_timeout_triggered);
+                }
             }
         }
 
@@ -495,6 +545,8 @@ namespace Transfers {
         void activated (Midori.App app) {
             array = new Katze.Array (typeof (Transfer));
             widgets = new GLib.List<Gtk.Widget> ();
+            notifications = new GLib.List<string> ();
+            notification_timeout = 0;
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
             app.add_browser.connect (browser_added);
diff --git a/extensions/web-cache.c b/extensions/web-cache.c
deleted file mode 100644 (file)
index e95c509..0000000
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
- Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
-
- 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/midori.h>
-#include <glib/gstdio.h>
-#include <stdlib.h>
-
-#include "config.h"
-#if HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-#if !WEBKIT_CHECK_VERSION (1, 3, 11)
-
-#define MAXLENGTH 1024 * 1024
-
-static gchar*
-web_cache_get_cache_dir (void)
-{
-    static gchar* cache_dir = NULL;
-    if (!cache_dir)
-        cache_dir = g_build_filename (midori_paths_get_cache_dir (), "web", NULL);
-    return cache_dir;
-}
-
-static gchar*
-web_cache_get_cached_path (MidoriExtension* extension,
-                           const gchar*     uri)
-{
-    gchar* checksum;
-    gchar* folder;
-    gchar* sub_path;
-    gchar* encoded;
-    gchar* ext;
-    gchar* cached_filename;
-    gchar* cached_path;
-
-    checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-    folder = g_strdup_printf ("%c%c", checksum[0], checksum[1]);
-    sub_path = g_build_path (G_DIR_SEPARATOR_S,
-                             web_cache_get_cache_dir (), folder, NULL);
-    katze_mkdir_with_parents (sub_path, 0700);
-    g_free (folder);
-
-    encoded = soup_uri_encode (uri, "/");
-    ext = g_strdup (g_strrstr (encoded, "."));
-    /* Make sure ext isn't becoming too long */
-    if (ext && ext[0] && ext[1] && ext[2] && ext[3] && ext[4])
-        ext[4] = '\0';
-    cached_filename = g_strdup_printf ("%s%s", checksum, ext ? ext : "");
-    g_free (ext);
-    g_free (encoded);
-    g_free (checksum);
-    cached_path = g_build_filename (sub_path, cached_filename, NULL);
-    g_free (cached_filename);
-    return cached_path;
-}
-
-static gboolean
-web_cache_save_headers (SoupMessage* msg,
-                        gchar*       filename)
-{
-      gchar* dsc_filename = g_strdup_printf ("%s.dsc.tmp", filename);
-      SoupMessageHeaders* hdrs = msg->response_headers;
-      SoupMessageHeadersIter iter;
-      const gchar* name, *value;
-      FILE* dscfd;
-
-      soup_message_headers_iter_init (&iter, hdrs);
-      dscfd = g_fopen (dsc_filename, "w");
-      g_free (dsc_filename);
-      if (!dscfd)
-          return FALSE;
-
-      while (soup_message_headers_iter_next (&iter, &name, &value))
-          g_fprintf (dscfd, "%s: %s\n", name, value);
-      fclose (dscfd);
-
-      return TRUE;
-}
-
-static GHashTable*
-web_cache_get_headers (gchar* filename)
-{
-    GHashTable* headers;
-    FILE* file;
-    gchar* dsc_filename;
-    gchar line[128];
-
-    if (!filename)
-        return NULL;
-
-    /* use g_access() instead of g_file_test for better performance */
-    if (g_access (filename, F_OK) != 0)
-        return NULL;
-
-    dsc_filename = g_strdup_printf ("%s.dsc", filename);
-    headers = g_hash_table_new_full (g_str_hash, g_str_equal,
-                               (GDestroyNotify)g_free,
-                               (GDestroyNotify)g_free);
-
-    if (!(file = g_fopen (dsc_filename, "r")))
-    {
-        g_hash_table_destroy (headers);
-        g_free (dsc_filename);
-        return NULL;
-    }
-    while (fgets (line, 128, file))
-    {
-        gchar** data;
-
-        if (line == NULL)
-            continue;
-
-        g_strchomp (line);
-        data = g_strsplit (line, ":", 2);
-        if (data[0] && data[1])
-            g_hash_table_insert (headers, g_strdup (data[0]),
-                                 g_strdup (g_strchug (data[1])));
-        g_strfreev (data);
-    }
-    fclose (file);
-    g_free (dsc_filename);
-    return headers;
-}
-
-static GFile*
-web_cache_tmp_prepare (gchar* filename)
-{
-    GFile *file;
-
-    gchar* tmp_filename = g_strdup_printf ("%s.tmp", filename);
-    if (g_access (tmp_filename, F_OK) == 0)
-    {
-        g_free (tmp_filename);
-        return NULL;
-    }
-    file = g_file_new_for_path (tmp_filename);
-    g_free (tmp_filename);
-
-    return file;
-}
-
-static void
-web_cache_set_content_type (SoupMessage* msg,
-                            SoupBuffer*  buffer)
-{
-    gchar* sniffed_type;
-    SoupContentSniffer* sniffer = soup_content_sniffer_new ();
-    if ((sniffed_type = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL)))
-    {
-        g_signal_emit_by_name (msg, "content-sniffed", sniffed_type, NULL);
-        g_free (sniffed_type);
-    }
-    else
-    {
-        const gchar* content_type = soup_message_headers_get_one (
-            msg->response_headers, "Content-Type");
-        g_signal_emit_by_name (msg, "content-sniffed", content_type, NULL);
-    }
-}
-
-static void
-web_cache_message_finished_cb (SoupMessage*   msg,
-                               GOutputStream* stream)
-{
-    gchar* headers;
-    gchar* tmp_headers;
-    gchar* tmp_data;
-    gchar* filename;
-
-    filename = g_object_get_data (G_OBJECT (stream), "filename");
-    headers = g_strdup_printf ("%s.dsc", filename);
-    tmp_headers = g_strdup_printf ("%s.dsc.tmp", filename);
-    tmp_data = g_strdup_printf ("%s.tmp", filename);
-    g_output_stream_close (stream, NULL, NULL);
-
-    if (msg->status_code == SOUP_STATUS_OK)
-    {
-        g_rename (tmp_data, filename);
-        g_rename (tmp_headers, headers);
-    }
-    else
-    {
-        g_unlink (tmp_data);
-        g_unlink (tmp_headers);
-    }
-
-    g_object_unref (stream);
-    g_free (headers);
-    g_free (tmp_headers);
-    g_free (tmp_data);
-}
-
-static void web_cache_pause_message (SoupMessage* msg)
-{
-    SoupSession* session;
-    session = g_object_get_data (G_OBJECT (msg), "session");
-    soup_session_pause_message (session, msg);
-}
-
-static void web_cache_unpause_message (SoupMessage* msg)
-{
-    SoupSession* session;
-    session = g_object_get_data (G_OBJECT (msg), "session");
-    soup_session_unpause_message (session, msg);
-}
-
-static void
-web_cache_message_got_chunk_cb (SoupMessage* msg,
-                                SoupBuffer*  chunk,
-                                GOutputStream* stream)
-{
-    if (!chunk->data || !chunk->length)
-        return;
-    /* FIXME g_output_stream_write_async (stream, chunk->data, chunk->length,
-        G_PRIORITY_DEFAULT, NULL, NULL, (gpointer)chunk->length); */
-    g_output_stream_write (stream, chunk->data, chunk->length, NULL, NULL);
-}
-
-static void
-web_cache_message_rewrite_async_cb (GFile *file,
-                                    GAsyncResult* res,
-                                    SoupMessage*  msg)
-{
-    SoupBuffer *buffer;
-    char *data;
-    gsize length;
-    GError *error = NULL;
-
-    if (g_file_load_contents_finish (file, res, &data, &length, NULL, &error))
-    {
-        buffer = soup_buffer_new (SOUP_MEMORY_TEMPORARY, data, length);
-        web_cache_set_content_type (msg, buffer);
-        soup_message_body_append_buffer (msg->response_body, buffer);
-        /* FIXME? */
-        web_cache_unpause_message (msg);
-        g_signal_emit_by_name (msg, "got-chunk", buffer, NULL);
-        soup_buffer_free (buffer);
-        g_free (data);
-        soup_message_got_body (msg);
-        soup_message_finished (msg);
-    }
-    g_object_unref (file);
-    g_object_unref (msg);
-}
-
-static void
-web_cache_message_rewrite (SoupMessage*  msg,
-                           gchar*        filename)
-{
-    GHashTableIter iter;
-    gpointer key, value;
-    GFile *file;
-
-    GHashTable* cache_headers = web_cache_get_headers (filename);
-    if (!cache_headers)
-        return;
-
-    soup_message_set_status (msg, SOUP_STATUS_OK);
-    g_hash_table_iter_init (&iter, cache_headers);
-    while (g_hash_table_iter_next (&iter, &key, &value))
-        soup_message_headers_replace (msg->response_headers, key, value);
-    g_signal_emit_by_name (msg, "got-headers", NULL);
-    g_hash_table_destroy (cache_headers);
-
-    /* FIXME? It seems libsoup already said "goodbye" by the time
-       the asynchronous function is starting to send data */
-    web_cache_pause_message (msg);
-    file = g_file_new_for_path (filename);
-    g_free (filename);
-    g_object_ref (msg);
-    g_file_load_contents_async (file, NULL,
-        (GAsyncReadyCallback)web_cache_message_rewrite_async_cb, msg);
-}
-
-static void
-web_cache_mesage_got_headers_cb (SoupMessage* msg,
-                                 gchar*       filename)
-{
-    const gchar* nocache;
-    SoupMessageHeaders *hdrs = msg->response_headers;
-    const char* cl;
-
-    /* Skip files downloaded by the user */
-    if (g_object_get_data (G_OBJECT (msg), "midori-web-cache-download"))
-        return;
-
-    /* Skip big files */
-    cl = soup_message_headers_get_one (hdrs, "Content-Length");
-    if (cl && atoi (cl) > MAXLENGTH)
-        return;
-
-    nocache = soup_message_headers_get_one (hdrs, "Pragma");
-    if (!nocache)
-        nocache = soup_message_headers_get_one (hdrs, "Cache-Control");
-    if (nocache && g_regex_match_simple ("no-cache|no-store", nocache,
-                                         G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        return;
-    }
-
-    if (msg->status_code == SOUP_STATUS_NOT_MODIFIED)
-    {
-        /* g_debug ("loading from cache: %s", filename); */
-        g_signal_handlers_disconnect_by_func (msg,
-            web_cache_mesage_got_headers_cb, filename);
-        web_cache_message_rewrite (msg, filename);
-    }
-    else if (msg->status_code == SOUP_STATUS_OK)
-    {
-        GFile* file;
-        GOutputStream* ostream;
-
-        /* g_debug ("updating cache: %s", filename); */
-        if (!(file = web_cache_tmp_prepare (filename)))
-            return;
-        if (!web_cache_save_headers (msg, filename))
-            return;
-
-        ostream = (GOutputStream*)g_file_append_to (file,
-            G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL);
-        g_object_unref (file);
-
-        if (!ostream)
-            return;
-
-        g_object_set_data_full (G_OBJECT (ostream), "filename",
-                                filename, (GDestroyNotify)g_free);
-        g_signal_connect (msg, "got-chunk",
-            G_CALLBACK (web_cache_message_got_chunk_cb), ostream);
-        g_signal_connect (msg, "finished",
-            G_CALLBACK (web_cache_message_finished_cb), ostream);
-    }
-}
-
-static void
-web_cache_session_request_queued_cb (SoupSession*     session,
-                                     SoupMessage*     msg,
-                                     MidoriExtension* extension)
-{
-    SoupURI* soup_uri = soup_message_get_uri (msg);
-    gchar* uri = soup_uri_to_string (soup_uri, FALSE);
-
-    if (midori_uri_is_http (uri) && !g_strcmp0 (msg->method, "GET"))
-    {
-        gchar* filename = web_cache_get_cached_path (extension, uri);
-        GHashTable* cache_headers;
-        gchar* etag;
-        gchar* last_modified;
-
-        cache_headers = web_cache_get_headers (filename);
-        if (cache_headers)
-        {
-            etag = g_hash_table_lookup (cache_headers, "ETag");
-            last_modified = g_hash_table_lookup (cache_headers, "Last-Modified");
-            if (etag)
-                soup_message_headers_replace (msg->request_headers,
-                                             "If-None-Match", etag);
-            if (last_modified)
-                soup_message_headers_replace (msg->request_headers,
-                                              "If-Modified-Since", last_modified);
-            g_hash_table_destroy (cache_headers);
-        }
-        g_object_set_data (G_OBJECT (msg), "session", session);
-        g_signal_connect (msg, "got-headers",
-                G_CALLBACK (web_cache_mesage_got_headers_cb), filename);
-
-    }
-    g_free (uri);
-}
-
-static void
-web_cache_add_download_cb (MidoriBrowser*   browser,
-                           WebKitDownload*  download,
-                           MidoriExtension* extension)
-{
-    WebKitNetworkRequest* request = webkit_download_get_network_request (download);
-    SoupMessage* msg = webkit_network_request_get_message (request);
-    if (msg)
-        g_object_set_data (G_OBJECT (msg), "midori-web-cache-download",
-                           (gpointer)0xdeadbeef);
-}
-
-static void
-web_cache_deactivate_cb (MidoriExtension* extension,
-                         MidoriBrowser*   browser);
-
-static void
-web_cache_app_add_browser_cb (MidoriApp*       app,
-                              MidoriBrowser*   browser,
-                              MidoriExtension* extension)
-{
-    g_signal_connect (browser, "add-download",
-        G_CALLBACK (web_cache_add_download_cb), extension);
-    g_signal_connect (extension, "deactivate",
-        G_CALLBACK (web_cache_deactivate_cb), browser);
-}
-
-static void
-web_cache_deactivate_cb (MidoriExtension* extension,
-                         MidoriBrowser*   browser)
-{
-    MidoriApp* app = midori_extension_get_app (extension);
-    SoupSession* session = webkit_get_default_session ();
-
-    g_signal_handlers_disconnect_by_func (
-        session, web_cache_session_request_queued_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        extension, web_cache_deactivate_cb, browser);
-    g_signal_handlers_disconnect_by_func (
-        app, web_cache_app_add_browser_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, web_cache_add_download_cb, extension);
-}
-
-static void
-web_cache_activate_cb (MidoriExtension* extension,
-                       MidoriApp*       app)
-{
-    KatzeArray* browsers;
-    MidoriBrowser* browser;
-    SoupSession* session = webkit_get_default_session ();
-
-    katze_mkdir_with_parents (web_cache_get_cache_dir (), 0700);
-    g_signal_connect (session, "request-queued",
-                      G_CALLBACK (web_cache_session_request_queued_cb), extension);
-
-    browsers = katze_object_get_object (app, "browsers");
-    KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
-        web_cache_app_add_browser_cb (app, browser, extension);
-    g_signal_connect (app, "add-browser",
-        G_CALLBACK (web_cache_app_add_browser_cb), extension);
-
-    g_object_unref (browsers);
-}
-
-static void
-web_cache_clear_cache_cb (void)
-{
-    midori_paths_remove_path (web_cache_get_cache_dir ());
-}
-#endif
-
-MidoriExtension*
-extension_init (void)
-{
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
-    return NULL;
-    #else
-    MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
-        "name", _("Web Cache"),
-        "description", _("Cache HTTP communication on disk"),
-        "version", "0.1" MIDORI_VERSION_SUFFIX,
-        "authors", "Christian Dywan <christian@twotoasts.de>",
-        NULL);
-
-    g_signal_connect (extension, "activate",
-        G_CALLBACK (web_cache_activate_cb), NULL);
-
-    midori_private_data_register_item ("web-cache", _("Web Cache"),
-        G_CALLBACK (web_cache_clear_cache_cb));
-
-    return extension;
-    #endif
-}
diff --git a/extensions/webmedia-now-playing.vala b/extensions/webmedia-now-playing.vala
new file mode 100644 (file)
index 0000000..2800412
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ Copyright (C) 2014 James Axl <axlrose112@gmail.com>
+
+ 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 WebMedia {
+
+    private class Manager : Midori.Extension {
+        DbusService dbus_service { get; set; }
+        WebMediaNotify web_media_notify { get; set; }
+        string web_media_uri { get; set; }
+        string web_media_title { get; set; }
+        internal Manager () {
+            GLib.Object (name: _("Webmedia now-playing"),
+                         description: _("Share 'youtube, vimeo, dailymotion, coub and zippcast' that you are playing in Midori using org.midori.mediaHerald"),
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "James Axl <axlrose112@gmail.com>");
+            activate.connect (this.activated);
+            deactivate.connect (this.deactivated);
+        }
+
+        void youtube_validation (Object object,  ParamSpec pspec) {
+            var browser = object as Midori.Browser;
+            if(browser.uri == browser.title || browser.uri.contains(browser.title)) return;
+            if (web_media_uri == browser.uri) return;
+            if (web_media_title == browser.title) return;
+            web_media_uri = browser.uri;
+            web_media_title = browser.title;
+            try { 
+                    var youtube = new Regex("""(http|https)://www.youtube.com/watch\?v=[&=_\-A-Za-z0-9.\|]+""");
+                    var vimeo = new Regex("""(http|https)://vimeo.com/[0-9]+""");
+                    var dailymotion = new Regex("""(http|https)://www.dailymotion.com/video/[_\-A-Za-z0-9]+""");
+                    var coub = new Regex("""(http|https)://coub.com/view/[&=_\-A-Za-z0-9.\|]+""");
+                    var zippcast = new Regex("""(http|https)://www.zippcast.com/video/[&=_\-A-Za-z0-9.\|]+"""); 
+                    
+                    string website = null;
+                    if (web_media_uri.contains("youtube") || web_media_uri.contains("vimeo") || 
+                                               web_media_uri.contains ("dailymotion") || web_media_uri.contains ("coub") || 
+                                               web_media_uri.contains ("zippcast") ) {
+                        if (youtube.match(web_media_uri))
+                            website = "Youtube";
+                        else if (vimeo.match(web_media_uri))
+                            website = "Vimeo";
+                        else if (dailymotion.match(web_media_uri))
+                            website = "Dailymotion";
+                        else if (coub.match(web_media_uri))
+                            website = "Coub";
+                        else if (zippcast.match(web_media_uri))
+                            website = "ZippCast";   
+
+                        if (website != null) {
+                            dbus_service.video_title = web_media_title;
+                            web_media_notify.notify_media = website;
+                            web_media_notify.notify_video_title = web_media_title;
+                            dbus_service.video_uri = web_media_uri;
+                            web_media_notify.show_notify();
+                        }
+                    }
+            } catch(RegexError e) {
+                    warning ("%s", e.message);
+            }
+        }
+
+        void browser_added (Midori.Browser browser) {
+            browser.notify["title"].connect (youtube_validation);
+        }
+
+        void activated (Midori.App app) {
+            dbus_service = new DbusService();
+            web_media_notify = new WebMediaNotify(app);
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+            dbus_service.register_service();
+        }
+
+        void deactivated () {
+            var app = get_app ();
+            app.add_browser.disconnect (browser_added);
+            dbus_service.unregister_service();
+            foreach (var browser in app.get_browsers ())
+                browser.notify["title"].disconnect (youtube_validation);
+        }
+    }
+
+    [DBus (name = "org.midori.mediaHerald")]
+    public class DbusService : Object {
+        uint service { get; set; }
+        uint own_name_id { get; set; }
+        DBusConnection dbus_service_connection { get; set; }
+        public string video_title { get; set; }
+        public string video_uri { get; set; }
+
+        public DbusService() {
+            dbus_empty();
+        }
+        
+        public void dbus_empty() {
+            video_title = null;
+            video_uri = null;
+        }
+
+        public void register_service() {
+            own_name_id = Bus.own_name (BusType.SESSION, "org.midori.mediaHerald", BusNameOwnerFlags.NONE,
+                  on_bus_aquired,
+                  () => {},
+                  () => stderr.printf ("Could not acquire name\n"));
+        }
+
+        public void unregister_service() {
+            Bus.unown_name(own_name_id);
+            dbus_service_connection.unregister_object (service);
+        }
+
+        void on_bus_aquired (DBusConnection connection) {
+            try {
+                dbus_service_connection = connection;
+                service = connection.register_object ("/org/midori/mediaHerald", this);
+            } catch (IOError e) {
+                stderr.printf ("Could not register service\n");
+            }
+        }
+    }
+
+    public class WebMediaNotify : Object {
+        public Midori.App app { get; set; }
+        public string notify_video_title { get; set; }
+        public string notify_media { get; set; }
+
+        public WebMediaNotify (Midori.App app) {
+            Object (app: app);
+        }
+
+        public void show_notify () {
+            app.send_notification ("Midori is playing in " + notify_media, notify_video_title);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new WebMedia.Manager ();
+}
diff --git a/extensions/wscript_build b/extensions/wscript_build
deleted file mode 100644 (file)
index 11d1ab4..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import Options
-import os
-
-extensions = os.listdir ('extensions')
-for extension in extensions:
-    folder = 'extensions' + os.sep + extension
-    if os.path.isdir (folder):
-        files = os.listdir (folder)
-        target = extension
-        source = ''
-        for fila in files:
-            if fila[-2:] == '.c' or fila[-5:] == '.vala':
-                source += ' ' + extension + os.sep + fila
-        if not source:
-            Utils.pprint ('RED', folder + ': No source files found')
-            continue
-    else:
-        if extension[-2:] == '.c':
-            target = extension[:-2]
-        elif extension[-5:] == '.vala':
-            target = extension[:-5]
-        else:
-            continue
-        source = extension
-
-    # FIXME
-    if bld.env['HAVE_WEBKIT2'] and target in ['external-download-manager', 'nsplugin-manager', 'formhistory', 'adblock', 'cookie-permissions', 'addons', 'cookie-manager']:
-        continue
-
-    obj = bld.new_task_gen ('cc', 'shlib')
-    obj.target = target
-    obj.includes = '.. ../katze ../midori'
-    obj.source = source
-    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE'
-    if 'vala' in source:
-        obj.env.append_value ('CCFLAGS', '-w')
-        obj.vapi_dirs = '../midori ../katze'
-        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 midori midori-core katze'
-        if bld.env['HAVE_GTK3']:
-            obj.packages += ' gtk+-3.0'
-        else:
-            obj.packages += ' gtk+-2.0'
-        if bld.env['HAVE_WEBKIT2']:
-            obj.packages += ' webkit2gtk-3.0'
-        else:
-            obj.packages += ' webkitgtk-3.0'
-        if bld.env['HAVE_GRANITE']:
-            obj.packages += ' granite'
-    obj.install_path = '${LIBDIR}/midori'
-    # See LINKFLAGS in wscript: w/ o it we get several "undefined reference" errors
-    if bld.env['platform'] == 'win32':
-        obj.uselib_local = 'midori'
diff --git a/gir/CMakeLists.txt b/gir/CMakeLists.txt
new file mode 100644 (file)
index 0000000..24a6960
--- /dev/null
@@ -0,0 +1,15 @@
+# Copyright (C) 2013 Olivier Duchateau
+
+include (GIR)
+
+if (GIR_FOUND)
+    list (APPEND MODULES "Katze" "Midori")
+    foreach (MOD ${MODULES})
+        string(TOLOWER ${MOD} LOWER_MOD)
+        if (EXISTS "${CMAKE_SOURCE_DIR}/${LOWER_MOD}")
+            gir (${LOWER_MOD} ${MOD})
+        endif ()
+    endforeach ()
+else ()
+    message (FATAL_ERROR "g-ir-scanner not found")
+endif ()
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cda04cc
--- /dev/null
@@ -0,0 +1,13 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+macro(install_icon name cat size)
+    file(GLOB FILENAME RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${size}/${name}.*")
+    install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
+endmacro()
+
+foreach(SIZE 16x16 22x22 scalable)
+    install_icon(midori apps ${SIZE})
+    install_icon(extension categories ${SIZE})
+    install_icon(internet-news-reader status ${SIZE})
+endforeach()
+
diff --git a/icons/wscript_build b/icons/wscript_build
deleted file mode 100644 (file)
index 4e2345c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import Utils
-import os
-
-def add_image (bld, category, name):
-
-    srcdir = os.getcwd ()
-    blddir = bld.bdir
-
-    rsvg_convert = bld.env['RSVG_CONVERT']
-
-    if rsvg_convert:
-        Utils.check_dir (blddir + '/icons')
-
-    icon_sizes = [16, 22, 24, 32, 48]
-
-    for size in icon_sizes:
-        format = str (size) + 'x' + str (size)
-        if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK):
-            bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category,
-                               srcdir + '/icons/' + format + '/' + name + '.png')
-        elif not rsvg_convert:
-            pass
-        elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK):
-            Utils.check_dir (blddir + '/icons/' + format)
-            command = rsvg_convert + ' -w ' + str(size) + \
-                ' -h ' + str(size) + \
-                ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \
-                ' ' + srcdir + '/icons/scalable/' + name + '.svg'
-            if not Utils.exec_command (command):
-                bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category,
-                                   blddir + '/icons/' + format + '/' + name + '.png')
-            else:
-                Utils.pprint ('BLUE', "Optimized icons could not be created.")
-                break
-    bld.install_files ('${MDATADIR}/icons/hicolor/scalable/' + category,
-                       srcdir + '/icons/scalable/' + name + '.svg')
-
-add_image (bld, 'categories', 'extension')
-add_image (bld, 'apps', 'midori')
-add_image (bld, 'status', 'internet-news-reader')
index e8d79bb9baef7f5be88e80d90e901aa57654e6b9..4a15ba14b383231bbb17a20d252e1933d3cc9674 100644 (file)
@@ -29,52 +29,141 @@ sokoke_widget_set_pango_font_style (GtkWidget* widget,
     }
 }
 
+/* returns TRUE if the entry is currently showing its placeholder text */
 static gboolean
-sokoke_on_entry_focus_in_event (GtkEntry*      entry,
-                                GdkEventFocus* event,
-                                gpointer       userdata)
+sokoke_entry_is_showing_default (GtkEntry* entry)
+{
+    gint showing_default = GPOINTER_TO_INT (
+        g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"));
+
+    const gchar* text = gtk_entry_get_text (entry);
+    const gchar* default_text = (const gchar*)g_object_get_data (
+        G_OBJECT (entry), "sokoke_default_text");
+
+    return showing_default && !g_strcmp0(text, default_text);
+}
+
+/* returns TRUE if the entry is not being used by the user to perform entry or
+hold data at a given moment */
+static gboolean
+sokoke_entry_is_idle (GtkEntry* entry)
+{
+    const gchar* text = gtk_entry_get_text (entry);
+    
+    /* if the default is visible or the user has left the entry blank */
+    return sokoke_entry_is_showing_default(entry) ||
+        (text && !*text && !gtk_widget_has_focus (GTK_WIDGET (entry)));
+}
+
+static gboolean
+sokoke_on_entry_text_changed (GtkEntry*   entry,
+                              GParamSpec* pspec,
+                              gpointer    userdata);
+
+static void
+sokoke_hide_placeholder_text (GtkEntry* entry)
 {
-    gint has_default = GPOINTER_TO_INT (
-        g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
-    if (has_default)
+    if(sokoke_entry_is_showing_default (entry))
     {
-        g_object_set_data (G_OBJECT (entry), "sokoke_has_default",
-                           GINT_TO_POINTER (0));
+        g_signal_handlers_block_by_func (entry, sokoke_on_entry_text_changed, NULL);
         gtk_entry_set_text (entry, "");
-        sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
-                                            PANGO_STYLE_NORMAL);
+        g_signal_handlers_unblock_by_func (entry, sokoke_on_entry_text_changed, NULL);
     }
-    return FALSE;
+    g_object_set_data (G_OBJECT (entry), "sokoke_showing_default",
+                       GINT_TO_POINTER (0));
+    sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
+                                        PANGO_STYLE_NORMAL);
 }
 
 static gboolean
-sokoke_on_entry_focus_out_event (GtkEntry*      entry,
-                                 GdkEventFocus* event,
-                                 gpointer       userdata)
+sokoke_on_entry_focus_in_event (GtkEntry*      entry,
+                                GdkEventFocus* event,
+                                gpointer       userdata)
+{
+    sokoke_hide_placeholder_text (entry);
+    return FALSE;
+}
+
+static void
+sokoke_show_placeholder_text (GtkEntry* entry)
 {
+    /* no need to do work if the widget is unfocused with placeholder */
+    if(sokoke_entry_is_showing_default (entry))
+        return;
+
+    /* no need to do work if the placeholder is already visible */
     const gchar* text = gtk_entry_get_text (entry);
     if (text && !*text)
     {
         const gchar* default_text = (const gchar*)g_object_get_data (
             G_OBJECT (entry), "sokoke_default_text");
         g_object_set_data (G_OBJECT (entry),
-                           "sokoke_has_default", GINT_TO_POINTER (1));
+                           "sokoke_showing_default", GINT_TO_POINTER (1));
+        g_signal_handlers_block_by_func (entry, sokoke_on_entry_text_changed, NULL);
         gtk_entry_set_text (entry, default_text);
+        g_signal_handlers_unblock_by_func (entry, sokoke_on_entry_text_changed, NULL);
         sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
                                             PANGO_STYLE_ITALIC);
     }
-    return FALSE;
 }
 
 static void
-sokoke_on_entry_drag_data_received (GtkEntry*       entry,
-                                    GdkDragContext* drag_context,
-                                    gint            x,
-                                    gint            y,
-                                    guint           timestamp,
-                                    gpointer        user_data)
+sokoke_on_entry_drag_leave (GtkEntry*       entry,
+                             GdkDragContext* drag_context,
+                             guint           timestamp,
+                             gpointer        user_data)
+{
+    sokoke_show_placeholder_text (entry);
+}
+
+static gboolean
+sokoke_on_entry_text_changed (GtkEntry*   entry,
+                              GParamSpec* pspec,
+                              gpointer    userdata)
+{
+    if(sokoke_entry_is_idle (entry))
+    {
+        sokoke_show_placeholder_text (entry);
+    }
+    else
+    {
+        sokoke_hide_placeholder_text (entry);
+    }
+
+    return TRUE;
+}
+
+static gboolean
+sokoke_on_entry_focus_out_event (GtkEntry*      entry,
+                                 GdkEventFocus* event,
+                                 gpointer       userdata)
 {
-    sokoke_on_entry_focus_in_event (entry, NULL, NULL);
+    sokoke_show_placeholder_text (entry);
+    return FALSE;
+}
+
+static gboolean
+sokoke_on_entry_drag_motion (GtkEntry*       entry,
+                             GdkDragContext* drag_context,
+                             gint            x,
+                             gint            y,
+                             guint           timestamp,
+                             gpointer        user_data)
+{
+    sokoke_hide_placeholder_text (entry);
+    return FALSE;
+}
+
+static gboolean
+sokoke_on_entry_drag_drop (GtkEntry*       entry,
+                           GdkDragContext* drag_context,
+                           gint            x,
+                           gint            y,
+                           guint           timestamp,
+                           gpointer        user_data)
+{
+    sokoke_hide_placeholder_text (entry);
+    return FALSE;
 }
 
 void
@@ -86,23 +175,29 @@ gtk_entry_set_placeholder_text (GtkEntry*    entry,
     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));
+        g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (0));
     else if (!old_value)
     {
-        g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (1));
+        g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (1));
         sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
         gtk_entry_set_text (entry, default_text);
-        g_signal_connect (entry, "drag-data-received",
-            G_CALLBACK (sokoke_on_entry_drag_data_received), NULL);
+        g_signal_connect (entry, "drag-motion",
+            G_CALLBACK (sokoke_on_entry_drag_motion), NULL);
         g_signal_connect (entry, "focus-in-event",
             G_CALLBACK (sokoke_on_entry_focus_in_event), NULL);
+        g_signal_connect (entry, "drag-leave",
+            G_CALLBACK (sokoke_on_entry_drag_leave), NULL);
+        g_signal_connect (entry, "drag-drop",
+            G_CALLBACK (sokoke_on_entry_drag_drop), NULL);
         g_signal_connect (entry, "focus-out-event",
            G_CALLBACK (sokoke_on_entry_focus_out_event), NULL);
+        g_signal_connect (entry, "notify::text",
+            G_CALLBACK (sokoke_on_entry_text_changed), NULL);
     }
     else if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
     {
-        gint has_default = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
-        if (has_default)
+        gint showing_default = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"));
+        if (showing_default)
         {
             gtk_entry_set_text (entry, default_text);
             sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
index 3bf43011271df4c766226e7ed9528a958e5d8c40..eeb9b873f0043273074da05580ca3405ade8b786 100644 (file)
@@ -41,40 +41,6 @@ G_BEGIN_DECLS
         gtk_widget_get_preferred_size(wdgt, req, NULL)
 #endif
 
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-    #define G_SOURCE_REMOVE   FALSE
-    #define G_SOURCE_CONTINUE TRUE
-#endif
-
-#if !GLIB_CHECK_VERSION (2, 30, 0)
-    #define g_format_size(sz) g_format_size_for_display ((goffset)sz)
-#endif
-
-#if !GTK_CHECK_VERSION (2, 18, 0)
-    #define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget)
-    #define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget)
-    #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget)
-    #define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget)
-    #define gtk_widget_set_can_focus(widget,flag) \
-        GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS)
-    #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
-    #define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt)
-    #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
-    #define gtk_widget_set_window(wdgt, wndw) wdgt->window = wndw
-    #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
-    #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE
-    #define gtk_widget_set_has_window(wdgt, wnd) \
-        if (wnd) GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_NO_WINDOW); \
-        else GTK_WIDGET_SET_FLAGS (wdgt, GTK_NO_WINDOW)
-#endif
-
-#if !GTK_CHECK_VERSION (2, 20, 0)
-    #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget)
-    #define gtk_widget_set_realized(wdgt, real) \
-        if (real) GTK_WIDGET_SET_FLAGS (wdgt, GTK_REALIZED); \
-        else GTK_WIDGET_UNSET_FLAGS (wdgt, GTK_REALIZED)
-#endif
-
 #if GTK_CHECK_VERSION (3, 0, 0)
     #define GTK_DIALOG_NO_SEPARATOR 0
 #endif
@@ -84,15 +50,6 @@ G_BEGIN_DECLS
     const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
 #endif
 
-#if !GTK_CHECK_VERSION (2, 24 ,0)
-    #define gtk_combo_box_text_append_text gtk_combo_box_append_text
-    #define gtk_combo_box_text_new gtk_combo_box_new_text
-    #define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
-    #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
-    #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
-    #define GtkComboBoxText GtkComboBox
-#endif
-
 #ifndef GDK_KEY_Return
     #define GDK_KEY_0 GDK_0
     #define GDK_KEY_BackSpace GDK_BackSpace
index 602c16470b183f2c7be44b1f67022748b2c6473a..5fd980085c637ee5691761d1be016d350b35477d 100644 (file)
  * #KatzeArray is a type aware container for items.
  */
 
-struct _KatzeArray
-{
-    KatzeItem parent_instance;
+G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_ITEM);
 
+struct _KatzeArrayPrivate
+{
     GType type;
     GList* items;
 };
 
-struct _KatzeArrayClass
+enum
 {
-    KatzeItemClass parent_class;
-
-    /* Signals */
-    void
-    (*add_item)               (KatzeArray* array,
-                               gpointer    item);
-    void
-    (*remove_item)            (KatzeArray* array,
-                               gpointer    item);
-    void
-    (*move_item)              (KatzeArray* array,
-                               gpointer    item,
-                               gint        index);
-    void
-    (*clear)                  (KatzeArray* array);
-
-    void
-    (*update)                 (KatzeArray* array);
-};
+    PROP_0,
 
-G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_ITEM);
+    PROP_TYPE,
+
+    N_PROPERTIES
+};
 
 enum {
     ADD_ITEM,
@@ -79,6 +64,14 @@ _katze_array_update (KatzeArray* array)
 {
     g_object_set_data (G_OBJECT (array), "last-update",
                        GINT_TO_POINTER (time (NULL)));
+    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "bookmarks") && KATZE_IS_ITEM (array))
+    {
+        const gchar *name = katze_item_get_name (KATZE_ITEM (array));
+        if (name && *name)
+        {
+            g_print ("_katze_array_update: %s\n", name);
+        }
+    }
 }
 
 static void
@@ -90,7 +83,7 @@ _katze_array_add_item (KatzeArray* array,
     if (g_type_is_a (type, KATZE_TYPE_ITEM))
         katze_item_set_parent (item, array);
 
-    array->items = g_list_append (array->items, item);
+    array->priv->items = g_list_append (array->priv->items, item);
     _katze_array_update (array);
 }
 
@@ -98,7 +91,7 @@ static void
 _katze_array_remove_item (KatzeArray* array,
                           gpointer   item)
 {
-    array->items = g_list_remove (array->items, item);
+    array->priv->items = g_list_remove (array->priv->items, item);
 
     if (KATZE_IS_ITEM (item))
         katze_item_set_parent (item, NULL);
@@ -111,8 +104,8 @@ _katze_array_move_item (KatzeArray* array,
                         gpointer    item,
                         gint        position)
 {
-    array->items = g_list_remove (array->items, item);
-    array->items = g_list_insert (array->items, item, position);
+    array->priv->items = g_list_remove (array->priv->items, item);
+    array->priv->items = g_list_insert (array->priv->items, item, position);
     _katze_array_update (array);
 }
 
@@ -121,13 +114,34 @@ _katze_array_clear (KatzeArray* array)
 {
     GObject* item;
 
-    while ((item = g_list_nth_data (array->items, 0)))
+    while ((item = g_list_nth_data (array->priv->items, 0)))
         g_signal_emit (array, signals[REMOVE_ITEM], 0, item);
-    g_list_free (array->items);
-    array->items = NULL;
+    g_list_free (array->priv->items);
+    array->priv->items = NULL;
     _katze_array_update (array);
 }
 
+static void
+_katze_array_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+    KatzeArray *array = KATZE_ARRAY (object);
+
+    switch (property_id)
+    {
+        case PROP_TYPE:
+            array->priv->type = g_value_get_gtype (value);
+            break;
+
+        default:
+            /* We don't have any other property... */
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
 static void
 katze_array_class_init (KatzeArrayClass* class)
 {
@@ -211,19 +225,35 @@ katze_array_class_init (KatzeArrayClass* class)
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = katze_array_finalize;
+    gobject_class->set_property = _katze_array_set_property;
 
     class->add_item = _katze_array_add_item;
     class->remove_item = _katze_array_remove_item;
     class->move_item = _katze_array_move_item;
     class->clear = _katze_array_clear;
     class->update = _katze_array_update;
+
+
+    g_object_class_install_property (gobject_class,
+        PROP_TYPE,
+        g_param_spec_gtype (
+            "type",
+            "Type",
+            "The array item type",
+            G_TYPE_NONE,
+            G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
+
+    g_type_class_add_private (class, sizeof (KatzeArrayPrivate));
 }
 
 static void
 katze_array_init (KatzeArray* array)
 {
-    array->type = G_TYPE_OBJECT;
-    array->items = NULL;
+    array->priv = G_TYPE_INSTANCE_GET_PRIVATE (array,
+        KATZE_TYPE_ARRAY, KatzeArrayPrivate);
+
+    array->priv->type = G_TYPE_OBJECT;
+    array->priv->items = NULL;
 }
 
 static void
@@ -232,9 +262,9 @@ katze_array_finalize (GObject* object)
     KatzeArray* array = KATZE_ARRAY (object);
     GList* items;
 
-    for (items = array->items; items; items = g_list_next (items))
+    for (items = array->priv->items; items; items = g_list_next (items))
         g_object_unref (items->data);
-    g_list_free (array->items);
+    g_list_free (array->priv->items);
 
     G_OBJECT_CLASS (katze_array_parent_class)->finalize (object);
 }
@@ -248,7 +278,7 @@ katze_array_finalize (GObject* object)
  * The array will keep a reference on each object until
  * it is removed from the array.
  *
- * Return value: a new #KatzeArray
+ * Return value: (transfer full): a new #KatzeArray
  **/
 KatzeArray*
 katze_array_new (GType type)
@@ -257,8 +287,7 @@ katze_array_new (GType type)
 
     g_return_val_if_fail (g_type_is_a (type, G_TYPE_OBJECT), NULL);
 
-    array = g_object_new (KATZE_TYPE_ARRAY, NULL);
-    array->type = type;
+    array = g_object_new (KATZE_TYPE_ARRAY, "type", type, NULL);
 
     return array;
 }
@@ -271,7 +300,7 @@ katze_array_new (GType type)
  * Checks whether the array is compatible
  * with items of the specified type.
  *
- * Retur value: %TRUE if @array is compatible with @is_a_type
+ * Return value: %TRUE if @array is compatible with @is_a_type
  **/
 gboolean
 katze_array_is_a (KatzeArray* array,
@@ -279,13 +308,13 @@ katze_array_is_a (KatzeArray* array,
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), FALSE);
 
-    return g_type_is_a (array->type, is_a_type);
+    return g_type_is_a (array->priv->type, is_a_type);
 }
 
 /**
  * katze_array_add_item:
  * @array: a #KatzeArray
- * @item: an item
+ * @item: (type GObject) (transfer none): an item
  *
  * Adds an item to the array.
  *
@@ -303,7 +332,7 @@ katze_array_add_item (KatzeArray* array,
 /**
  * katze_array_remove_item:
  * @array: a #KatzeArray
- * @item: an item
+ * @item: (type GObject): an item
  *
  * Removes an item from the array.
  *
@@ -325,7 +354,7 @@ katze_array_remove_item (KatzeArray* array,
  *
  * Retrieves the item in @array at the position @n.
  *
- * Return value: an item, or %NULL
+ * Return value: (type GObject) (transfer none): an item, or %NULL
  **/
 gpointer
 katze_array_get_nth_item (KatzeArray* array,
@@ -333,7 +362,7 @@ katze_array_get_nth_item (KatzeArray* array,
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL);
 
-    return g_list_nth_data (array->items, n);
+    return g_list_nth_data (array->priv->items, n);
 }
 
 /**
@@ -342,24 +371,25 @@ katze_array_get_nth_item (KatzeArray* array,
  *
  * Determines whether @array is empty.
  *
- * Return value: an item, or %NULL
+ * Return value: %TRUE if the array is empty
  **/
 gboolean
 katze_array_is_empty (KatzeArray* array)
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE);
 
-    return !g_list_nth_data (array->items, 0);
+    return !g_list_nth_data (array->priv->items, 0);
 }
 
 /**
  * katze_array_get_item_index:
  * @array: a #KatzeArray
- * @item: an item in the array
+ * @item: (type GObject): an item in the array
  *
  * Retrieves the index of the item in @array.
  *
- * Return value: an item, or -1
+ * Return value: the index of the item, or -1 if the item is not
+ * present in the array
  **/
 gint
 katze_array_get_item_index (KatzeArray* array,
@@ -367,7 +397,7 @@ katze_array_get_item_index (KatzeArray* array,
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), -1);
 
-    return g_list_index (array->items, item);
+    return g_list_index (array->priv->items, item);
 }
 
 /**
@@ -377,20 +407,20 @@ katze_array_get_item_index (KatzeArray* array,
  *
  * 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 fail and return NULL if the #KatzeArray's
+ * element type is not based on #KatzeItem.
  *
  * 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
+ * Return value: (type GObject) (transfer none): an item, or %NULL
  **/
 gpointer
 katze_array_find_token (KatzeArray*  array,
                         const gchar* token)
 {
-    goffset token_length;
+    size_t token_length;
     GList* items;
 
     g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL);
@@ -401,7 +431,7 @@ katze_array_find_token (KatzeArray*  array,
     if (token_length < 1)
         token_length = strlen (token);
 
-    for (items = array->items; items; items = g_list_next (items))
+    for (items = array->priv->items; items; items = g_list_next (items))
     {
         const gchar* found_token = ((KatzeItem*)items->data)->token;
         if (found_token != NULL)
@@ -422,10 +452,10 @@ 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 fail and return NULL if the #KatzeArray's
+ * element type is not based on #KatzeItem.
  *
- * Return value: an item, or %NULL
+ * Return value: (type GObject) (transfer none): an item, or %NULL
  *
  * Since: 0.2.0
  **/
@@ -439,7 +469,7 @@ katze_array_find_uri (KatzeArray*  array,
     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))
+    for (items = array->priv->items; items; items = g_list_next (items))
     {
         const gchar* found_uri = ((KatzeItem*)items->data)->uri;
         if (found_uri != NULL && !strcmp (found_uri, uri))
@@ -454,20 +484,20 @@ katze_array_find_uri (KatzeArray*  array,
  *
  * Retrieves the number of items in @array.
  *
- * Return value: the length of the list
+ * Return value: the length of the #KatzeArray
  **/
 guint
 katze_array_get_length (KatzeArray* array)
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), 0);
 
-    return g_list_length (array->items);
+    return g_list_length (array->priv->items);
 }
 
 /**
  * katze_array_move_item:
  * @array: a #KatzeArray
- * @item: the item being moved
+ * @item: (type GObject): the item being moved
  * @position: the new position of the item
  *
  * Moves @item to the position @position.
@@ -490,7 +520,7 @@ katze_array_move_item (KatzeArray* array,
  *
  * Retrieves the items as a list.
  *
- * Return value: a newly allocated #GList of items
+ * Return value: (element-type GObject) (transfer container): a newly allocated #GList of items
  *
  * Since: 0.2.5
  **/
@@ -499,15 +529,23 @@ katze_array_get_items (KatzeArray* array)
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL);
 
-    return g_list_copy (array->items);
+    return g_list_copy (array->priv->items);
 }
 
+/**
+ * katze_array_peek_items:
+ * @array: a #KatzeArray
+ *
+ * Peeks at the KatzeArray's internal list of items.
+ *
+ * Return value: (element-type GObject) (transfer none): the #KatzeArray's internal #GList of items
+ **/
 GList*
 katze_array_peek_items (KatzeArray* array)
 {
     g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL);
 
-    return array->items;
+    return array->priv->items;
 }
 
 /**
index a2f601c47bdfbdf71bf813bb94ad1d8878c67757..ccc3ca06f871477a9690192a93e75535c92a15a9 100644 (file)
@@ -31,6 +31,36 @@ G_BEGIN_DECLS
 
 typedef struct _KatzeArray                       KatzeArray;
 typedef struct _KatzeArrayClass                  KatzeArrayClass;
+typedef struct _KatzeArrayPrivate                KatzeArrayPrivate;
+
+struct _KatzeArray
+{
+    KatzeItem parent_instance;
+
+    KatzeArrayPrivate* priv;
+};
+
+struct _KatzeArrayClass
+{
+    KatzeItemClass parent_class;
+
+    /* Signals */
+    void
+    (*add_item)               (KatzeArray* array,
+                               gpointer    item);
+    void
+    (*remove_item)            (KatzeArray* array,
+                               gpointer    item);
+    void
+    (*move_item)              (KatzeArray* array,
+                               gpointer    item,
+                               gint        index);
+    void
+    (*clear)                  (KatzeArray* array);
+
+    void
+    (*update)                 (KatzeArray* array);
+};
 
 GType
 katze_array_get_type               (void) G_GNUC_CONST;
index 9936134cb0b933af9a435a6bcb8e226518e4407d..354dcd39ca7b4910c08f837dd930ddfb891f72c8 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "katze-arrayaction.h"
 
+#include "midori/midori-platform.h"
 #include "katze-utils.h"
 #include "marshal.h"
 
@@ -51,6 +52,7 @@ enum
     POPULATE_POPUP,
     POPULATE_FOLDER,
     ACTIVATE_ITEM,
+    ACTIVATE_ITEM_NEW_TAB,
     ACTIVATE_ITEM_ALT,
     LAST_SIGNAL
 };
@@ -115,7 +117,7 @@ katze_array_action_class_init (KatzeArrayActionClass* class)
      * @menu: the menu shell being opened
      * @folder: the folder being opened
      *
-     * A context menu is going to be opened for @folder,
+     * A submenu is going to be opened for @folder,
      * the provided @menu can be populated accordingly.
      *
      * Unlike "populate-popup" this signal is emitted for
@@ -141,33 +143,50 @@ katze_array_action_class_init (KatzeArrayActionClass* class)
      * KatzeArrayAction::activate-item:
      * @array: the object on which the signal is emitted
      * @item: the item being activated
+     * @event: (allow-none): the event that caused the activation
      *
-     * An item was clicked with the first button.
-     *
-     * Deprecated: 0.2.8: Use "activate-item-alt" instead.
+     * An item was activated.
      **/
     signals[ACTIVATE_ITEM] = g_signal_new ("activate-item",
-                                       G_TYPE_FROM_CLASS (class),
-                                       (GSignalFlags) (G_SIGNAL_RUN_LAST),
-                                       0,
-                                       0,
-                                       NULL,
-                                       g_cclosure_marshal_VOID__OBJECT,
-                                       G_TYPE_NONE, 1,
-                                       KATZE_TYPE_ITEM);
+                                           G_TYPE_FROM_CLASS (class),
+                                           (GSignalFlags) (G_SIGNAL_RUN_LAST),
+                                           0,
+                                           0,
+                                           NULL,
+                                           g_cclosure_marshal_VOID__OBJECT,
+                                           G_TYPE_NONE, 1,
+                                           KATZE_TYPE_ITEM);
 
     /**
-     * KatzeArrayAction::activate-item-alt:
+     * KatzeArrayAction::activate-item-new-tab:
      * @array: the object on which the signal is emitted
      * @item: the item being activated
-     * @button: the mouse button pressed
+     * @event: (allow-none): the event that caused the activation
      *
-     * An item was clicked, with the specified @button.
+     * An item was activated and should be opened in a new tab.
      *
-     * Return value: %TRUE if the event was handled. If %FALSE is returned,
-     *               the default "activate-item" signal is emitted.
+     * Since: 0.5.10
+     **/
+    signals[ACTIVATE_ITEM_NEW_TAB] = g_signal_new ("activate-item-new-tab",
+                                                   G_TYPE_FROM_CLASS (class),
+                                                   (GSignalFlags) (G_SIGNAL_RUN_LAST),
+                                                   0,
+                                                   0,
+                                                   NULL,
+                                                   g_cclosure_marshal_VOID__OBJECT,
+                                                   G_TYPE_NONE, 1,
+                                                   KATZE_TYPE_ITEM);
+
+    /**
+     * KatzeArrayAction::activate-item-alt:
+     * @array: the object on which the signal is emitted
+     * @proxy: the %GtkWidget that caught the event
+     * @item: the item being activated
+     * @event: the mouse button pressed event
      *
-     * Since: 0.1.7
+     * The specified @button has been pressed (but not yet released) on the item.
+     *
+     * Return value: %TRUE if the event was handled.
      **/
     signals[ACTIVATE_ITEM_ALT] = g_signal_new ("activate-item-alt",
                                        G_TYPE_FROM_CLASS (class),
@@ -175,9 +194,9 @@ katze_array_action_class_init (KatzeArrayActionClass* class)
                                        0,
                                        0,
                                        NULL,
-                                       midori_cclosure_marshal_BOOLEAN__OBJECT_UINT,
-                                       G_TYPE_BOOLEAN, 2,
-                                       KATZE_TYPE_ITEM, G_TYPE_UINT);
+                                      midori_cclosure_marshal_BOOLEAN__OBJECT_OBJECT_POINTER,
+                                      G_TYPE_BOOLEAN, 3,
+                                       KATZE_TYPE_ITEM, GTK_TYPE_WIDGET, G_TYPE_POINTER);
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = katze_array_action_finalize;
@@ -287,14 +306,37 @@ katze_array_action_activate (GtkAction* action)
 
 static void
 katze_array_action_activate_item (KatzeArrayAction* action,
-                                  KatzeItem*        item,
-                                  gint              button)
+                                  KatzeItem*        item)
+{
+    g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item);
+}
+
+static void
+katze_array_action_activate_item_new_tab (KatzeArrayAction* action,
+                                          KatzeItem*        item)
+{
+    g_signal_emit (action, signals[ACTIVATE_ITEM_NEW_TAB], 0, item);
+}
+
+static gboolean
+katze_array_action_activate_item_alt (KatzeArrayAction* action,
+                                      KatzeItem*        item,
+                                      GdkEventButton*   event,
+                                      GtkWidget*        proxy)
 {
+    /* katze_array_action_activate_item emits the signal.
+     * It can result from "clicked" event where the button event
+     * is not provided.
+     */
+
     gboolean handled = FALSE;
+
+    g_assert (event);
+
     g_signal_emit (action, signals[ACTIVATE_ITEM_ALT], 0, item,
-                   button, &handled);
-    if (!handled)
-        g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item);
+                       proxy, event, &handled);
+
+    return handled;
 }
 
 static void
@@ -302,7 +344,26 @@ katze_array_action_menu_activate_cb  (GtkWidget*        proxy,
                                       KatzeArrayAction* array_action)
 {
     KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
-    katze_array_action_activate_item (array_action, item, 1);
+
+    GdkEvent* event = gtk_get_current_event();
+
+    if (event && MIDORI_EVENT_NEW_TAB (event))
+        katze_array_action_activate_item_new_tab (array_action, item);
+    else
+        katze_array_action_activate_item (array_action, item);
+
+    if (event)
+        gdk_event_free (event);
+}
+
+static gboolean
+katze_array_action_menu_item_button_press_cb (GtkWidget*        proxy,
+                                              GdkEventButton*   event,
+                                              KatzeArrayAction* array_action)
+{
+    KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
+
+    return katze_array_action_activate_item_alt (array_action, item, event, proxy);
 }
 
 static gboolean
@@ -310,22 +371,74 @@ katze_array_action_menu_button_press_cb (GtkWidget*        proxy,
                                          GdkEventButton*   event,
                                          KatzeArrayAction* array_action)
 {
-    KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
+    /* Override the button-press handler for menus which would
+       open a submenu to instead show a popup menu
+    */
 
-    katze_array_action_activate_item (array_action, item, event->button);
+    return katze_array_action_menu_item_button_press_cb (gtk_get_event_widget ((GdkEvent *) event), event, array_action);
+}
 
-    /* we need to block the 'activate' handler which would be called
-     * otherwise as well */
-    g_signal_handlers_block_by_func (proxy,
-        katze_array_action_menu_activate_cb, array_action);
+static gboolean
+katze_array_action_tool_item_child_button_press_cb (GtkWidget*        proxy,
+                                                                            GdkEventButton*   event,
+                                                                            KatzeArrayAction* array_action)
+{
+    GtkWidget* toolitem = gtk_widget_get_parent (proxy);
+    KatzeItem* item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
 
-    return TRUE;
+    /* Left button clicks (e.g. for activation) should not be handled until button release */
+    if (event->button == 1)
+        return FALSE;
+
+    return katze_array_action_activate_item_alt (array_action, item, event, proxy);
 }
 
 static void
 katze_array_action_menu_item_select_cb (GtkWidget*        proxy,
                                         KatzeArrayAction* array_action);
 
+static GtkWidget*
+katze_array_action_menu_item_new (KatzeArrayAction* array_action,
+                                  KatzeItem* item)
+{
+    GtkWidget* menuitem = katze_image_menu_item_new_ellipsized (
+        katze_item_get_name (item));
+    GtkWidget* image = katze_item_get_image (item, menuitem);
+
+    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);
+
+    g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
+
+    if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        GtkWidget* submenu = gtk_menu_new ();
+        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+        /* Handle popup menus on menuitems which have open submenus */
+        g_signal_connect (submenu, "button-press-event",
+            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
+        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
+    {
+        /* We need the 'activate' signal for actual item activation */
+        g_signal_connect (menuitem, "activate",
+            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
+    }
+
+    /* Connect to button-press-event to catch right-clicks to open popup menus.
+       Note that this is also necessary for menuitems which have submenus
+       but whose submenus are not open at present! */
+    g_signal_connect (menuitem, "button-press-event",
+        G_CALLBACK (katze_array_action_menu_item_button_press_cb), array_action);
+
+    return menuitem;
+}
+
 /**
  * katze_array_action_generate_menu:
  * @array_action: a #KatzeArrayAction
@@ -355,15 +468,13 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action,
     gint summand;
     KatzeItem* item;
     GtkWidget* menuitem;
-    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));
+        || GTK_IS_MENU_ITEM (proxy)
+        || GTK_IS_WINDOW (proxy));
 
     if (!KATZE_IS_ARRAY (array))
         return;
@@ -388,35 +499,19 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action,
             gtk_menu_shell_append (menu, menuitem);
             continue;
         }
-        menuitem = katze_image_menu_item_new_ellipsized (
-            katze_item_get_name (item));
-        image = katze_item_get_image (item, menuitem);
-        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);
-        gtk_menu_shell_append (menu, menuitem);
-        g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
+
+        menuitem = katze_array_action_menu_item_new (array_action, item);
+
         if (KATZE_ITEM_IS_FOLDER (item))
         {
-            submenu = gtk_menu_new ();
-            gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+            GtkWidget* submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem));
             /* 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
-        {
-            /* we need the 'activate' signal as well for keyboard events */
-            g_signal_connect (menuitem, "activate",
-                G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
-        }
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
+
         gtk_widget_show (menuitem);
+        gtk_menu_shell_append (menu, menuitem);
     }
 }
 
@@ -444,7 +539,7 @@ katze_array_action_menu_item_need_update (KatzeArrayAction* array_action,
     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)));
+        GINT_TO_POINTER (time (NULL)));
     return TRUE;
 }
 
@@ -476,13 +571,14 @@ katze_array_action_proxy_clicked_cb (GtkWidget*        proxy,
     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);
+                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)));
@@ -490,12 +586,6 @@ katze_array_action_proxy_clicked_cb (GtkWidget*        proxy,
         return;
     }
 
-    if (KATZE_IS_ITEM (array) && katze_item_get_uri ((KatzeItem*)array))
-    {
-        katze_array_action_activate_item (array_action, KATZE_ITEM (array), 1);
-        return;
-    }
-
     menu = gtk_menu_new ();
     gtk_menu_attach_to_widget (GTK_MENU (menu), proxy, NULL);
 
@@ -512,7 +602,7 @@ katze_array_action_proxy_clicked_cb (GtkWidget*        proxy,
     }
 
     katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu),
-                        NULL, KATZE_MENU_POSITION_LEFT);
+        NULL, KATZE_MENU_POSITION_LEFT);
     gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), TRUE);
     g_object_set_data (G_OBJECT (menu), "KatzeArrayAction", array_action);
     g_signal_connect (menu, "deactivate",
@@ -606,31 +696,9 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy,
 {
     KatzeArrayAction* array_action;
     GtkWidget* menuitem;
-    GtkWidget* image;
 
     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, menuitem);
-    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);
-    g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    if (KATZE_ITEM_IS_FOLDER (item))
-    {
-        GtkWidget* submenu = gtk_menu_new ();
-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-        g_signal_connect (menuitem, "select",
-            G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
-    }
-    else
-    {
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
-        /* we need the 'activate' signal as well for keyboard events */
-        g_signal_connect (menuitem, "activate",
-            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
-    }
+    menuitem = katze_array_action_menu_item_new (array_action, item);
     gtk_tool_item_set_proxy_menu_item (GTK_TOOL_ITEM (proxy),
         "katze-tool-item-menu", menuitem);
     return TRUE;
@@ -657,7 +725,7 @@ katze_array_action_toolitem_destroy_cb (GtkToolItem* toolitem,
  * Note that the label is reasonably ellipsized for you,
  * much like katze_image_menu_item_new_ellipsized().
  *
- * Return value: a new tool item
+ * Return value: (transfer full): a new tool item
  **/
 GtkToolItem*
 katze_array_action_create_tool_item_for (KatzeArrayAction* array_action,
@@ -706,9 +774,19 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action,
     else
         gtk_tool_item_set_tooltip_text (toolitem, uri);
 
-    g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item);
+    g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
     g_signal_connect (toolitem, "clicked",
         G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
+    if (KATZE_IS_ITEM (item))
+    {
+        /* Tool items block the "button-press-event" but we can get it
+         * when connecting it to the tool item's child widget
+         */
+
+        GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
+        g_signal_connect (child, "button-press-event",
+            G_CALLBACK (katze_array_action_tool_item_child_button_press_cb), array_action);
+    }
 
     g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action);
     g_signal_connect (item, "notify",
@@ -754,6 +832,14 @@ katze_array_action_disconnect_proxy (GtkAction* action,
         (action, proxy);
 }
 
+/**
+ * katze_array_action_get_array:
+ * @array_action: a #KatzeArrayAction
+ *
+ * Obtain the array which backs the array action.
+ *
+ * Return value: (transfer none): the KatzeArray used by @array_action
+ **/
 KatzeArray*
 katze_array_action_get_array (KatzeArrayAction* array_action)
 {
@@ -767,23 +853,25 @@ katze_array_action_set_array (KatzeArrayAction* array_action,
                               KatzeArray*       array)
 {
     GSList* proxies;
+    KatzeArray *old_array = NULL;
 
     g_return_if_fail (KATZE_IS_ARRAY_ACTION (array_action));
     g_return_if_fail (!array || katze_array_is_a (array, KATZE_TYPE_ITEM));
 
     /* FIXME: Disconnect old array */
 
+    old_array = array_action->array;
     if (array)
         g_object_ref (array);
     katze_object_assign (array_action->array, array);
 
     /* FIXME: Add and remove items dynamically */
     /*g_object_connect (array,
-        "signal-after::add-item",
-        katze_array_action_engines_add_item_cb, array_action,
-        "signal-after::remove-item",
-        katze_array_action_engines_remove_item_cb, array_action,
-        NULL);*/
+      "signal-after::add-item",
+      katze_array_action_engines_add_item_cb, array_action,
+      "signal-after::remove-item",
+      katze_array_action_engines_remove_item_cb, array_action,
+      NULL);*/
 
     g_object_notify (G_OBJECT (array_action), "array");
 
@@ -793,7 +881,15 @@ katze_array_action_set_array (KatzeArrayAction* array_action,
 
     do
     {
+        KatzeArray* item = g_object_get_data (G_OBJECT (proxies->data), "KatzeItem");
+
+        if (item && (item == old_array))
+            g_object_set_data (G_OBJECT (proxies->data), "KatzeItem", array);
+
         gtk_widget_set_sensitive (proxies->data, array != NULL);
     }
     while ((proxies = g_slist_next (proxies)));
+
+    if (array)
+        katze_array_update (KATZE_ARRAY (array));
 }
diff --git a/katze/katze-cellrenderercomboboxtext.c b/katze/katze-cellrenderercomboboxtext.c
new file mode 100644 (file)
index 0000000..b867b93
--- /dev/null
@@ -0,0 +1,495 @@
+/*
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+#include "katze-cellrenderercomboboxtext.h"
+
+#include "marshal.h"
+
+#include <string.h>
+#include <gdk/gdk.h>
+
+#define P_(String) (String)
+#define I_(String) (String)
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+
+static void
+katze_cell_renderer_combobox_text_finalize (GObject* object);
+
+static void
+katze_cell_renderer_combobox_text_get_property (GObject*    object,
+    guint       param_id,
+    GValue*     value,
+    GParamSpec* pspec);
+static void
+katze_cell_renderer_combobox_text_set_property (GObject*      object,
+    guint         param_id,
+    const GValue* value,
+    GParamSpec*   pspec);
+static void
+katze_cell_renderer_combobox_text_get_size (GtkCellRenderer* cell,
+    GtkWidget*       widget,
+#if GTK_CHECK_VERSION(3,0,0)
+    const GdkRectangle*      cell_area,
+#else
+    GdkRectangle*            cell_area,
+#endif
+    gint*            x_offset,
+    gint*            y_offset,
+    gint*            width,
+    gint*            height);
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
+    cairo_t*             cr,
+    GtkWidget            *widget,
+    const GdkRectangle   *background_area,
+    const GdkRectangle   *cell_area,
+    GtkCellRendererState  flags);
+#else
+static void
+katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
+    GdkDrawable          *window,
+    GtkWidget            *widget,
+    GdkRectangle         *background_area,
+    GdkRectangle         *cell_area,
+    GdkRectangle         *expose_area,
+    GtkCellRendererState  flags);
+#endif
+
+enum {
+    PROP_0,
+
+    PROP_FOLDED_TEXT,
+    PROP_FOLDED_MARKUP,
+    PROP_FOLDED_ATTRIBUTES,
+    PROP_UNFOLDED_TEXT,
+    PROP_UNFOLDED_MARKUP,
+    PROP_UNFOLDED_ATTRIBUTES,
+};
+
+#define KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT, KatzeCellRendererComboBoxTextPrivate))
+
+typedef struct _KatzeCellRendererComboBoxTextPrivate KatzeCellRendererComboBoxTextPrivate;
+struct _KatzeCellRendererComboBoxTextPrivate
+{
+    struct _Properties {
+        PangoAttrList* extra_attrs;
+
+        gchar* text;
+
+        guint markup_set : 1;
+    } props[2];
+};
+
+G_DEFINE_TYPE (KatzeCellRendererComboBoxText, katze_cell_renderer_combobox_text, GTK_TYPE_CELL_RENDERER_TEXT)
+
+static void
+katze_cell_renderer_combobox_text_init (KatzeCellRendererComboBoxText *celltext)
+{
+    guint prop_index;
+    KatzeCellRendererComboBoxTextPrivate *priv;
+
+    priv = KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE (celltext);
+
+    for (prop_index = 0 ; prop_index < 2; prop_index++)
+    {
+        priv->props[prop_index].text = NULL;
+        priv->props[prop_index].extra_attrs = NULL;
+        priv->props[prop_index].markup_set = FALSE;
+    }
+}
+
+static void
+katze_cell_renderer_combobox_text_class_init (KatzeCellRendererComboBoxTextClass *class)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (class);
+    GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+
+    object_class->finalize = katze_cell_renderer_combobox_text_finalize;
+
+    object_class->get_property = katze_cell_renderer_combobox_text_get_property;
+    object_class->set_property = katze_cell_renderer_combobox_text_set_property;
+
+    cell_class->get_size = katze_cell_renderer_combobox_text_get_size;
+    cell_class->render = katze_cell_renderer_combobox_text_render;
+
+    g_object_class_install_property (object_class,
+        PROP_FOLDED_TEXT,
+        g_param_spec_string ("folded-text",
+            P_("Folded text"),
+            P_("Text to render if combobox_text is closed. The string [text] is replaced by default text"),
+            NULL,
+            GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (object_class,
+        PROP_FOLDED_MARKUP,
+        g_param_spec_string ("folded-markup",
+            P_("Folded markup"),
+            P_("Marked up text to render if combobox_text is closed. The string [text] is replaced by default text"),
+            NULL,
+            GTK_PARAM_WRITABLE));
+
+    g_object_class_install_property (object_class,
+        PROP_FOLDED_ATTRIBUTES,
+        g_param_spec_boxed ("folded-attributes",
+            P_("Folded attributes"),
+            P_("A list of style attributes to apply to the text of the renderer if combobox_text is closed"),
+            PANGO_TYPE_ATTR_LIST,
+            GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (object_class,
+        PROP_UNFOLDED_TEXT,
+        g_param_spec_string ("unfolded-text",
+            P_("Unfolded text"),
+            P_("Text to render if combobox_text is opened"),
+            NULL,
+            GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (object_class,
+        PROP_UNFOLDED_MARKUP,
+        g_param_spec_string ("unfolded-markup",
+            P_("Unfolded markup"),
+            P_("Marked up text to render if combobox_text is opened"),
+            NULL,
+            GTK_PARAM_WRITABLE));
+
+    g_object_class_install_property (object_class,
+        PROP_UNFOLDED_ATTRIBUTES,
+        g_param_spec_boxed ("unfolded-attributes",
+            P_("Unfolded attributes"),
+            P_("A list of style attributes to apply to the text of the renderer if combobox_text is opened"),
+            PANGO_TYPE_ATTR_LIST,
+            GTK_PARAM_READWRITE));
+
+
+    g_type_class_add_private (object_class, sizeof (KatzeCellRendererComboBoxTextPrivate));
+}
+
+static void
+katze_cell_renderer_combobox_text_finalize (GObject *object)
+{
+    guint prop_index;
+    KatzeCellRendererComboBoxTextPrivate *priv;
+
+    priv = KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE (object);
+
+    for (prop_index = 0 ; prop_index < 2; prop_index++)
+    {
+        g_free (priv->props[prop_index].text);
+        if (priv->props[prop_index].extra_attrs)
+            pango_attr_list_unref (priv->props[prop_index].extra_attrs);
+    }
+
+    G_OBJECT_CLASS (katze_cell_renderer_combobox_text_parent_class)->finalize (object);
+}
+
+static void
+katze_cell_renderer_combobox_text_get_property (GObject*    object,
+                                        guint       param_id,
+                                        GValue*     value,
+                                        GParamSpec* pspec)
+{
+    KatzeCellRendererComboBoxTextPrivate *priv;
+
+    priv = KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE (object);
+
+    switch (param_id)
+    {
+        case PROP_FOLDED_TEXT:
+            g_value_set_string (value, priv->props[0].text);
+            break;
+
+        case PROP_FOLDED_ATTRIBUTES:
+            g_value_set_boxed (value, priv->props[0].extra_attrs);
+            break;
+
+        case PROP_UNFOLDED_TEXT:
+            g_value_set_string (value, priv->props[1].text);
+            break;
+
+        case PROP_UNFOLDED_ATTRIBUTES:
+            g_value_set_boxed (value, priv->props[1].extra_attrs);
+            break;
+
+        case PROP_FOLDED_MARKUP:
+        case PROP_UNFOLDED_MARKUP:
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+            break;
+    }
+}
+
+
+static void
+katze_cell_renderer_combobox_text_set_property (GObject*      object,
+                                        guint         param_id,
+                                        const GValue* value,
+                                        GParamSpec*   pspec)
+{
+    guint prop_index = 0;
+    KatzeCellRendererComboBoxTextPrivate *priv;
+
+    priv = KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE (object);
+
+    switch (param_id)
+    {
+        case PROP_FOLDED_TEXT:
+        prop_text:
+            g_free (priv->props[prop_index].text);
+
+            if (priv->props[prop_index].markup_set)
+            {
+                if (priv->props[prop_index].extra_attrs)
+                {
+                    pango_attr_list_unref (priv->props[prop_index].extra_attrs);
+                    priv->props[prop_index].extra_attrs = NULL;
+                }
+                priv->props[prop_index].markup_set = FALSE;
+            }
+
+            priv->props[prop_index].text = g_value_dup_string (value);
+            break;
+
+        case PROP_FOLDED_ATTRIBUTES:
+        prop_attributes:
+            if (priv->props[prop_index].extra_attrs)
+                pango_attr_list_unref (priv->props[prop_index].extra_attrs);
+
+            priv->props[prop_index].extra_attrs = g_value_get_boxed (value);
+            if (priv->props[prop_index].extra_attrs)
+                pango_attr_list_ref (priv->props[prop_index].extra_attrs);
+            break;
+
+        case PROP_FOLDED_MARKUP:
+        prop_markup:
+        {
+            const gchar *str;
+            gchar *text = NULL;
+            GError *error = NULL;
+            PangoAttrList *attrs = NULL;
+
+            str = g_value_get_string (value);
+            if (str && !pango_parse_markup (str,
+                                       -1,
+                                       0,
+                                       &attrs,
+                                       &text,
+                                       NULL,
+                                       &error))
+            {
+                g_warning ("Failed to set text from markup due to error parsing markup: %s",
+                    error->message);
+                g_error_free (error);
+                return;
+            }
+
+            g_free (priv->props[prop_index].text);
+
+            if (priv->props[prop_index].extra_attrs)
+                pango_attr_list_unref (priv->props[prop_index].extra_attrs);
+
+            priv->props[prop_index].text = text;
+            priv->props[prop_index].extra_attrs = attrs;
+            priv->props[prop_index].markup_set = TRUE;
+        }
+        break;
+
+        case PROP_UNFOLDED_TEXT:
+            prop_index = 1;
+            goto prop_text;
+
+        case PROP_UNFOLDED_ATTRIBUTES:
+            prop_index = 1;
+            goto prop_attributes;
+
+        case PROP_UNFOLDED_MARKUP:
+            prop_index = 1;
+            goto prop_markup;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+            break;
+    }
+}
+
+/**
+ * katze_cell_renderer_combobox_text_new:
+ *
+ * Creates a new #KatzeCellRendererComboBoxText. Adjust how text is drawn using
+ * object properties. Object properties can be
+ * set globally (with g_object_set()). Also, with #GtkTreeViewColumn,
+ * you can bind a property to a value in a #GtkTreeModel. For example,
+ * you can bind the "text" property on the cell renderer to a string
+ * value in the model, thus rendering a different string in each row
+ * of the #GtkTreeView
+ *
+ * Return value: (transfer full): the new cell renderer
+ **/
+GtkCellRenderer *
+katze_cell_renderer_combobox_text_new (void)
+{
+    return g_object_new (KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT, NULL);
+}
+
+static void
+set_text(KatzeCellRendererComboBoxText* cell,
+    GtkWidget* widget,
+    const gchar* repl)
+{
+    const gchar *text = NULL;
+    PangoAttrList* extra_attrs = NULL;
+    GtkWidget* pwidget = gtk_widget_get_parent (widget);
+    gboolean unfolded = FALSE;
+    KatzeCellRendererComboBoxTextPrivate *priv;
+
+    priv = KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_PRIVATE (cell);
+
+    if (GTK_IS_MENU_ITEM (pwidget))
+    {
+        GtkWidget* menu = gtk_widget_get_parent (pwidget);
+        GList* items;
+
+        if (menu
+            && (GTK_IS_MENU (menu))
+            && (items = gtk_container_get_children (GTK_CONTAINER (menu)))
+            && (GTK_WIDGET (items->data) == pwidget)
+            && (g_list_length (items) > 1)
+            && (GTK_IS_SEPARATOR_MENU_ITEM (g_list_next (items)->data)))
+        {
+            unfolded = TRUE;
+        }
+    }
+
+    if (unfolded)
+    {
+        text = priv->props[1].text;
+        extra_attrs = priv->props[1].extra_attrs;
+    }
+    else
+    {
+        text = priv->props[0].text;
+        extra_attrs = priv->props[0].extra_attrs;
+    }
+
+    if (!text)
+    {
+        text = g_strdup (repl ? repl : "");
+    }
+    else
+    {
+        GString* string = g_string_new ("");
+        const gchar* src = text;
+        const guint skip = sizeof ("[text]") - 1;
+        guint len;
+
+        while (0 != (len = strlen(src)))
+        {
+            const gchar* found = strstr (src, "[text]");
+
+            if (!found)
+            {
+                g_string_append (string, src);
+                src += len;
+            }
+            else
+            {
+                g_string_append_len (string, src, found-src);
+                if (repl)
+                    g_string_append (string, repl);
+                src = found + skip;
+            }
+        }
+
+        text = g_string_free (string, FALSE);
+    }
+
+    g_object_set (G_OBJECT (cell),
+        "text", text,
+        "attributes", extra_attrs,
+        NULL);
+
+    g_free ((gpointer)text);
+}
+
+static void
+katze_cell_renderer_combobox_text_get_size (GtkCellRenderer *cell,
+                                GtkWidget       *widget,
+#if GTK_CHECK_VERSION(3,0,0)
+                                 const GdkRectangle* cell_area,
+#else
+                                 GdkRectangle*       cell_area,
+#endif
+                                gint            *x_offset,
+                                gint            *y_offset,
+                                gint            *width,
+                                gint            *height)
+{
+    const gchar *text = NULL;
+
+    g_object_get (G_OBJECT (cell), "text", &text, NULL);
+
+    set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
+
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->get_size (cell,
+        widget, cell_area,
+        x_offset, y_offset, width, height);
+
+    g_object_set (G_OBJECT (cell), "text", text, NULL);
+    g_free ((gpointer)text);
+}
+
+static void
+#if GTK_CHECK_VERSION(3,0,0)
+katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
+                              cairo_t*             cr,
+                              GtkWidget            *widget,
+                              const GdkRectangle   *background_area,
+                              const GdkRectangle   *cell_area,
+                              GtkCellRendererState  flags)
+#else
+katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
+                              GdkDrawable          *window,
+                              GtkWidget            *widget,
+                              GdkRectangle         *background_area,
+                              GdkRectangle         *cell_area,
+                              GdkRectangle         *expose_area,
+                              GtkCellRendererState  flags)
+#endif
+{
+    const gchar *text = NULL;
+
+    g_object_get (G_OBJECT (cell), "text", &text, NULL);
+
+    set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
+
+#if GTK_CHECK_VERSION(3,0,0)
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
+        cr,
+        widget,
+        background_area,
+        cell_area,
+        flags);
+#else
+    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
+        window,
+        widget,
+        background_area,
+        cell_area,
+        expose_area,
+        flags);
+#endif
+
+    g_object_set (G_OBJECT (cell), "text", text, NULL);
+    g_free ((gpointer)text);
+}
diff --git a/katze/katze-cellrenderercomboboxtext.h b/katze/katze-cellrenderercomboboxtext.h
new file mode 100644 (file)
index 0000000..156e335
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+#ifndef __KATZE_CELL_RENDERER_COMBOBOX_TEXT_H__
+#define __KATZE_CELL_RENDERER_COMBOBOX_TEXT_H__
+
+
+#include <gtk/gtk.h>
+
+#ifndef GSEAL
+#define GSEAL(String) String
+#endif
+
+G_BEGIN_DECLS
+
+
+#define KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT         (katze_cell_renderer_combobox_text_get_type ())
+#define KATZE_CELL_RENDERER_COMBOBOX_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT, KatzeCellRendererComboBoxText))
+#define KATZE_CELL_RENDERER_COMBOBOX_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT, KatzeCellRendererComboBoxTextClass))
+#define KATZE_IS_CELL_RENDERER_COMBOBOX_TEXT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT))
+#define KATZE_IS_CELL_RENDERER_COMBOBOX_TEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT))
+#define KATZE_CELL_RENDERER_COMBOBOX_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_CELL_RENDERER_COMBOBOX_TEXT, KatzeCellRendererComboBoxTextClass))
+
+typedef struct _KatzeCellRendererComboBoxText      KatzeCellRendererComboBoxText;
+typedef struct _KatzeCellRendererComboBoxTextClass KatzeCellRendererComboBoxTextClass;
+
+struct _KatzeCellRendererComboBoxText
+{
+  GtkCellRendererText parent;
+
+  /*< private >*/
+};
+
+struct _KatzeCellRendererComboBoxTextClass
+{
+  GtkCellRendererTextClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+GType            katze_cell_renderer_combobox_text_get_type (void) G_GNUC_CONST;
+GtkCellRenderer *katze_cell_renderer_combobox_text_new      (void);
+
+G_END_DECLS
+
+#endif /* __KATZE_CELL_RENDERER_COMBOBOX_TEXT_H__ */
index fbd321cebb55209c450d14ff6ac1687557d97c20..72c534ada6e1142ca8dea5a97900039f9562d985 100644 (file)
@@ -226,14 +226,14 @@ katze_http_auth_session_authenticate_cb (SoupSession*   session,
     label = gtk_label_new (_("A username and a password are required\n"
                              "to open this location:"));
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     label = gtk_label_new (soup_auth_get_host (auth));
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
     /* If the realm is merely the host, omit the realm label */
     if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth)))
     {
         label = gtk_label_new (soup_auth_get_realm (auth));
-        gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
     }
     sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     hbox = gtk_hbox_new (FALSE, 6);
@@ -248,7 +248,7 @@ katze_http_auth_session_authenticate_cb (SoupSession*   session,
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     g_object_set_data (G_OBJECT (dialog), "username", entry);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     hbox = gtk_hbox_new (FALSE, 6);
     label = gtk_label_new (_("Password"));
     align = gtk_alignment_new (0, 0.5, 0, 0);
@@ -262,13 +262,13 @@ katze_http_auth_session_authenticate_cb (SoupSession*   session,
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     g_object_set_data (G_OBJECT (dialog), "password", entry);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     hbox = gtk_hbox_new (FALSE, 6);
     label = gtk_check_button_new_with_mnemonic (_("_Remember password"));
     gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
     g_object_set_data (G_OBJECT (dialog), "remember", label);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (label), (login != NULL));
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
     gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
 
diff --git a/katze/katze-http-cookies-sqlite.c b/katze/katze-http-cookies-sqlite.c
deleted file mode 100644 (file)
index 10eb3f3..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- Copyright (C) 2008-2010 Christian Dywan <christian@twotoasts.de>
- Copyright (C) 2011 Alexander Butenko <a.butenka@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "katze-http-cookies-sqlite.h"
-
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-#include <glib/gi18n.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-#include <sqlite3.h>
-
-#define QUERY_ALL "SELECT id, name, value, host, path, expiry, lastAccessed, isSecure, isHttpOnly FROM moz_cookies;"
-#define CREATE_TABLE "CREATE TABLE IF NOT EXISTS moz_cookies (id INTEGER PRIMARY KEY, name TEXT, value TEXT, host TEXT, path TEXT,expiry INTEGER, lastAccessed INTEGER, isSecure INTEGER, isHttpOnly INTEGER)"
-#define QUERY_INSERT "INSERT INTO moz_cookies VALUES(NULL, %Q, %Q, %Q, %Q, %d, NULL, %d, %d);"
-#define QUERY_DELETE "DELETE FROM moz_cookies WHERE name=%Q AND host=%Q;"
-
-enum {
-    COL_ID,
-    COL_NAME,
-    COL_VALUE,
-    COL_HOST,
-    COL_PATH,
-    COL_EXPIRY,
-    COL_LAST_ACCESS,
-    COL_SECURE,
-    COL_HTTP_ONLY,
-    N_COL,
-};
-
-struct _KatzeHttpCookiesSqlite
-{
-    GObject parent_instance;
-    gchar* filename;
-    SoupCookieJar* jar;
-    sqlite3 *db;
-    guint counter;
-};
-
-struct _KatzeHttpCookiesSqliteClass
-{
-    GObjectClass parent_class;
-};
-
-static void
-katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                                      gpointer                     data);
-
-G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookiesSqlite, katze_http_cookies_sqlite, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-                         katze_http_cookies_sqlite_session_feature_iface_init));
-
-/* Cookie jar saving into sqlite database
-   Copyright (C) 2008 Diego Escalante Urrelo
-   Copyright (C) 2009 Collabora Ltd.
-   Mostly copied from libSoup 2.30, coding style retained */
-
-/* Follows sqlite3 convention; returns TRUE on error */
-static gboolean
-katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies)
-{
-    char *error = NULL;
-
-   if (sqlite3_open (http_cookies->filename, &http_cookies->db)) {
-        sqlite3_close (http_cookies->db);
-        g_warning ("Can't open %s", http_cookies->filename);
-        return TRUE;
-    }
-
-    if (sqlite3_exec (http_cookies->db, CREATE_TABLE, NULL, NULL, &error)) {
-        g_warning ("Failed to execute query: %s", error);
-        sqlite3_free (error);
-    }
-
-    if (sqlite3_exec (http_cookies->db, "PRAGMA secure_delete = 1;",
-        NULL, NULL, &error)) {
-        g_warning ("Failed to execute query: %s", error);
-        sqlite3_free (error);
-    }
-
-    sqlite3_exec (http_cookies->db,
-        /* Arguably cookies are like a cache, so performance over integrity */
-        "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;"
-        "PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;",
-        NULL, NULL, &error);
-
-    return FALSE;
-}
-
-static void
-katze_http_cookies_sqlite_load (KatzeHttpCookiesSqlite* http_cookies)
-{
-    const char *name, *value, *host, *path;
-    sqlite3_stmt* stmt;
-    SoupCookie *cookie = NULL;
-    gint64 expire_time;
-    time_t now;
-    int max_age;
-    gboolean http_only = FALSE, secure = FALSE;
-    char *query;
-    int result;
-
-    if (http_cookies->db == NULL) {
-        if (katze_http_cookies_sqlite_open_db (http_cookies))
-            return;
-    }
-
-    sqlite3_prepare_v2 (http_cookies->db, QUERY_ALL, strlen (QUERY_ALL) + 1, &stmt, NULL);
-    result = sqlite3_step (stmt);
-    if (result != SQLITE_ROW)
-    {
-        if (result == SQLITE_ERROR)
-            g_print (_("Failed to load cookies\n"));
-        sqlite3_reset (stmt);
-        return;
-    }
-
-    while (result == SQLITE_ROW)
-    {
-        now = time (NULL);
-        name = (const char*)sqlite3_column_text (stmt, COL_NAME);
-        value = (const char*)sqlite3_column_text (stmt, COL_VALUE);
-        host = (const char*)sqlite3_column_text (stmt, COL_HOST);
-        path = (const char*)sqlite3_column_text (stmt, COL_PATH);
-        expire_time = sqlite3_column_int64 (stmt,COL_EXPIRY);
-        secure = sqlite3_column_int (stmt, COL_SECURE);
-        http_only = sqlite3_column_int (stmt, COL_HTTP_ONLY);
-
-        if (now >= expire_time)
-        {
-            /* Cookie expired, remove it from database */
-            query = sqlite3_mprintf (QUERY_DELETE, name, host);
-            sqlite3_exec (http_cookies->db, QUERY_DELETE, NULL, NULL, NULL);
-            sqlite3_free (query);
-            result = sqlite3_step (stmt);
-            continue;
-        }
-        max_age = (expire_time - now <= G_MAXINT ? expire_time - now : G_MAXINT);
-        cookie = soup_cookie_new (name, value, host, path, max_age);
-
-        if (secure)
-            soup_cookie_set_secure (cookie, TRUE);
-        if (http_only)
-            soup_cookie_set_http_only (cookie, TRUE);
-
-        soup_cookie_jar_add_cookie (http_cookies->jar, cookie);
-        result = sqlite3_step (stmt);
-    }
-
-    if (stmt)
-    {
-        sqlite3_reset (stmt);
-        sqlite3_clear_bindings (stmt);
-    }
-}
-static void
-katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar*    jar,
-                                          SoupCookie*       old_cookie,
-                                          SoupCookie*       new_cookie,
-                                          KatzeHttpCookiesSqlite* http_cookies)
-{
-    GObject* settings;
-    char *query;
-    time_t expires = 0; /* Avoid warning */
-
-    if (http_cookies->db == NULL) {
-        if (katze_http_cookies_sqlite_open_db (http_cookies))
-            return;
-    }
-
-    if (new_cookie && new_cookie->expires)
-    {
-        gint age;
-
-        expires = soup_date_to_time_t (new_cookie->expires);
-        settings = g_object_get_data (G_OBJECT (jar), "midori-settings");
-        age = katze_object_get_int (settings, "maximum-cookie-age");
-        if (age > 0)
-        {
-            SoupDate* max_date = soup_date_new_from_now (
-                   age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
-            if (soup_date_to_time_t (new_cookie->expires)
-                > soup_date_to_time_t (max_date))
-                   soup_cookie_set_expires (new_cookie, max_date);
-        }
-        else
-        {
-            /* An age of 0 to SoupCookie means already-expired
-            A user choosing 0 days probably expects 1 hour. */
-            soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
-        }
-    }
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        http_cookies->counter++;
-
-    if (old_cookie) {
-        query = sqlite3_mprintf (QUERY_DELETE,
-                     old_cookie->name,
-                     old_cookie->domain);
-        sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL);
-        sqlite3_free (query);
-    }
-
-    if (new_cookie && new_cookie->expires) {
-
-        query = sqlite3_mprintf (QUERY_INSERT,
-                     new_cookie->name,
-                     new_cookie->value,
-                     new_cookie->domain,
-                     new_cookie->path,
-                     expires,
-                     new_cookie->secure,
-                     new_cookie->http_only);
-        sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL);
-        sqlite3_free (query);
-    }
-}
-
-static void
-katze_http_cookies_sqlite_attach (SoupSessionFeature* feature,
-                                  SoupSession*        session)
-{
-    KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature;
-    const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename");
-    SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    g_return_if_fail (jar != NULL);
-    g_return_if_fail (filename != NULL);
-    katze_assign (http_cookies->filename, g_strdup (filename));
-    http_cookies->jar = g_object_ref (jar);
-    katze_http_cookies_sqlite_open_db (http_cookies);
-    katze_http_cookies_sqlite_load (http_cookies);
-    g_signal_connect (jar, "changed",
-        G_CALLBACK (katze_http_cookies_sqlite_jar_changed_cb), feature);
-
-}
-
-static void
-katze_http_cookies_sqlite_detach (SoupSessionFeature* feature,
-                                  SoupSession*        session)
-{
-    KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature;
-    katze_assign (http_cookies->filename, NULL);
-    katze_object_assign (http_cookies->jar, NULL);
-    sqlite3_close (http_cookies->db);
-}
-
-static void
-katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                                      gpointer                     data)
-{
-    iface->attach = katze_http_cookies_sqlite_attach;
-    iface->detach = katze_http_cookies_sqlite_detach;
-}
-
-static void
-katze_http_cookies_sqlite_finalize (GObject* object)
-{
-    katze_http_cookies_sqlite_detach ((SoupSessionFeature*)object, NULL);
-}
-
-static void
-katze_http_cookies_sqlite_class_init (KatzeHttpCookiesSqliteClass* class)
-{
-    GObjectClass* gobject_class = (GObjectClass*)class;
-    gobject_class->finalize = katze_http_cookies_sqlite_finalize;
-}
-
-static void
-katze_http_cookies_sqlite_init (KatzeHttpCookiesSqlite* http_cookies)
-{
-    http_cookies->filename = NULL;
-    http_cookies->jar = NULL;
-    http_cookies->db = NULL;
-    http_cookies->counter = 0;
-}
diff --git a/katze/katze-http-cookies-sqlite.h b/katze/katze-http-cookies-sqlite.h
deleted file mode 100644 (file)
index 41f17d2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __KATZE_HTTP_COOKIES_SQLITE_H__
-#define __KATZE_HTTP_COOKIES_SQLITE_H__
-
-#include "katze-utils.h"
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_HTTP_COOKIES_SQLITE \
-    (katze_http_cookies_sqlite_get_type ())
-#define KATZE_HTTP_COOKIES_SQLITE(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqlite))
-#define KATZE_HTTP_COOKIES_SQLITE_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass))
-#define KATZE_IS_HTTP_COOKIES_SQLITE(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE))
-#define KATZE_IS_HTTP_COOKIES_SQLITE_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE))
-#define KATZE_HTTP_COOKIES_SQLITE_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass))
-
-typedef struct _KatzeHttpCookiesSqlite                KatzeHttpCookiesSqlite;
-typedef struct _KatzeHttpCookiesSqliteClass           KatzeHttpCookiesSqliteClass;
-
-GType
-katze_http_cookies_sqlite_get_type                       (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __KATZE_HTTP_COOKIES_SQLITE_H__ */
diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c
deleted file mode 100644 (file)
index 5a2caad..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- Copyright (C) 2008-2010 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "katze-http-cookies.h"
-#include "midori/midori-core.h"
-
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-#include <glib/gi18n.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-
-struct _KatzeHttpCookies
-{
-    GObject parent_instance;
-    gchar* filename;
-    SoupCookieJar* jar;
-    guint timeout;
-    guint counter;
-};
-
-struct _KatzeHttpCookiesClass
-{
-    GObjectClass parent_class;
-};
-
-static void
-katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                               gpointer                     data);
-
-G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-                         katze_http_cookies_session_feature_iface_init));
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <xan@gnome.org>
-   Copyright (C) 2008 Dan Winship <danw@gnome.org>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static SoupCookie*
-parse_cookie (gchar* line,
-              time_t now)
-{
-    gchar** result;
-    SoupCookie *cookie = NULL;
-    gboolean http_only;
-    time_t max_age;
-    gchar* host/*, *is_domain*/, *path, *secure, *expires, *name, *value;
-
-    if (g_str_has_prefix (line, "#HttpOnly_"))
-    {
-        http_only = TRUE;
-        line += strlen ("#HttpOnly_");
-    }
-    else if (*line == '#' || g_ascii_isspace (*line))
-        return cookie;
-    else
-        http_only = FALSE;
-
-    result = g_strsplit (line, "\t", -1);
-    if (g_strv_length (result) != 7)
-        goto out;
-
-    /* Check this first */
-    expires = result[4];
-    max_age = strtoul (expires, NULL, 10) - now;
-    if (max_age <= 0)
-        goto out;
-
-    host = result[0];
-    /* is_domain = result[1]; */
-    path = result[2];
-    secure = result[3];
-
-    name = result[5];
-    value = result[6];
-
-    cookie = soup_cookie_new (name, value, host, path, max_age);
-
-    if (strcmp (secure, "FALSE"))
-        soup_cookie_set_secure (cookie, TRUE);
-    if (http_only)
-        soup_cookie_set_http_only (cookie, TRUE);
-
-    out:
-        g_strfreev (result);
-
-    return cookie;
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <xan@gnome.org>
-   Copyright (C) 2008 Dan Winship <danw@gnome.org>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static void
-parse_line (SoupCookieJar* jar,
-            gchar*         line,
-            time_t         now)
-{
-    SoupCookie* cookie;
-
-    if ((cookie = parse_cookie (line, now)))
-        soup_cookie_jar_add_cookie (jar, cookie);
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <xan@gnome.org>
-   Copyright (C) 2008 Dan Winship <danw@gnome.org>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static void
-cookie_jar_load (SoupCookieJar* jar,
-                 const gchar*   filename)
-{
-    char* contents = NULL;
-    gchar* line;
-    gchar* p;
-    gsize length = 0;
-    time_t now;
-
-    if (!g_file_get_contents (filename, &contents, &length, NULL))
-        return;
-
-    now = time (NULL);
-    line = contents;
-    for (p = contents; *p; p++)
-    {
-        /* \r\n comes out as an extra empty line and gets ignored */
-        if (*p == '\r' || *p == '\n')
-        {
-            *p = '\0';
-            parse_line (jar, line, now);
-            line = p + 1;
-        }
-    }
-    parse_line (jar, line, now);
-
-    g_free (contents);
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <xan@gnome.org>
-   Copyright (C) 2008 Dan Winship <danw@gnome.org>
-   Copied from libSoup 2.24, coding style preserved */
-static gboolean
-write_cookie (FILE *out, SoupCookie *cookie)
-{
-       if (fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n",
-                cookie->http_only ? "#HttpOnly_" : "",
-                cookie->domain,
-                *cookie->domain == '.' ? "TRUE" : "FALSE",
-                cookie->path,
-                cookie->secure ? "TRUE" : "FALSE",
-                (gulong)soup_date_to_time_t (cookie->expires),
-                cookie->name,
-                cookie->value) < 0)
-            return FALSE;
-        return TRUE;
-}
-
-static gboolean
-katze_http_cookies_update_jar (KatzeHttpCookies* http_cookies)
-{
-    gint fn = 0;
-    FILE* f = NULL;
-    gchar* temporary_filename = NULL;
-    GSList* cookies;
-
-    if (http_cookies->timeout > 0)
-    {
-        g_source_remove (http_cookies->timeout);
-        http_cookies->timeout = 0;
-    }
-
-    temporary_filename = g_strconcat (http_cookies->filename, ".XXXXXX", NULL);
-    if ((fn = g_mkstemp (temporary_filename)) == -1)
-        goto failed;
-    if (!((f = fdopen (fn, "wb"))))
-        goto failed;
-
-    cookies = soup_cookie_jar_all_cookies (http_cookies->jar);
-    for (; cookies != NULL; cookies = g_slist_next (cookies))
-    {
-        SoupCookie* cookie = cookies->data;
-        if (cookie->expires && !soup_date_is_past (cookie->expires))
-            write_cookie (f, cookie);
-        soup_cookie_free (cookie);
-    }
-    g_slist_free (cookies);
-
-    if (fclose (f) != 0)
-    {
-        f = NULL;
-        goto failed;
-    }
-    f = NULL;
-
-    if (g_rename (temporary_filename, http_cookies->filename) == -1)
-        goto failed;
-    g_free (temporary_filename);
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-    {
-        g_print ("KatzeHttpCookies: %d cookies changed\n", http_cookies->counter);
-        http_cookies->counter = 0;
-    }
-    return FALSE;
-
-failed:
-    if (f)
-        fclose (f);
-    g_unlink (temporary_filename);
-    g_free (temporary_filename);
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        g_print ("KatzeHttpCookies: Failed to write '%s'\n",
-                 http_cookies->filename);
-    return FALSE;
-}
-
-static void
-katze_http_cookies_jar_changed_cb (SoupCookieJar*    jar,
-                                   SoupCookie*       old_cookie,
-                                   SoupCookie*       new_cookie,
-                                   KatzeHttpCookies* http_cookies)
-{
-    GObject* settings;
-
-    if (old_cookie)
-        soup_cookie_set_max_age (old_cookie, 0);
-
-    if (new_cookie)
-    {
-        settings = g_object_get_data (G_OBJECT (jar), "midori-settings");
-        if (new_cookie->expires)
-        {
-            gint age = katze_object_get_int (settings, "maximum-cookie-age");
-            if (age > 0)
-            {
-                SoupDate* max_date = soup_date_new_from_now (
-                    age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
-                if (soup_date_to_time_t (new_cookie->expires)
-                  > soup_date_to_time_t (max_date))
-                    soup_cookie_set_expires (new_cookie, max_date);
-            }
-            else
-            {
-                /* An age of 0 to SoupCookie means already-expired
-                   A user choosing 0 days probably expects 1 hour. */
-                soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
-            }
-        }
-    }
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        http_cookies->counter++;
-
-    if (!http_cookies->timeout && (old_cookie || (new_cookie && new_cookie->expires)))
-        http_cookies->timeout = midori_timeout_add_seconds (
-            5, (GSourceFunc)katze_http_cookies_update_jar, http_cookies, NULL);
-}
-
-static void
-katze_http_cookies_attach (SoupSessionFeature* feature,
-                           SoupSession*        session)
-{
-    KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature;
-    const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename");
-    SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    g_return_if_fail (jar != NULL);
-    g_return_if_fail (filename != NULL);
-    katze_assign (http_cookies->filename, g_strdup (filename));
-    http_cookies->jar = g_object_ref (jar);
-    cookie_jar_load (http_cookies->jar, http_cookies->filename);
-    g_signal_connect (jar, "changed",
-        G_CALLBACK (katze_http_cookies_jar_changed_cb), feature);
-
-}
-
-static void
-katze_http_cookies_detach (SoupSessionFeature* feature,
-                           SoupSession*        session)
-{
-    KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature;
-    if (http_cookies->timeout > 0)
-        katze_http_cookies_update_jar (http_cookies);
-    katze_assign (http_cookies->filename, NULL);
-    katze_object_assign (http_cookies->jar, NULL);
-}
-
-static void
-katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                               gpointer                     data)
-{
-    iface->attach = katze_http_cookies_attach;
-    iface->detach = katze_http_cookies_detach;
-}
-
-static void
-katze_http_cookies_finalize (GObject* object)
-{
-    katze_http_cookies_detach ((SoupSessionFeature*)object, NULL);
-}
-
-static void
-katze_http_cookies_class_init (KatzeHttpCookiesClass* class)
-{
-    GObjectClass* gobject_class = (GObjectClass*)class;
-    gobject_class->finalize = katze_http_cookies_finalize;
-}
-
-static void
-katze_http_cookies_init (KatzeHttpCookies* http_cookies)
-{
-    http_cookies->filename = NULL;
-    http_cookies->jar = NULL;
-    http_cookies->timeout = 0;
-    http_cookies->counter = 0;
-}
diff --git a/katze/katze-http-cookies.h b/katze/katze-http-cookies.h
deleted file mode 100644 (file)
index b791a50..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __KATZE_HTTP_COOKIES_H__
-#define __KATZE_HTTP_COOKIES_H__
-
-#include "katze-utils.h"
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_HTTP_COOKIES \
-    (katze_http_cookies_get_type ())
-#define KATZE_HTTP_COOKIES(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookies))
-#define KATZE_HTTP_COOKIES_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass))
-#define KATZE_IS_HTTP_COOKIES(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES))
-#define KATZE_IS_HTTP_COOKIES_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES))
-#define KATZE_HTTP_COOKIES_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass))
-
-typedef struct _KatzeHttpCookies                KatzeHttpCookies;
-typedef struct _KatzeHttpCookiesClass           KatzeHttpCookiesClass;
-
-GType
-katze_http_cookies_get_type                       (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __KATZE_HTTP_COOKIES_H__ */
index 062010fb61c8304fa394c7fc3d5f61e7f781980d..299c7da7af421f7d375ac6759fdd285a6f8b9748 100644 (file)
@@ -8,15 +8,13 @@
 
  See the file COPYING for the full license text.
 */
-
 #include "katze-item.h"
 #include "katze-utils.h"
 #include "midori/midori-core.h"
 
 #include <glib/gi18n.h>
 
-#include "katze/katze.h"
-
 /**
  * SECTION:katze-item
  * @short_description: A useful item
@@ -277,7 +275,7 @@ katze_item_get_property (GObject*    object,
  *
  * Creates a new #KatzeItem.
  *
- * Return value: a new #KatzeItem
+ * Return value: (transfer full): a new #KatzeItem
  **/
 KatzeItem*
 katze_item_new (void)
@@ -316,6 +314,9 @@ katze_item_set_name (KatzeItem*   item,
 {
     g_return_if_fail (KATZE_IS_ITEM (item));
 
+    if (!g_strcmp0 (item->name, name))
+        return;
+
     katze_assign (item->name, g_strdup (name));
     if (item->parent)
         katze_array_update ((KatzeArray*)item->parent);
@@ -341,7 +342,7 @@ katze_item_get_text (KatzeItem* item)
 /**
  * katze_item_set_text:
  * @item: a #KatzeItem
- * @description: a string
+ * @text: a string
  *
  * Sets the descriptive text of @item.
  **/
@@ -420,6 +421,9 @@ katze_item_set_icon (KatzeItem*   item,
 {
     g_return_if_fail (KATZE_IS_ITEM (item));
 
+    if (!g_strcmp0 (katze_item_get_meta_string (item, "icon"), icon))
+        return;
+
     katze_item_set_meta_string (item, "icon", icon);
     if (item->parent)
         katze_array_update ((KatzeArray*)item->parent);
@@ -431,9 +435,9 @@ katze_item_set_icon (KatzeItem*   item,
  * @item: a #KatzeItem
  * @widget: a #GtkWidget, or %NULL
  *
- * Retrieves a #GdkPixbuf fit to display @item.
+ * Creates a #GdkPixbuf fit to display @item.
  *
- * Return value: the icon of the item
+ * Return value: (transfer full): the icon of the item, or %NULL
  *
  * Since: 0.4.6
  **/
@@ -447,8 +451,6 @@ katze_item_get_pixbuf (KatzeItem* item,
 
     if (widget && KATZE_ITEM_IS_FOLDER (item))
         return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
-    if ((pixbuf = midori_paths_get_icon (katze_item_get_icon (item), NULL)))
-        return pixbuf;
     if ((pixbuf = midori_paths_get_icon (item->uri, widget)))
         return pixbuf;
     return NULL;
@@ -458,20 +460,14 @@ static void
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item);
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 3, 13)
 static void
-#if WEBKIT_CHECK_VERSION (1, 8, 0)
 katze_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-#elif WEBKIT_CHECK_VERSION (1, 3, 13)
-katze_item_icon_loaded_cb (WebKitIconDatabase*    database,
-                           WebKitWebFrame*        web_frame,
-#endif
                            const gchar*           frame_uri,
                            GtkWidget*             image)
 {
     KatzeItem* item = g_object_get_data (G_OBJECT (image), "KatzeItem");
     GdkPixbuf* pixbuf;
-    if (!strcmp (frame_uri, item->uri)
+    if (!g_strcmp0 (frame_uri, item->uri)
       && (pixbuf = midori_paths_get_icon (frame_uri, image)))
     {
         gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
@@ -482,20 +478,14 @@ katze_item_icon_loaded_cb (WebKitIconDatabase*    database,
     }
 }
 #endif
-#endif
 
 static void
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item)
 {
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
         katze_item_icon_loaded_cb, image);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_handlers_disconnect_by_func (webkit_get_icon_database (),
-        katze_item_icon_loaded_cb, image);
-    #endif
 #endif
     g_object_unref (item);
 }
@@ -505,12 +495,12 @@ katze_item_image_destroyed_cb (GtkWidget* image,
  * @item: a #KatzeItem
  * @widget: a #GtkWidget, or %NULL
  *
- * Retrieves a #GtkImage fit to display @item.
+ * Creates a #GtkImage fit to display @item.
  *
- * Return value: the icon of the item
+ * Return value: (transfer floating): the icon of the item
  *
  * Since: 0.4.4
- * Since 0.4.8 a @widget was added and the image is visible.
+ * Since 0.4.8 a @widget was added and the image is set visible.
  **/
 GtkWidget*
 katze_item_get_image (KatzeItem* item,
@@ -532,13 +522,8 @@ katze_item_get_image (KatzeItem* item,
     g_signal_connect (image, "destroy",
         G_CALLBACK (katze_item_image_destroyed_cb), item);
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
         G_CALLBACK (katze_item_icon_loaded_cb), image);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_connect (webkit_get_icon_database (), "icon-loaded",
-        G_CALLBACK (katze_item_icon_loaded_cb), image);
-    #endif
 #endif
     return image;
 }
@@ -615,7 +600,7 @@ katze_item_set_added (KatzeItem* item,
  *
  * Retrieves a list of all meta keys.
  *
- * Return value: a newly allocated #GList of constant strings
+ * Return value: (element-type utf8) (transfer container): a newly allocated #GList of constant strings
  *
  * Since: 0.1.8
  **/
@@ -793,7 +778,7 @@ katze_item_set_meta_integer (KatzeItem*   item,
  *
  * Since 0.1.2 you can monitor the "parent" property.
  *
- * Return value: the parent of the item
+ * Return value: (type GObject) (transfer none): the parent of the item
  **/
 gpointer
 katze_item_get_parent (KatzeItem* item)
@@ -840,7 +825,7 @@ katze_item_set_parent (KatzeItem* item,
  *
  * Since 0.4.3 meta data is copied.
  *
- * Return value: a new #KatzeItem
+ * Return value: (transfer full): a new #KatzeItem
  *
  * Since: 0.1.3
  **/
diff --git a/katze/katze-net.c b/katze/katze-net.c
deleted file mode 100644 (file)
index 2ba9b87..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#if HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-#include "katze-net.h"
-#include "midori-core.h"
-
-#include <glib/gstdio.h>
-#include <libsoup/soup.h>
-
-struct _KatzeNet
-{
-    GObject parent_instance;
-};
-
-struct _KatzeNetClass
-{
-    GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (KatzeNet, katze_net, G_TYPE_OBJECT)
-
-static void
-katze_net_finalize (GObject* object);
-
-static void
-katze_net_class_init (KatzeNetClass* class)
-{
-    GObjectClass* gobject_class;
-
-    gobject_class = G_OBJECT_CLASS (class);
-    gobject_class->finalize = katze_net_finalize;
-}
-
-static void
-katze_net_init (KatzeNet* net)
-{
-}
-
-static void
-katze_net_finalize (GObject* object)
-{
-    G_OBJECT_CLASS (katze_net_parent_class)->finalize (object);
-}
-
-typedef struct
-{
-    KatzeNetStatusCb status_cb;
-    KatzeNetTransferCb transfer_cb;
-    gpointer user_data;
-    KatzeNetRequest* request;
-} KatzeNetPriv;
-
-static void
-katze_net_priv_free (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-    g_free (request->uri);
-    g_free (request->mime_type);
-    g_free (request->data);
-    g_slice_free (KatzeNetRequest, request);
-    g_slice_free (KatzeNetPriv, priv);
-}
-
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-gchar*
-katze_net_get_cached_path (KatzeNet*    net,
-                           const gchar* uri,
-                           const gchar* subfolder)
-{
-    gchar* checksum;
-    gchar* extension;
-    gchar* cached_filename;
-    gchar* cached_path;
-
-    if (uri == NULL)
-        return NULL;
-
-    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);
-
-    if (subfolder)
-    {
-        gchar* cache_path = g_build_filename (midori_paths_get_cache_dir_for_reading (), 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;
-}
-#endif
-
-static void
-katze_net_got_body_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv);
-
-static void
-katze_net_got_headers_cb (SoupMessage*  msg,
-                          KatzeNetPriv* priv)
-{
-#ifndef HAVE_WEBKIT2
-    KatzeNetRequest* request = priv->request;
-
-    switch (msg->status_code)
-    {
-    case 200:
-        request->status = KATZE_NET_VERIFIED;
-        break;
-    case 301:
-        request->status = KATZE_NET_MOVED;
-        break;
-    default:
-        request->status = KATZE_NET_NOT_FOUND;
-    }
-
-    if (!priv->status_cb (request, priv->user_data))
-    {
-        g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv);
-        g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
-        soup_session_cancel_message (webkit_get_default_session (), msg, 1);
-    }
-#endif
-}
-
-static void
-katze_net_got_body_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-
-    if (msg->response_body->length > 0)
-    {
-        request->data = g_memdup (msg->response_body->data,
-                                  msg->response_body->length);
-        request->length = msg->response_body->length;
-    }
-
-    priv->transfer_cb (request, priv->user_data);
-}
-
-static void
-katze_net_finished_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv)
-{
-    katze_net_priv_free (priv);
-}
-
-static gboolean
-katze_net_local_cb (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-    gchar* filename = g_filename_from_uri (request->uri, NULL, NULL);
-
-    if (!filename || g_access (filename, F_OK) != 0)
-    {
-        request->status = KATZE_NET_NOT_FOUND;
-        if (priv->status_cb)
-            priv->status_cb (request, priv->user_data);
-    }
-    else if (!(priv->status_cb && !priv->status_cb (request, priv->user_data))
-           &&  priv->transfer_cb)
-    {
-        gchar* contents = NULL;
-        gsize length;
-
-        request->status = KATZE_NET_VERIFIED;
-        if (!g_file_get_contents (filename, &contents, &length, NULL))
-        {
-            request->status = KATZE_NET_FAILED;
-        }
-        else
-        {
-            request->status = KATZE_NET_DONE;
-            request->data = contents;
-            request->length = length;
-        }
-        priv->transfer_cb (request, priv->user_data);
-    }
-    g_free (filename);
-    katze_net_priv_free (priv);
-    return FALSE;
-}
-
-static gboolean
-katze_net_default_cb (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request;
-
-    request = priv->request;
-    request->status = KATZE_NET_NOT_FOUND;
-    if (priv->status_cb)
-        priv->status_cb (request, priv->user_data);
-    katze_net_priv_free (priv);
-    return FALSE;
-}
-
-/**
- * katze_net_load_uri:
- * @net: a #KatzeNet, or %NULL
- * @uri: an URI string
- * @status_cb: function to call for status information
- * @transfer_cb: function to call upon transfer
- * @user_data: data to pass to the callback
- *
- * Requests a transfer of @uri.
- *
- * @status_cb will be called when the status of @uri
- * is verified. The specified callback may be called
- * multiple times unless cancelled.
- *
- * @transfer_cb will be called when the data @uri is
- * pointing to was transferred. Note that even a failed
- * transfer may transfer data.
- *
- * @status_cb will always to be called at least once.
- **/
-void
-katze_net_load_uri (KatzeNet*          net,
-                    const gchar*       uri,
-                    KatzeNetStatusCb   status_cb,
-                    KatzeNetTransferCb transfer_cb,
-                    gpointer           user_data)
-{
-#ifndef HAVE_WEBKIT2
-    KatzeNetRequest* request;
-    KatzeNetPriv* priv;
-    SoupMessage* msg;
-
-    g_return_if_fail (uri != NULL);
-
-    if (!status_cb && !transfer_cb)
-        return;
-
-    request = g_slice_new (KatzeNetRequest);
-    request->uri = g_strdup (uri);
-    request->mime_type = NULL;
-    request->data = NULL;
-
-    priv = g_slice_new (KatzeNetPriv);
-    priv->status_cb = status_cb;
-    priv->transfer_cb = transfer_cb;
-    priv->user_data = user_data;
-    priv->request = request;
-
-    if (midori_uri_is_http (uri))
-    {
-        msg = soup_message_new ("GET", uri);
-        if (status_cb)
-            g_signal_connect (msg, "got-headers",
-                G_CALLBACK (katze_net_got_headers_cb), priv);
-        if (transfer_cb)
-            g_signal_connect (msg, "got-body",
-                G_CALLBACK (katze_net_got_body_cb), priv);
-        g_signal_connect (msg, "finished",
-            G_CALLBACK (katze_net_finished_cb), priv);
-        soup_session_queue_message (webkit_get_default_session (), msg, NULL, NULL);
-        return;
-    }
-
-    if (g_str_has_prefix (uri, "file://"))
-        g_idle_add ((GSourceFunc)katze_net_local_cb, priv);
-    else
-        g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
-#endif
-}
-
diff --git a/katze/katze-net.h b/katze/katze-net.h
deleted file mode 100644 (file)
index 2d26030..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __KATZE_NET_H__
-#define __KATZE_NET_H__
-
-#ifndef HAVE_WEBKIT2
-    #include <webkit/webkit.h>
-#else
-    #include <webkit2/webkit2.h>
-#endif
-#include "katze-utils.h"
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_NET \
-    (katze_net_get_type ())
-#define KATZE_NET(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_NET, KatzeNet))
-#define KATZE_NET_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_NET, KatzeNetClass))
-#define KATZE_IS_NET(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_NET))
-#define KATZE_IS_NET_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_NET))
-#define KATZE_NET_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_NET, KatzeNetClass))
-
-typedef struct _KatzeNet                KatzeNet;
-typedef struct _KatzeNetClass           KatzeNetClass;
-
-GType
-katze_net_get_type                       (void) G_GNUC_CONST;
-
-typedef enum
-{
-    KATZE_NET_VERIFIED,
-    KATZE_NET_MOVED,
-    KATZE_NET_NOT_FOUND,
-    KATZE_NET_FAILED,
-    KATZE_NET_DONE
-} KatzeNetStatus;
-
-typedef struct
-{
-    gchar* uri;
-    KatzeNetStatus status;
-    gchar* mime_type;
-    gchar* data;
-    gint64 length;
-} KatzeNetRequest;
-
-typedef gboolean (*KatzeNetStatusCb)     (KatzeNetRequest*   request,
-                                          gpointer           user_data);
-
-typedef void     (*KatzeNetTransferCb)   (KatzeNetRequest*   request,
-                                          gpointer           user_data);
-
-void
-katze_net_load_uri                       (KatzeNet*          net,
-                                          const gchar*       uri,
-                                          KatzeNetStatusCb   status_cb,
-                                          KatzeNetTransferCb transfer_cb,
-                                          gpointer           user_data);
-
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-gchar*
-katze_net_get_cached_path                (KatzeNet*          net,
-                                          const gchar*       uri,
-                                          const gchar*       subfolder);
-#endif
-
-G_END_DECLS
-
-#endif /* __KATZE_NET_H__ */
index f43bb951407018e91e47b80c0f379da68291133b..db58c154eb4d8f581f643dbb605d38f7ba0e6f9e 100644 (file)
     #include <config.h>
 #endif
 
-#ifdef HAVE_GRANITE
-    #if HAVE_OSX
-        #error FIXME granite on OSX is not implemented
-    #endif
-    #include <granite.h>
-#endif
-
 #include <string.h>
 #include <glib/gi18n.h>
 
@@ -110,7 +103,7 @@ katze_preferences_finalize (GObject* object)
  *
  * Creates a new preferences dialog.
  *
- * Return value: a new #KatzePreferences
+ * Return value: (transfer full): a new #KatzePreferences
  *
  * Since: 0.2.1
  **/
@@ -150,10 +143,9 @@ static void
 katze_preferences_prepare (KatzePreferences* preferences)
 {
     KatzePreferencesPrivate* priv = preferences->priv;
-
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE);
+    
+    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
+    priv->notebook = gtk_stack_new ();
     #else
     priv->notebook = gtk_notebook_new ();
     #endif
@@ -168,7 +160,16 @@ katze_preferences_prepare (KatzePreferences* preferences)
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
     #else
-    priv->toolbar = NULL;
+    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
+        priv->toolbar = gtk_stack_switcher_new ();
+        gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (priv->toolbar), GTK_STACK (priv->notebook));
+        gtk_widget_set_halign (priv->toolbar, GTK_ALIGN_CENTER);
+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
+                        priv->toolbar, FALSE, FALSE, 0);
+    #else
+        priv->toolbar = NULL;
+    #endif
+
     #endif
     priv->toolbutton = NULL;
     gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
@@ -199,6 +200,23 @@ katze_preferences_prepare (KatzePreferences* preferences)
     gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (preferences)));
 }
 
+#if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+/* these functions are used to clear the 100-px width set in GTK3's
+update_button function in gtk/gtkstackswitcher.c */
+
+static void
+clear_size_request (GtkWidget* widget)
+{
+    gtk_widget_set_size_request (widget, -1, -1);
+}
+
+static void
+workaround_stack_switcher_sizing (GtkStackSwitcher* switcher)
+{
+    gtk_container_forall (GTK_CONTAINER (switcher), (GtkCallback)clear_size_request, NULL);
+}
+#endif
+
 /**
  * katze_preferences_add_category:
  * @preferences: a #KatzePreferences instance
@@ -207,6 +225,9 @@ katze_preferences_prepare (KatzePreferences* preferences)
  *
  * Adds a new category with the specified label to the dialog.
  *
+ * Return value: (transfer none): a new #GtkBox in the preferences widget to
+ * hold the category's widgets
+ *
  * Since: 0.2.1
  *
  * Since 0.3.4 a #GtkBox is returned that can be packed into.
@@ -231,14 +252,16 @@ 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)));
+    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+    gtk_stack_add_titled (GTK_STACK (priv->notebook), 
+                         priv->page, label, label);
+    workaround_stack_switcher_sizing (GTK_STACK_SWITCHER (priv->toolbar));
     #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
deleted file mode 100644 (file)
index cd39590..0000000
+++ /dev/null
@@ -1,1053 +0,0 @@
-/*
- Copyright (C) 2007-2010 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include "katze-throbber.h"
-
-#include "katze-utils.h"
-
-#include <glib/gi18n.h>
-#include <math.h>
-
-#define HAVE_SPINNER GTK_CHECK_VERSION (2, 20, 0)
-
-struct _KatzeThrobber
-{
-    #if HAVE_SPINNER
-    GtkSpinner parent_instance;
-    #else
-    GtkMisc parent_instance;
-    #endif
-
-    GtkIconSize icon_size;
-    gchar* icon_name;
-    GdkPixbuf* pixbuf;
-    gchar* stock_id;
-    gboolean animated;
-    gchar* static_icon_name;
-    GdkPixbuf* static_pixbuf;
-    gchar* static_stock_id;
-
-    gint index;
-    gint timer_id;
-    gint width;
-    gint height;
-};
-
-struct _KatzeThrobberClass
-{
-    #if HAVE_SPINNER
-    GtkSpinnerClass parent_class;
-    #else
-    GtkMiscClass parent_class;
-    #endif
-};
-
-#if HAVE_SPINNER
-G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_SPINNER);
-#else
-G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC);
-#endif
-
-enum
-{
-    PROP_0,
-
-    PROP_ICON_SIZE,
-    PROP_ICON_NAME,
-    PROP_PIXBUF,
-    PROP_ANIMATED,
-    PROP_STATIC_ICON_NAME,
-    PROP_STATIC_PIXBUF,
-    PROP_STATIC_STOCK_ID
-};
-
-static void
-katze_throbber_dispose (GObject* object);
-
-static void
-katze_throbber_set_property (GObject* object,
-                             guint prop_id,
-                             const GValue* value,
-                             GParamSpec* pspec);
-
-static void
-katze_throbber_get_property (GObject* object,
-                             guint prop_id,
-                             GValue* value,
-                             GParamSpec* pspec);
-
-static void
-#if GTK_CHECK_VERSION (3, 0, 0)
-katze_throbber_destroy (GtkWidget* object);
-#else
-katze_throbber_destroy (GtkObject* object);
-#endif
-
-static void
-katze_throbber_realize (GtkWidget* widget);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-static void
-katze_throbber_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimal_height,
-                                     gint      *natural_height);
-static void
-katze_throbber_get_preferred_width (GtkWidget *widget,
-                                     gint      *minimal_width,
-                                     gint      *natural_width);
-#endif
-static void
-katze_throbber_unrealize (GtkWidget* widget);
-
-static void
-katze_throbber_map (GtkWidget* widget);
-
-static void
-katze_throbber_unmap (GtkWidget* widget);
-
-static void
-katze_throbber_style_set (GtkWidget* widget,
-                          GtkStyle* style);
-
-static void
-katze_throbber_screen_changed (GtkWidget* widget,
-                               GdkScreen* screen_prev);
-
-static void
-katze_throbber_size_request (GtkWidget*      widget,
-                             GtkRequisition* requisition);
-
-static gboolean
-katze_throbber_expose_event (GtkWidget*      widget,
-#if GTK_CHECK_VERSION (3, 0, 0)
-                             cairo_t* cr);
-#else
-                             GdkEventExpose* event);
-#endif
-
-static void
-icon_theme_changed (KatzeThrobber* throbber);
-
-#if !HAVE_SPINNER
-static gboolean
-katze_throbber_timeout (KatzeThrobber* throbber);
-
-static void
-katze_throbber_timeout_destroy (KatzeThrobber* throbber);
-#endif
-
-static void
-katze_throbber_class_init (KatzeThrobberClass* class)
-{
-    GObjectClass* gobject_class;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-    GtkObjectClass* object_class;
-#endif
-    GtkWidgetClass* widget_class;
-    GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT;
-
-    gobject_class = G_OBJECT_CLASS (class);
-    gobject_class->dispose = katze_throbber_dispose;
-    gobject_class->set_property = katze_throbber_set_property;
-    gobject_class->get_property = katze_throbber_get_property;
-
-    widget_class = GTK_WIDGET_CLASS (class);
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->destroy = katze_throbber_destroy;
-#else
-    object_class = GTK_OBJECT_CLASS (class);
-    object_class->destroy = katze_throbber_destroy;
-#endif
-    widget_class->realize = katze_throbber_realize;
-    widget_class->unrealize = katze_throbber_unrealize;
-    widget_class->map = katze_throbber_map;
-    widget_class->unmap = katze_throbber_unmap;
-    widget_class->style_set = katze_throbber_style_set;
-    widget_class->screen_changed = katze_throbber_screen_changed;
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->get_preferred_width= katze_throbber_get_preferred_width;
-    widget_class->get_preferred_height= katze_throbber_get_preferred_height;
-#else
-    widget_class->size_request = katze_throbber_size_request;
-#endif
-#if GTK_CHECK_VERSION (3, 0, 0)
-    widget_class->draw = katze_throbber_expose_event;
-#else
-    widget_class->expose_event = katze_throbber_expose_event;
-#endif
-    g_object_class_install_property (gobject_class,
-                                     PROP_ICON_SIZE,
-                                     g_param_spec_int (
-                                     "icon-size",
-                                     "Icon size",
-                                     "Symbolic size to use for the animation",
-                                     0, G_MAXINT, GTK_ICON_SIZE_MENU,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_ICON_NAME,
-                                     g_param_spec_string (
-                                     "icon-name",
-                                     "Icon Name",
-                                     "The name of an icon containing animation frames",
-                                     "process-working",
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_PIXBUF,
-                                     g_param_spec_object (
-                                     "pixbuf",
-                                     "Pixbuf",
-                                     "A GdkPixbuf containing animation frames",
-                                     GDK_TYPE_PIXBUF,
-                                     G_PARAM_READWRITE));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_ANIMATED,
-                                     g_param_spec_boolean (
-                                     "animated",
-                                     "Animated",
-                                     "Whether the throbber should be animated",
-                                     FALSE,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_ICON_NAME,
-                                     g_param_spec_string (
-                                     "static-icon-name",
-                                     "Static Icon Name",
-                                     "The name of an icon to be used as the static image",
-                                     NULL,
-                                     flags));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_PIXBUF,
-                                     g_param_spec_object (
-                                     "static-pixbuf",
-                                     "Static Pixbuf",
-                                     "A GdkPixbuf to be used as the static image",
-                                     GDK_TYPE_PIXBUF,
-                                     G_PARAM_READWRITE));
-
-    g_object_class_install_property (gobject_class,
-                                     PROP_STATIC_STOCK_ID,
-                                     g_param_spec_string (
-                                     "static-stock-id",
-                                     "Static Stock ID",
-                                     "The stock ID of an icon to be used as the static image",
-                                     NULL,
-                                     flags));
-}
-
-static void
-katze_throbber_init (KatzeThrobber *throbber)
-{
-    gtk_widget_set_has_window (GTK_WIDGET (throbber), FALSE);
-    #if !HAVE_SPINNER
-    gtk_misc_set_alignment (GTK_MISC (throbber), 0.0, 0.5);
-    #endif
-
-    throbber->timer_id = -1;
-}
-
-static void
-katze_throbber_dispose (GObject* object)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    if (G_UNLIKELY (throbber->timer_id >= 0))
-        g_source_remove (throbber->timer_id);
-
-    (*G_OBJECT_CLASS (katze_throbber_parent_class)->dispose) (object);
-}
-
-static void
-#if GTK_CHECK_VERSION (3, 0, 0)
-katze_throbber_destroy (GtkWidget* object)
-#else
-katze_throbber_destroy (GtkObject* object)
-#endif
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    katze_assign (throbber->icon_name, NULL);
-    katze_object_assign (throbber->pixbuf, NULL);
-    katze_assign (throbber->static_icon_name, NULL);
-    katze_object_assign (throbber->static_pixbuf, NULL);
-    katze_assign (throbber->static_stock_id, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
-    GTK_WIDGET_CLASS (katze_throbber_parent_class)->destroy (object);
-#else
-    GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object);
-#endif
-}
-
-static void
-katze_throbber_set_property (GObject*      object,
-                             guint         prop_id,
-                             const GValue* value,
-                             GParamSpec*   pspec)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    switch (prop_id)
-    {
-    case PROP_ICON_SIZE:
-        katze_throbber_set_icon_size (throbber, g_value_get_int (value));
-        break;
-    case PROP_ICON_NAME:
-        katze_throbber_set_icon_name (throbber, g_value_get_string (value));
-        break;
-    case PROP_PIXBUF:
-        katze_throbber_set_pixbuf (throbber, g_value_get_object (value));
-        break;
-    case PROP_ANIMATED:
-        katze_throbber_set_animated (throbber, g_value_get_boolean (value));
-        break;
-    case PROP_STATIC_ICON_NAME:
-        katze_throbber_set_static_icon_name (throbber, g_value_get_string (value));
-        break;
-    case PROP_STATIC_PIXBUF:
-        katze_throbber_set_static_pixbuf (throbber, g_value_get_object (value));
-        break;
-    case PROP_STATIC_STOCK_ID:
-        katze_throbber_set_static_stock_id (throbber, g_value_get_string (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-katze_throbber_get_property (GObject*    object,
-                             guint       prop_id,
-                             GValue*     value,
-                             GParamSpec* pspec)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (object);
-
-    switch (prop_id)
-    {
-    case PROP_ICON_SIZE:
-        g_value_set_int (value, katze_throbber_get_icon_size (throbber));
-        break;
-    case PROP_ICON_NAME:
-        g_value_set_string (value, katze_throbber_get_icon_name (throbber));
-        break;
-    case PROP_PIXBUF:
-        g_value_set_object (value, katze_throbber_get_pixbuf (throbber));
-        break;
-    case PROP_ANIMATED:
-        g_value_set_boolean (value, katze_throbber_get_animated (throbber));
-        break;
-    case PROP_STATIC_ICON_NAME:
-        g_value_set_string (value, katze_throbber_get_static_icon_name (throbber));
-        break;
-    case PROP_STATIC_PIXBUF:
-        g_value_set_object (value, katze_throbber_get_static_pixbuf (throbber));
-        break;
-    case PROP_STATIC_STOCK_ID:
-        g_value_set_string (value, katze_throbber_get_static_stock_id (throbber));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-/**
- * katze_throbber_new:
- *
- * Creates a new throbber widget.
- *
- * Return value: a new #KatzeThrobber
- **/
-GtkWidget*
-katze_throbber_new (void)
-{
-    KatzeThrobber* throbber = g_object_new (KATZE_TYPE_THROBBER,
-                                            NULL);
-
-    return GTK_WIDGET (throbber);
-}
-
-/**
- * katze_throbber_set_icon_size:
- * @throbber: a #KatzeThrobber
- * @icon_size: the new icon size
- *
- * Sets the desired size of the throbber image. The animation and static image
- * will be displayed in this size. If a pixbuf is used for the animation every
- * single frame is assumed to have this size.
- **/
-void
-katze_throbber_set_icon_size (KatzeThrobber* throbber,
-                              GtkIconSize    icon_size)
-{
-    GtkSettings* gtk_settings;
-
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    gtk_settings = gtk_widget_get_settings (GTK_WIDGET (throbber));
-    g_return_if_fail (gtk_icon_size_lookup_for_settings (gtk_settings,
-                                                         icon_size,
-                                                         &throbber->width,
-                                                         &throbber->height));
-
-    throbber->icon_size = icon_size;
-
-    g_object_notify (G_OBJECT (throbber), "icon-size");
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-}
-
-/**
- * katze_throbber_set_icon_name:
- * @throbber: a #KatzeThrobber
- * @icon_name: an icon name or %NULL
- *
- * Sets the name of an icon that should provide the animation frames.
- *
- * The pixbuf is automatically invalidated.
- **/
-void
-katze_throbber_set_icon_name (KatzeThrobber*  throbber,
-                              const gchar*    icon_name)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    katze_assign (throbber->icon_name, g_strdup (icon_name));
-
-    if (icon_name)
-        icon_theme_changed (throbber);
-
-    g_object_notify (G_OBJECT (throbber), "icon-name");
-}
-
-/**
- * katze_throbber_set_pixbuf:
- * @throbber: a #KatzeThrobber
- * @pixbuf: a #GdkPixbuf or %NULL
- *
- * Sets the pixbuf that should provide the animation frames. Every frame
- * is assumed to have the icon size of the throbber, which can be specified
- * with katze_throbber_set_icon_size ().
- *
- * The icon name is automatically invalidated.
- **/
-void
-katze_throbber_set_pixbuf (KatzeThrobber* throbber,
-                           GdkPixbuf*     pixbuf)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    g_return_if_fail (!pixbuf || GDK_IS_PIXBUF (pixbuf));
-
-    katze_object_assign (throbber->pixbuf, pixbuf);
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (pixbuf)
-    {
-        g_object_ref (pixbuf);
-
-        katze_assign (throbber->icon_name, NULL);
-        g_object_notify (G_OBJECT (throbber), "icon-name");
-    }
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    g_object_notify (G_OBJECT (throbber), "pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_animated:
- * @throbber: a #KatzeThrobber
- * @animated: %TRUE to animate the throbber
- *
- * Sets the animation state of the throbber.
- **/
-void
-katze_throbber_set_animated (KatzeThrobber*  throbber,
-                             gboolean        animated)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    if (G_UNLIKELY (throbber->animated == animated))
-        return;
-
-    throbber->animated = animated;
-
-    #if HAVE_SPINNER
-    g_object_set (throbber, "active", animated, NULL);
-    #else
-    if (animated && (throbber->timer_id < 0))
-        throbber->timer_id = midori_timeout_add (50,
-            (GSourceFunc)katze_throbber_timeout, throbber,
-            (GDestroyNotify)katze_throbber_timeout_destroy);
-    #endif
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    g_object_notify (G_OBJECT (throbber), "animated");
-}
-
-/**
- * katze_throbber_set_static_icon_name:
- * @throbber: a #KatzeThrobber
- * @icon_name: an icon name or %NULL
- *
- * Sets the name of an icon that should provide the static image.
- *
- * The static pixbuf and stock ID are automatically invalidated.
- **/
-void
-katze_throbber_set_static_icon_name (KatzeThrobber*  throbber,
-                                     const gchar*    icon_name)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    katze_assign (throbber->static_icon_name, g_strdup (icon_name));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (icon_name)
-    {
-        katze_assign (throbber->static_stock_id, NULL);
-
-        icon_theme_changed (throbber);
-
-        g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-        g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    }
-
-    g_object_notify (G_OBJECT (throbber), "static-icon-name");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_static_pixbuf:
- * @throbber: a #KatzeThrobber
- * @pixbuf: a #GdkPixbuf or %NULL
- *
- * Sets the pixbuf that should provide the static image. The pixbuf is
- * assumed to have the icon size of the throbber, which can be specified
- * with katze_throbber_set_icon_size ().
- *
- * The static icon name and stock ID are automatically invalidated.
- **/
-void
-katze_throbber_set_static_pixbuf (KatzeThrobber* throbber,
-                                  GdkPixbuf*     pixbuf)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-    g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-
-    katze_object_assign (throbber->static_pixbuf, pixbuf);
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (pixbuf)
-    {
-        g_object_ref (pixbuf);
-
-        katze_assign (throbber->static_icon_name, NULL);
-        katze_assign (throbber->static_stock_id, NULL);
-
-        gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-        g_object_notify (G_OBJECT (throbber), "static-icon-name");
-        g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    }
-
-    g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_set_static_stock_id:
- * @throbber: a #KatzeThrobber
- * @stock_id: a stock ID or %NULL
- *
- * Sets the stock ID of an icon that should provide the static image.
- *
- * The static icon name and pixbuf are automatically invalidated.
- **/
-void
-katze_throbber_set_static_stock_id (KatzeThrobber* throbber,
-                                    const gchar*   stock_id)
-{
-    g_return_if_fail (KATZE_IS_THROBBER (throbber));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-
-    if (stock_id)
-    {
-        GtkStockItem stock_item;
-        g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item));
-
-        g_object_notify (G_OBJECT (throbber), "static-icon-name");
-        g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    }
-
-    katze_assign (throbber->static_stock_id, g_strdup (stock_id));
-
-    if (stock_id)
-        icon_theme_changed (throbber);
-
-    g_object_notify (G_OBJECT (throbber), "static-stock-id");
-    g_object_thaw_notify (G_OBJECT (throbber));
-}
-
-/**
- * katze_throbber_get_icon_size:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the size of the throbber.
- *
- * Return value: the size of the throbber
- **/
-GtkIconSize
-katze_throbber_get_icon_size (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), GTK_ICON_SIZE_INVALID);
-
-    return throbber->icon_size;
-}
-
-/**
- * katze_throbber_get_icon_name:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the name of the icon providing the animation frames.
- *
- * Return value: the name of the icon providing the animation frames, or %NULL
- **/
-const gchar*
-katze_throbber_get_icon_name (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->icon_name;
-}
-
-/**
- * katze_throbber_get_pixbuf:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the #GdkPixbuf providing the animation frames if an icon name
- * or pixbuf is available. The caller of this function does not own a
- * reference to the returned pixbuf.
- *
- * Return value: the pixbuf providing the animation frames, or %NULL
- **/
-GdkPixbuf*
-katze_throbber_get_pixbuf (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->pixbuf;
-}
-
-/**
- * katze_throbber_get_animated:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the status of the animation, whcih can be animated or static.
- *
- * Return value: %TRUE if the throbber is animated
- **/
-gboolean
-katze_throbber_get_animated (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), FALSE);
-
-    return throbber->animated;
-}
-
-/**
- * katze_throbber_get_static_icon_name:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the name of the icon providing the static image, if an icon name
- * for the static image was specified.
- *
- * Return value: the name of the icon providing the static image, or %NULL
- **/
-const gchar*
-katze_throbber_get_static_icon_name (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_icon_name;
-}
-
-/**
- * katze_throbber_get_static pixbuf:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the #GdkPixbuf providing the static image, if an icon name, a
- * pixbuf or a stock ID for the static image was specified. The caller of this
- * function does not own a reference to the returned pixbuf.
- *
- * Return value: the pixbuf providing the static image, or %NULL
- **/
-GdkPixbuf*
-katze_throbber_get_static_pixbuf (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_pixbuf;
-}
-
-/**
- * katze_throbber_get_static_stock_id:
- * @throbber: a #KatzeThrobber
- *
- * Retrieves the stock ID of the icon providing the static image, if a
- * stock ID for the static image was specified.
- *
- * Return value: the stock ID of the icon providing the static image, or %NULL
- **/
-const gchar*
-katze_throbber_get_static_stock_id (KatzeThrobber* throbber)
-{
-    g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL);
-
-    return throbber->static_stock_id;
-}
-
-static void
-katze_throbber_realize (GtkWidget* widget)
-{
-    (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->realize) (widget);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_unrealize (GtkWidget* widget)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget);
-}
-
-static void
-pixbuf_assign_icon (GdkPixbuf**    pixbuf,
-                    const gchar*   icon_name,
-                    KatzeThrobber* throbber)
-{
-    GdkScreen* screen;
-    GtkIconTheme* icon_theme;
-
-    if (*pixbuf)
-        g_object_unref (*pixbuf);
-
-    screen = gtk_widget_get_screen (GTK_WIDGET (throbber));
-    icon_theme = gtk_icon_theme_get_for_screen (screen);
-    *pixbuf = gtk_icon_theme_load_icon (icon_theme,
-                                        icon_name,
-                                        MAX (throbber->width, throbber->height),
-                                        (GtkIconLookupFlags) 0,
-                                        NULL);
-}
-
-static void
-icon_theme_changed (KatzeThrobber* throbber)
-{
-    if (throbber->icon_name)
-        pixbuf_assign_icon (&throbber->pixbuf,
-                            throbber->icon_name, throbber);
-
-    if (throbber->static_icon_name)
-        pixbuf_assign_icon (&throbber->static_pixbuf,
-                            throbber->static_icon_name, throbber);
-    else if (throbber->static_stock_id)
-        katze_object_assign (throbber->static_pixbuf,
-            gtk_widget_render_icon (GTK_WIDGET (throbber),
-                                    throbber->static_stock_id,
-                                    throbber->icon_size,
-                                    NULL));
-
-    g_object_freeze_notify (G_OBJECT (throbber));
-    g_object_notify (G_OBJECT (throbber), "pixbuf");
-    g_object_notify (G_OBJECT (throbber), "static-pixbuf");
-    g_object_thaw_notify (G_OBJECT (throbber));
-
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-}
-
-static void
-katze_throbber_map (GtkWidget* widget)
-{
-    (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->map) (widget);
-}
-
-static void
-katze_throbber_unmap (GtkWidget* widget)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap (widget);
-}
-
-#if !HAVE_SPINNER
-static gboolean
-katze_throbber_timeout (KatzeThrobber*  throbber)
-{
-    throbber->index++;
-    gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-    return throbber->animated;
-}
-
-static void
-katze_throbber_timeout_destroy (KatzeThrobber*  throbber)
-{
-    throbber->index = 0;
-    throbber->timer_id = -1;
-}
-#endif
-
-static void
-katze_throbber_style_set (GtkWidget* widget,
-                          GtkStyle*  prev_style)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set (widget,
-                                                                   prev_style);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_screen_changed (GtkWidget* widget,
-                               GdkScreen* prev_screen)
-{
-    if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed)
-        GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed (
-                                                        widget,
-                                                        prev_screen);
-
-    icon_theme_changed (KATZE_THROBBER (widget));
-}
-
-static void
-katze_throbber_size_request (GtkWidget*      widget,
-                             GtkRequisition* requisition)
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (widget);
-
-    requisition->width = throbber->width;
-    requisition->height = throbber->height;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-    GTK_WIDGET_CLASS (katze_throbber_parent_class)->size_request (widget,
-                                                                  requisition);
-#endif
-}
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-static void
-katze_throbber_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimal_height,
-                                     gint      *natural_height)
-{
-    GtkRequisition requisition;
-
-    katze_throbber_size_request (widget, &requisition);
-
-    *minimal_height = *natural_height = requisition.height;
-}
-
-static void
-katze_throbber_get_preferred_width (GtkWidget *widget,
-                                    gint      *minimal_width,
-                                    gint      *natural_width)
-{
-    GtkRequisition requisition;
-
-    katze_throbber_size_request (widget, &requisition);
-
-    *minimal_width = *natural_width = requisition.width;
-}
-#endif
-
-static void
-katze_throbber_aligned_coords (GtkWidget* widget,
-                               gint*      ax,
-                               gint*      ay)
-{
-    gfloat xalign, yalign;
-    gint xpad, ypad;
-    GtkAllocation allocation;
-    GtkRequisition requisition;
-
-    #if HAVE_SPINNER
-    xalign = 0.0;
-    yalign = 0.5;
-    xpad = ypad = 0.0;
-    #else
-    gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
-    if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-        xalign = 1.0f - xalign;
-    gtk_misc_get_padding (GTK_MISC (widget), &xpad, &ypad);
-    #endif
-
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    allocation.x = allocation.y = 0;
-    allocation.width = gtk_widget_get_allocated_width (widget);
-    allocation.height = gtk_widget_get_allocated_height (widget);
-    gtk_widget_get_preferred_size (widget, &requisition, NULL);
-    #else
-    gtk_widget_get_allocation (widget, &allocation);
-    gtk_widget_size_request (widget, &requisition);
-    #endif
-    *ax = floor (allocation.x + xpad
-        + ((allocation.width - requisition.width) * xalign));
-    *ay = floor (allocation.y + ypad
-        + ((allocation.height - requisition.height) * yalign));
-}
-
-static gboolean
-katze_throbber_expose_event (GtkWidget*      widget,
-#if GTK_CHECK_VERSION (3, 0, 0)
-                             cairo_t* cr)
-#else
-                             GdkEventExpose* event)
-#endif
-{
-    KatzeThrobber* throbber = KATZE_THROBBER (widget);
-    gint ax, ay;
-
-    if (G_UNLIKELY (!throbber->width || !throbber->height))
-        return TRUE;
-
-    if (G_UNLIKELY (!throbber->pixbuf && !throbber->static_pixbuf))
-        if (throbber->animated && !throbber->pixbuf && !throbber->icon_name)
-            return TRUE;
-
-    if (!throbber->animated && (throbber->static_pixbuf
-        || throbber->static_icon_name || throbber->static_stock_id))
-    {
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cairo_t* cr;
-#endif
-        if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->static_pixbuf)
-            {
-                g_warning (_("Named icon '%s' couldn't be loaded"),
-                           throbber->static_icon_name);
-                katze_assign (throbber->static_icon_name, NULL);
-                g_object_notify (G_OBJECT (throbber), "static-icon-name");
-                return TRUE;
-            }
-        }
-        else if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_stock_id))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->static_pixbuf)
-            {
-                g_warning (_("Stock icon '%s' couldn't be loaded"),
-                           throbber->static_stock_id);
-                katze_assign (throbber->static_stock_id, NULL);
-                g_object_notify (G_OBJECT (throbber), "static-stock-id");
-                return TRUE;
-            }
-        }
-
-        katze_throbber_aligned_coords (widget, &ax, &ay);
-
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cr = gdk_cairo_create (gtk_widget_get_window (widget));
-#endif
-        gdk_cairo_set_source_pixbuf (cr, throbber->static_pixbuf, ax, ay);
-        cairo_paint (cr);
-#if !GTK_CHECK_VERSION (3, 0, 0)
-        cairo_destroy (cr);
-#endif
-    }
-    else
-    {
-        #if HAVE_SPINNER
-        if (throbber->animated)
-#if GTK_CHECK_VERSION (3, 0, 0)
-            return GTK_WIDGET_CLASS (katze_throbber_parent_class)->draw (widget, cr);
-#else
-            return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
-#endif
-        #else
-        gint cols, rows;
-
-        if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf))
-        {
-            icon_theme_changed (KATZE_THROBBER (widget));
-
-            if (!throbber->pixbuf)
-            {
-                /* Fallback to a stock icon */
-                katze_assign (throbber->icon_name, g_strdup (GTK_STOCK_EXECUTE));
-                g_object_notify (G_OBJECT (throbber), "icon-name");
-                return TRUE;
-            }
-        }
-
-        cols = gdk_pixbuf_get_width (throbber->pixbuf) / throbber->width;
-        rows = gdk_pixbuf_get_height (throbber->pixbuf) / throbber->height;
-
-        if (G_UNLIKELY (cols == 1 && cols == rows))
-        {
-            katze_throbber_aligned_coords (widget, &ax, &ay);
-
-            if (throbber->animated)
-                gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf,
-                                 0, 0, ax, ay,
-                                 throbber->width, throbber->height,
-                                 GDK_RGB_DITHER_NONE, 0, 0);
-            return TRUE;
-        }
-
-        if (G_LIKELY (cols > 0 && rows > 0))
-        {
-            gint idx;
-            guint x, y;
-
-            katze_throbber_aligned_coords (widget, &ax, &ay);
-
-            idx = throbber->index % (cols * rows);
-            if (G_LIKELY (throbber->timer_id >= 0))
-                idx = MAX (idx, 1);
-
-            x = (idx % cols) * throbber->width;
-            y = (idx / cols) * throbber->height;
-
-            gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf,
-                             x, y, ax, ay,
-                             throbber->width, throbber->height,
-                             GDK_RGB_DITHER_NONE, 0, 0);
-        }
-        else
-        {
-            g_warning (_("Animation frames are broken"));
-            katze_assign (throbber->icon_name, NULL);
-            katze_object_assign (throbber->pixbuf, NULL);
-
-            g_object_freeze_notify (G_OBJECT (throbber));
-            g_object_notify (G_OBJECT (throbber), "icon-name");
-            g_object_notify (G_OBJECT (throbber), "pixbuf");
-            g_object_thaw_notify (G_OBJECT (throbber));
-        }
-        #endif
-    }
-
-    return TRUE;
-}
diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h
deleted file mode 100644 (file)
index 18c212e..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __KATZE_THROBBER_H__
-#define __KATZE_THROBBER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_THROBBER \
-    (katze_throbber_get_type ())
-#define KATZE_THROBBER(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_THROBBER, KatzeThrobber))
-#define KATZE_THROBBER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_THROBBER, KatzeThrobberClass))
-#define KATZE_IS_THROBBER(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_THROBBER))
-#define KATZE_IS_THROBBER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_THROBBER))
-#define KATZE_THROBBER_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_THROBBER, KatzeThrobberClass))
-
-typedef struct _KatzeThrobber                KatzeThrobber;
-typedef struct _KatzeThrobberPrivate         KatzeThrobberPrivate;
-typedef struct _KatzeThrobberClass           KatzeThrobberClass;
-
-
-GType
-katze_throbber_get_type             (void) G_GNUC_CONST;
-
-GtkWidget*
-katze_throbber_new                  (void);
-
-void
-katze_throbber_set_icon_size        (KatzeThrobber*   throbber,
-                                     GtkIconSize      icon_size);
-
-void
-katze_throbber_set_icon_name        (KatzeThrobber*   throbber,
-                                     const gchar*     icon_size);
-
-void
-katze_throbber_set_pixbuf           (KatzeThrobber*   throbber,
-                                     GdkPixbuf*       pixbuf);
-
-void
-katze_throbber_set_animated         (KatzeThrobber*   throbber,
-                                     gboolean         animated);
-
-void
-katze_throbber_set_static_icon_name (KatzeThrobber*   throbber,
-                                     const gchar*     icon_name);
-
-void
-katze_throbber_set_static_pixbuf    (KatzeThrobber*   throbber,
-                                     GdkPixbuf*       pixbuf);
-
-void
-katze_throbber_set_static_stock_id  (KatzeThrobber*   throbber,
-                                     const gchar*     stock_id);
-
-GtkIconSize
-katze_throbber_get_icon_size        (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_icon_name        (KatzeThrobber*   throbber);
-
-GdkPixbuf*
-katze_throbber_get_pixbuf           (KatzeThrobber*   throbber);
-
-gboolean
-katze_throbber_get_animated         (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_static_icon_name (KatzeThrobber    *throbber);
-
-GdkPixbuf*
-katze_throbber_get_static_pixbuf    (KatzeThrobber*   throbber);
-
-const gchar*
-katze_throbber_get_static_stock_id  (KatzeThrobber*   throbber);
-
-G_END_DECLS
-
-#endif /* __KATZE_THROBBER_H__ */
index 39f65e812dce97580b20f0e1ff4d133c7944a44d..4364e830c4852885393683930308b2b9b51cd0d0 100644 (file)
@@ -73,10 +73,12 @@ proxy_uri_file_set_cb (GtkFileChooser* button,
 #if GTK_CHECK_VERSION (3, 2, 0)
 static void
 proxy_font_chooser_font_activated_cb (GtkFontChooser* chooser,
-                                      const gchar*    font_name,
                                       GObject*        object)
 {
-    gtk_font_chooser_set_font (chooser, font_name);
+    PangoFontFamily* font_family = gtk_font_chooser_get_font_family (GTK_FONT_CHOOSER (chooser));
+    const gchar* font_name = pango_font_family_get_name (font_family);
+    const gchar* property = g_object_get_data (G_OBJECT (chooser), "property");
+    g_object_set (object, property, font_name, NULL);
 }
 
 static gboolean
@@ -99,77 +101,11 @@ proxy_combo_box_text_changed_cb (GtkComboBoxText* button,
 }
 #endif
 
-static const gchar*
-katze_app_info_get_commandline (GAppInfo* info)
-{
-    const gchar* exe;
-
-    exe = g_app_info_get_commandline (info);
-    if (!exe)
-        exe = g_app_info_get_executable (info);
-    if (!exe)
-        exe = g_app_info_get_name (info);
-    return exe;
-}
-
 static gboolean
 proxy_entry_focus_out_event_cb (GtkEntry*      entry,
                                 GdkEventFocus* event,
                                 GObject*       object);
 
-static void
-proxy_combo_box_apps_changed_cb (GtkComboBox* button,
-                                 GObject*     object)
-{
-    guint active = gtk_combo_box_get_active (button);
-    GtkTreeModel* model = gtk_combo_box_get_model (button);
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_iter_nth_child (model, &iter, NULL, active))
-    {
-        GAppInfo* info;
-        gboolean use_entry;
-        GtkWidget* child;
-        const gchar* exe;
-        const gchar* property = g_object_get_data (G_OBJECT (button), "property");
-
-        gtk_tree_model_get (model, &iter, 0, &info, -1);
-
-        use_entry = info && !g_app_info_get_icon (info);
-        child = gtk_bin_get_child (GTK_BIN (button));
-        if (use_entry && GTK_IS_CELL_VIEW (child))
-        {
-            GtkWidget* entry = gtk_entry_new ();
-            exe = g_app_info_get_executable (info);
-            if (exe && *exe && strcmp (exe, "%f"))
-                gtk_entry_set_text (GTK_ENTRY (entry), exe);
-            gtk_widget_show (entry);
-            gtk_container_add (GTK_CONTAINER (button), entry);
-            gtk_widget_grab_focus (entry);
-            g_signal_connect (entry, "focus-out-event",
-                G_CALLBACK (proxy_entry_focus_out_event_cb), object);
-            g_object_set_data_full (G_OBJECT (entry), "property",
-                                    g_strdup (property), g_free);
-        }
-        else if (!use_entry && GTK_IS_ENTRY (child))
-        {
-            /* Force the combo to change the item again */
-            gtk_widget_destroy (child);
-            gtk_combo_box_set_active (button, 0);
-            gtk_combo_box_set_active_iter (button, &iter);
-        }
-
-        if (info)
-        {
-            exe = katze_app_info_get_commandline (info);
-            g_object_set (object, property, exe, NULL);
-            g_object_unref (info);
-        }
-        else
-            g_object_set (object, property, "", NULL);
-    }
-}
-
 static void
 proxy_entry_activate_cb (GtkEntry* entry,
                          GObject*  object)
@@ -324,131 +260,6 @@ proxy_widget_string_destroy_cb (GtkWidget* proxy,
         proxy_object_notify_string_cb, proxy);
 }
 
-static GList*
-katze_app_info_get_all_for_category (const gchar* category)
-{
-    #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;
-    GAppInfo* info;
-    GList* app;
-    for (app = apps; app; app = g_list_next (app))
-    {
-        GAppInfo* info = app->data;
-        #ifdef GDK_WINDOWING_X11
-        gchar* filename = g_strconcat ("applications/", g_app_info_get_id (info), NULL);
-        GKeyFile* file = g_key_file_new ();
-
-        if (g_key_file_load_from_data_dirs (file, filename, NULL, G_KEY_FILE_NONE, NULL))
-        {
-            gchar* cat = g_key_file_get_string (file, "Desktop Entry",
-                                                "Categories", NULL);
-            if (cat && g_strrstr (cat, category))
-                apps = g_list_append (apps, info);
-
-            g_free (cat);
-        }
-        g_key_file_free (file);
-        g_free (filename);
-        #else
-        apps = g_list_append (apps, info);
-        #endif
-    }
-    g_list_free (all_apps);
-    return apps;
-}
-
-static gboolean
-proxy_populate_apps (GtkWidget* widget)
-{
-    const gchar* property = g_object_get_data (G_OBJECT (widget), "property");
-    GObject* object = g_object_get_data (G_OBJECT (widget), "object");
-    gchar* string = katze_object_get_string (object, property);
-    if (!g_strcmp0 (string, ""))
-        katze_assign (string, NULL);
-    GtkSettings* settings = gtk_widget_get_settings (widget);
-    gint icon_width = 16;
-    if (settings == NULL)
-        settings = gtk_settings_get_for_screen (gdk_screen_get_default ());
-    gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
-                                       &icon_width, NULL);
-
-    GtkComboBox* combo = GTK_COMBO_BOX (widget);
-    GtkListStore* model = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
-    GtkTreeIter iter_none;
-    gtk_list_store_insert_with_values (model, &iter_none, 0,
-        0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1);
-
-    const gchar* app_type = g_object_get_data (G_OBJECT (widget), "app-type");
-    GList* apps = g_app_info_get_all_for_type (app_type);
-    GAppInfo* info;
-    if (!apps)
-        apps = katze_app_info_get_all_for_category (app_type);
-    if (apps != NULL)
-    {
-        GList* app;
-        for (app = apps; app; app = g_list_next (app))
-        {
-            GAppInfo* info = app->data;
-            const gchar* name = g_app_info_get_name (info);
-            GIcon* icon = g_app_info_get_icon (info);
-            gchar* icon_name;
-            GtkTreeIter iter;
-
-            if (!g_app_info_should_show (info))
-                continue;
-
-            icon_name = icon ? g_icon_to_string (icon) : NULL;
-            gtk_list_store_insert_with_values (model, &iter, G_MAXINT,
-                0, info, 1, icon_name, 2, name, 3, icon_width, -1);
-            if (string && !strcmp (katze_app_info_get_commandline (info), string))
-                gtk_combo_box_set_active_iter (combo, &iter);
-
-            g_free (icon_name);
-        }
-        g_list_free (apps);
-    }
-
-    info = g_app_info_create_from_commandline ("",
-        "", G_APP_INFO_CREATE_NONE, NULL);
-    gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-        0, info, 1, NULL, 2, _("Custom…"), 3, icon_width, -1);
-    g_object_unref (info);
-
-    if (gtk_combo_box_get_active (combo) == -1)
-    {
-        if (string)
-        {
-            GtkWidget* entry;
-            const gchar* exe;
-
-            info = g_app_info_create_from_commandline (string,
-                NULL, G_APP_INFO_CREATE_NONE, NULL);
-            entry = gtk_entry_new ();
-            exe = g_app_info_get_executable (info);
-            if (exe && *exe && strcmp (exe, "%f"))
-                gtk_entry_set_text (GTK_ENTRY (entry), string);
-            gtk_widget_show (entry);
-            gtk_container_add (GTK_CONTAINER (combo), entry);
-            g_object_unref (info);
-            g_signal_connect (entry, "focus-out-event",
-                G_CALLBACK (proxy_entry_focus_out_event_cb), object);
-            g_object_set_data_full (G_OBJECT (entry), "property",
-                                    g_strdup (property), g_free);
-        }
-        else
-            gtk_combo_box_set_active_iter (combo, &iter_none);
-    }
-    g_signal_connect (widget, "changed",
-                      G_CALLBACK (proxy_combo_box_apps_changed_cb), object);
-    return G_SOURCE_REMOVE;
-}
-
 /**
  * katze_property_proxy:
  * @object: a #GObject
@@ -482,6 +293,7 @@ proxy_populate_apps (GtkWidget* widget)
  *         for choosing an application to open TYPE files, ie. "text/plain".
  *     "application-CATEGORY": the widget created will be particularly suitable
  *         for choosing an application to open CATEGORY files, ie. "Network".
+ *      Since 0.5.8 the CATEGORY hint is no longer supported.
  *     "custom-PROPERTY": the last value of an enumeration will be the "custom"
  *         value, where the user may enter text freely, which then updates
  *         the property PROPERTY instead. This applies only to enumerations.
@@ -504,7 +316,7 @@ proxy_populate_apps (GtkWidget* widget)
  * Since 0.2.1 the proxy may contain a label if the platform
  *     has according widgets.
  *
- * Return value: a new widget
+ * Return value: (transfer full): a new widget
  **/
 GtkWidget*
 katze_property_proxy (gpointer     object,
@@ -615,7 +427,8 @@ katze_property_proxy (gpointer     object,
         widget = gtk_font_button_new ();
         gtk_font_button_set_show_size (GTK_FONT_BUTTON (widget), FALSE);
         gtk_font_chooser_set_font (GTK_FONT_CHOOSER (widget), string);
-        g_signal_connect (widget, "font-activated",
+        /* font-activated doesn't work with at least GTK+ 3.8.4 */
+        g_signal_connect (widget, "font-set",
                           G_CALLBACK (proxy_font_chooser_font_activated_cb), object);
         gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (widget),
             (GtkFontFilterFunc)proxy_font_chooser_filter_monospace_cb, GINT_TO_POINTER (monospace), NULL);
@@ -650,27 +463,6 @@ katze_property_proxy (gpointer     object,
         g_free (families);
         #endif
     }
-    else if (type == G_TYPE_PARAM_STRING && hint && g_str_has_prefix (hint, "application-"))
-    {
-        GtkListStore* model;
-        GtkCellRenderer* renderer;
-        const gchar* app_type = &hint[12];
-
-        model = gtk_list_store_new (4, G_TYPE_APP_INFO, G_TYPE_STRING,
-                                       G_TYPE_STRING, G_TYPE_INT);
-        widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
-        renderer = gtk_cell_renderer_pixbuf_new ();
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE);
-        gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "icon-name", 1);
-        gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "width", 3);
-        renderer = gtk_cell_renderer_text_new ();
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
-        gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2);
-
-        g_object_set_data_full (G_OBJECT (widget), "app-type", g_strdup (app_type), g_free);
-        g_object_set_data_full (G_OBJECT (widget), "object", g_object_ref (object), g_object_unref);
-        g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc)proxy_populate_apps, widget, NULL);
-    }
     else if (type == G_TYPE_PARAM_STRING)
     {
         gchar* notify_property;
@@ -705,6 +497,22 @@ katze_property_proxy (gpointer     object,
             G_CALLBACK (proxy_widget_string_destroy_cb), object);
         g_free (notify_property);
     }
+    else if (type == G_TYPE_PARAM_DOUBLE)
+    {
+        gdouble value;
+        g_object_get (object, property, &value, NULL);
+
+        widget = gtk_spin_button_new_with_range (
+            G_PARAM_SPEC_DOUBLE (pspec)->minimum,
+            G_PARAM_SPEC_DOUBLE (pspec)->maximum, 1);
+        /* Keep it narrow, 5 + 2 digits are usually fine */
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 5 + 2);
+        gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 2);
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+        gtk_spin_button_set_increments (GTK_SPIN_BUTTON (widget), 0.1, -0.1);
+        g_signal_connect (widget, "value-changed",
+                          G_CALLBACK (proxy_spin_button_changed_cb), object);
+    }
     else if (type == G_TYPE_PARAM_FLOAT)
     {
         gfloat value;
@@ -936,7 +744,7 @@ katze_widget_popup (GtkWidget*      widget,
  * Creates an image menu item where the label is
  * reasonably ellipsized for you.
  *
- * Return value: a new label widget
+ * Return value: (transfer full): a new label widget
  **/
 GtkWidget*
 katze_image_menu_item_new_ellipsized (const gchar* label)
@@ -1182,7 +990,7 @@ katze_object_get_string (gpointer     object,
  *
  * Retrieve the object value of the specified property.
  *
- * Return value: an object
+ * Return value: (transfer none): an object
  **/
 gpointer
 katze_object_get_object (gpointer     object,
@@ -1284,7 +1092,7 @@ katze_uri_entry_draw_cb (GtkWidget* entry,
  * If @other_widget is given, it will become insensitive if
  * the input is not a valid URI.
  *
- * Returns: a #GtkEntry
+ * Returns: (transfer full): a #GtkEntry
  *
  * Since: 0.3.6
  */
index 0a0a31d10845b379493add07940b256697ce0b6d..6518b65938ef4358fc9b7ba9070351259a8b3741 100644 (file)
 #define __KATZE_H__
 
 #include "katze-http-auth.h"
-#include "katze-http-cookies.h"
-#include "katze-http-cookies-sqlite.h"
-#include "katze-throbber.h"
 #include "katze-utils.h"
 #include "katze-item.h"
 #include "katze-array.h"
 #include "katze-arrayaction.h"
-#include "katze-net.h"
 #include "katze-preferences.h"
 
+#ifndef HAVE_WEBKIT2
+    #include <webkit/webkit.h>
+#else
+    #include <webkit2/webkit2.h>
+#endif
+
 #endif /* __KATZE_H__ */
index 73eb663d115962cde73915af7608ef8ba7079992..f53df7f59d63a0f61d6ed18f57db9b3e8f17f44a 100644 (file)
@@ -33,6 +33,15 @@ namespace Katze {
         public bool get_meta_boolean (string key);
         public int64 get_meta_integer (string key);
         public void set_meta_integer (string key, int64 value);
+        public unowned string? get_meta_string (string key);
+        public void set_meta_string (string key, string value);
+    }
+
+    [CCode (cheader_filename = "katze/katze.h")]
+    public class Preferences : Gtk.Dialog {
+        public unowned Gtk.Box add_category (string label, string icon);
+        public void add_group (string? label);
+        public void add_widget (Gtk.Widget widget, string type);
     }
 }
 
index 2fbf64d9e8b4c1dda9231fe05209a970d2d7ac24..f0677c8d9d7b935d8c8da2b06aa3ac0633b4ff81 100644 (file)
@@ -113,7 +113,16 @@ namespace Midori {
                 tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
                     exec_path, "profile", "tmp");
             }
-            else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
+            else if (mode == RuntimeMode.APP) {
+                config_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+                    Environment.get_user_data_dir (), PACKAGE_NAME, "apps",
+                    Checksum.compute_for_string (ChecksumType.MD5, config, -1));
+                cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+                    Environment.get_user_cache_dir (), PACKAGE_NAME);
+                user_data_dir_for_reading = Environment.get_user_data_dir ();
+                tmp_dir = get_runtime_dir ();
+            }
+            else if (mode == RuntimeMode.PRIVATE) {
                 string? real_config = config != null && !Path.is_absolute (config)
                     ? Path.build_filename (Environment.get_current_dir (), config) : config;
                 readonly_dir = real_config ?? Path.build_path (Path.DIR_SEPARATOR_S,
@@ -124,6 +133,11 @@ namespace Midori {
                 tmp_dir = get_runtime_dir ();
             }
             else {
+#if HAVE_WEBKIT2_3_91
+                /* Allow WebKit to spawn more than one rendering process */
+                if (!("wk2:no-multi-render-process" in (Environment.get_variable ("MIDORI_DEBUG") ?? "")))
+                    WebKit.WebContext.get_default ().set_process_model (WebKit.ProcessModel.MULTIPLE_SECONDARY_PROCESSES);
+#endif
                 string? real_config = config != null && !Path.is_absolute (config)
                     ? Path.build_filename (Environment.get_current_dir (), config) : config;
                 config_dir = real_config ?? Path.build_path (Path.DIR_SEPARATOR_S,
@@ -131,29 +145,44 @@ namespace Midori {
                 cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
                     Environment.get_user_cache_dir (), PACKAGE_NAME);
                 user_data_dir = Environment.get_user_data_dir ();
-#if HAVE_WEBKIT2_A
+                tmp_dir = get_runtime_dir ();
+            }
+#if HAVE_WEBKIT2
+            if (cache_dir != null) {
+                /* Cache and extension dir MUST be set no later than here to work */
+                WebKit.WebContext.get_default ().set_web_extensions_directory (
+                    Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext"));
                 WebKit.WebContext.get_default ().set_disk_cache_directory (
                     Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
-#endif
-#if HAVE_WEBKIT2
+            }
+
+            if (config_dir != null) {
                 var cookie_manager = WebKit.WebContext.get_default ().get_cookie_manager ();
-                cookie_manager.set_persistent_storage (Path.build_filename (config, "cookies.db"),
+                cookie_manager.set_persistent_storage (Path.build_filename (config_dir, "cookies.db"),
                     WebKit.CookiePersistentStorage.SQLITE);
-#endif
-                tmp_dir = get_runtime_dir ();
             }
-#if HAVE_WEBKIT_1_3_13
+#endif
             if (user_data_dir != null) {
                 string folder = Path.build_filename (user_data_dir, "webkit", "icondatabase");
 #if HAVE_WEBKIT2
                 WebKit.WebContext.get_default ().set_favicon_database_directory (folder);
-#elif HAVE_WEBKIT_1_8_0
+#else
                 WebKit.get_favicon_database ().set_path (folder);
-#elif HAVE_WEBKIT_1_3_13
-                WebKit.get_icon_database ().set_path (folder);
 #endif
             }
+            else
+            {
+#if HAVE_WEBKIT2
+                /* with wk2 set_favicon_database_directory can only be called once and actually
+                initializes and enables the favicon database, so we do not call it in this case */
+#else
+                /* wk1 documentation claims that the favicon database is not enabled unless
+                a call to favicon_database.set_path is made, but in fact it must be explicitly
+                disabled by setting to null (verified as of webkitgtk 2.3.1) */
+                WebKit.get_favicon_database ().set_path (null);
 #endif
+            }
+
             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);
@@ -267,18 +296,13 @@ namespace Midori {
 
         public static string make_tmp_dir (string tmpl) {
             assert (tmp_dir != null);
-#if HAVE_GLIB_2_30
             try {
+                mkdir_with_parents (GLib.Environment.get_tmp_dir ());
                 return DirUtils.make_tmp (tmpl);
             }
             catch (Error error) {
                 GLib.error (error.message);
             }
-#else
-            string folder = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_tmp_dir (), tmpl);
-            DirUtils.mkdtemp (folder);
-            return folder;
-#endif
         }
 
         public static void init_exec_path (string[] new_command_line) {
@@ -309,7 +333,7 @@ namespace Midori {
             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 (true), exec_path,
-                               get_res_filename (""), get_lib_path (PACKAGE_NAME));
+                               get_res_filename ("about.css"), get_lib_path (PACKAGE_NAME));
             }
         }
 
@@ -348,6 +372,7 @@ namespace Midori {
 
         public static string get_res_filename (string filename) {
             assert (command_line != null);
+            assert (filename != "");
             #if HAVE_WIN32
             return Path.build_filename (exec_path, "share", PACKAGE_NAME, "res", filename);
             #else
@@ -355,16 +380,28 @@ namespace Midori {
             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);
+            return build_folder ("data", null, filename) ??
+              Path.build_filename (MDATADIR, PACKAGE_NAME, "res", filename);
             #endif
         }
 
+        #if !HAVE_WIN32
+        string? build_folder (string folder, string? middle, string filename) {
+            /* Fallback to build folder */
+            File? parent = File.new_for_path (exec_path);
+            while (parent != null) {
+                var data = parent.get_child (folder);
+                if (middle != null)
+                    data = data.get_child (middle);
+                var child = data.get_child (filename);
+                if (child.query_exists ())
+                    return child.get_path ();
+                parent = parent.get_parent ();
+            }
+            return null;
+        }
+        #endif
+
         /* returns the path to a file containing read-only data installed with the application
         if @res is true, looks in the midori resource folder specifically */
         public static string get_data_filename (string filename, bool res) {
@@ -402,7 +439,8 @@ namespace Midori {
                     return path;
             }
 
-            return Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename);
+            return build_folder ("config", folder, filename) ??
+              Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename);
             #endif
         }
 
@@ -411,16 +449,19 @@ namespace Midori {
             assert (user_data_dir != null);
 #if HAVE_WEBKIT2
             WebKit.WebContext.get_default ().get_favicon_database ().clear ();
-#elif HAVE_WEBKIT_1_8_0
+#else
             WebKit.get_favicon_database ().clear ();
-#elif HAVE_WEBKIT_1_3_13
-            WebKit.get_icon_database ().clear ();
 #endif
             /* FIXME: Exclude search engine icons */
-            remove_path (Path.build_filename (cache_dir, "icons"));
             remove_path (Path.build_filename (user_data_dir, "webkit", "icondatabase"));
         }
 
+        /**
+         * Looks up a pixbuf for the given @uri. If @widget is given a generic
+         * file icon is used in case there's no icon.
+         *
+         * Deprecated: 0.5.8: Use Midori.URI.Icon or Midori.URI.get_icon instead.
+         **/
         public static Gdk.Pixbuf? get_icon (string? uri, Gtk.Widget? widget) {
             if (!Midori.URI.is_resource (uri))
                 return null;
@@ -428,37 +469,15 @@ namespace Midori {
             if (widget != null)
                 Gtk.icon_size_lookup_for_settings (widget.get_settings (),
                     Gtk.IconSize.MENU, out icon_width, out icon_height);
+            else
+                icon_width = icon_height = 0 /* maximum size */;
 #if HAVE_WEBKIT2
-            /* TODO async
-            var database = WebKit.WebContext.get_default ().get_favicon_database ();
-            database.get_favicon.begin (uri, null); */
-#elif HAVE_WEBKIT_1_8_0
+            /* There is no sync API for WebKit2 */
+#else
             Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
                 .try_get_favicon_pixbuf (uri, icon_width, icon_height);
             if (pixbuf != null)
                 return pixbuf;
-#elif HAVE_WEBKIT_1_3_13
-            Gdk.Pixbuf? pixbuf = WebKit.get_icon_database ().get_icon_pixbuf (uri);
-            if (pixbuf != null)
-                return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
-#else
-            if (Midori.URI.is_http (uri)) {
-                try {
-                    uint i = 8;
-                    while (uri[i] != '\0' && uri[i] != '/')
-                        i++;
-                    string icon_uri = (uri[i] == '/')
-                        ? uri.substring (0, i) + "/favicon.ico"
-                        : uri + "/favicon.ico";
-                    string checksum = Checksum.compute_for_string (ChecksumType.MD5, icon_uri, -1);
-                    string filename = checksum + Midori.Download.get_extension_for_uri (icon_uri) ?? "";
-                    string path = Path.build_filename (get_cache_dir_for_reading (), "icons", filename);
-                    Gdk.Pixbuf? pixbuf = new Gdk.Pixbuf.from_file_at_size (path, icon_width, icon_height);
-                    if (pixbuf != null)
-                        return pixbuf;
-                }
-                catch (GLib.Error error) { }
-            }
 #endif
             if (widget != null)
                 return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);
index dc98fc9482e7ff50912cf91adbb45590a63d5732..f4b08811a946f9dc2f7ce455b4f242ce1a03af76 100644 (file)
@@ -16,10 +16,10 @@ namespace GLib {
 
 namespace Midori {
     public class URI : Object {
+        static string? fork_uri = null;
+
         public static string? parse_hostname (string? uri, out string path) {
-            /* path may be null. */
-            if (&path != null)
-                path = null;
+            path = null;
             if (uri == null)
                 return uri;
             unowned string? hostname = uri.chr (-1, '/');
@@ -27,10 +27,8 @@ namespace Midori {
              || hostname.chr (-1, ' ') != null)
                 return null;
             hostname = hostname.offset (2);
-            if (&path != null) {
-                if ((path = hostname.chr (-1, '/')) != null)
-                    return hostname.split ("/")[0];
-            }
+            if ((path = hostname.chr (-1, '/')) != null)
+                return hostname.split ("/")[0];
             return hostname;
         }
         /* Deprecated: 0.4.3 */
@@ -52,16 +50,48 @@ namespace Midori {
             }
             return uri;
         }
-        public static string unescape (string uri) {
-            /* Unescape, pass through + and %20 */
-            if (uri.chr (-1, '%') != null || uri.chr (-1, ' ') != null) {
-                /* Preserve %20 for pasting URLs into other windows */
-                string? unescaped = GLib.Uri.unescape_string (uri, "+");
-                if (unescaped == null)
-                    return uri;
-                return unescaped.replace (" ", "%20").replace ("\n", "%0A");
+        public static string get_base_domain (string uri) {
+#if HAVE_LIBSOUP_2_40_0
+            try {
+                string ascii = to_ascii (uri);
+                return Soup.tld_get_base_domain (ascii);
+            } catch (Error error) {
+                /* This is fine, we fallback to hostname */
             }
-            return uri;
+#endif
+            return parse_hostname (uri, null);
+        }
+
+        public static string unescape (string uri_str) {
+            /* We cannot use g_uri_unescape_string, because it returns NULL if it
+               encounters the sequence '%00', whereas the goal of this function is
+               to unescape all escape sequences except %00, %0A, %0D, %20, and %25 */
+            size_t len = uri_str.length;
+            uint8[] uri = uri_str.data;
+            var escaped = new StringBuilder();
+            for (var i=0; i < len; i++)
+            {
+                uint8 c = uri[i];
+                if (c == '%')
+                {
+                    /* only unescape if there are enough chars for a valid escape sequence */
+                    if (i + 2 < len)
+                    {
+                        var x1 = ((char)uri[i+1]).xdigit_value();
+                        var x2 = ((char)uri[i+2]).xdigit_value();
+                        var x = (x1<<4) + x2;
+                        /* if the escape is valid and the character should be unescaped */
+                        if (x1 >= 0 && x2 >= 0 && x != '\0' && x != '\n' && x != '\r' && x != ' ' && x != '%')
+                        {
+                            /* consume the encoded characters */
+                            c = (uint8)x;
+                            i += 2;
+                        }
+                    }
+                }
+                escaped.append_c((char)c);
+            }
+            return escaped.str;
         }
 
         /* Strip http(s), file and www. for tab titles or completion */
@@ -78,16 +108,16 @@ namespace Midori {
         public static string format_for_display (string? uri) {
             /* Percent-decode and decode puniycode for user display */
             if (uri != null && uri.has_prefix ("http://")) {
-                string unescaped = unescape (uri);
-                if (unescaped == null)
-                    return uri;
-                else if (!unescaped.validate ())
+                string unescaped = unescape (uri).replace(" ", "%20");
+                if (!unescaped.validate ())
                     return uri;
                 string path;
-                string hostname = parse_hostname (unescaped, out path);
-                string decoded = hostname_to_unicode (hostname);
-                if (decoded != null)
-                    return "http://" + decoded + path;
+                string? hostname = parse_hostname (unescaped, out path);
+                if (hostname != null) {
+                    string decoded = hostname_to_unicode (hostname);
+                    if (decoded != null)
+                        return "http://" + decoded + path;
+                }
                 return unescaped;
             }
             return uri;
@@ -192,12 +222,117 @@ namespace Midori {
 
             /* No SHA256: no known usage and no need for strong encryption */
 
-            if (&checksum != null)
-                checksum = fragment != null
-                    ? fragment.offset (delimiter.length) : null;
-            if (&label != null)
-                label = display;
+            checksum = fragment != null ? fragment.offset (delimiter.length) : null;
+            label = display;
             return type;
         }
+
+        /*
+          Protects against recursive invokations of Midori with the same URI.
+          Consider a tel:// URI opened via Tab.open_uri, being handed off to GIO,
+          which in turns calls exo-open, which in turn can't open tel:// and falls
+          back to the browser ie. Midori.
+          So: code opening URIs calls this function with %true, #Midori.App passes %false.
+
+          Since: 0.5.8
+         */
+        public static bool recursive_fork_protection (string uri, bool set_uri) {
+            if (set_uri)
+                fork_uri = uri;
+            return fork_uri != uri;
+        }
+
+        /**
+         * Returns a Glib.Icon for the given @uri.
+         *
+         * Since: 0.5.8
+         **/
+        public static async GLib.Icon? get_icon (string uri, Cancellable? cancellable=null) throws Error {
+#if HAVE_WEBKIT2
+            var database = WebKit.WebContext.get_default ().get_favicon_database ();
+            var surface = yield database.get_favicon (uri, cancellable);
+            var image = (Cairo.ImageSurface)surface;
+            var pixbuf = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
+#else
+            var database = WebKit.get_favicon_database ();
+            // We must not pass a Cancellable due to a crasher bug
+            var pixbuf = yield database.get_favicon_pixbuf (uri, 0, 0, null);
+#endif
+            return pixbuf as GLib.Icon;
+        }
+
+        /**
+         * Returns a Glib.Icon for the given @uri or falls back to @fallback.
+         *
+         * Since: 0.5.8
+         **/
+        public static async GLib.Icon? get_icon_fallback (string uri, GLib.Icon? fallback=null, Cancellable? cancellable=null) {
+        try {
+                return yield get_icon (uri, cancellable);
+            } catch (Error error) {
+                debug ("Icon failed to load: %s", error.message);
+                return fallback;
+            }
+        }
+
+        /**
+         * A Glib.Icon subclass that loads the icon for a given URI.
+         * In the case of an error @fallback will be used.
+         *
+         * Since: 0.5.8
+         **/
+        public class Icon : InitiallyUnowned, GLib.Icon, LoadableIcon {
+            public string uri { get; private set; }
+            public GLib.Icon? fallback { get; private set; }
+            InputStream? stream = null;
+            public Icon (string website_uri, GLib.Icon? fallback=null) {
+                uri = website_uri;
+                /* TODO: Use fallback */
+                this.fallback = fallback;
+            }
+            public bool equal (GLib.Icon? other) {
+                return other is Icon && (other as Icon).uri == uri;
+            }
+            public uint hash () {
+                return uri.hash ();
+            }
+            public InputStream load (int size, out string? type = null, Cancellable? cancellable = null) throws Error {
+                /* Implementation notes:
+                   GTK+ up to GTK+ 3.10 loads any GLib.Icon synchronously
+                   Favicons may be cached but usually trigger loading here
+                   Only one async code path in favour of consistent results
+                 */
+                if (stream != null) {
+                    type = "image/png";
+                    return stream;
+                }
+                load_async.begin (size, cancellable, (obj, res)=>{
+                    try {
+                        stream = load_async.end (res);
+                    }
+                    catch (Error error) {
+                       debug ("Icon failed to load: %s", error.message);
+                    }
+                });
+                throw new FileError.EXIST ("Triggered load - no data yet");
+            }
+
+            public async InputStream load_async (int size, Cancellable? cancellable = null, out string? type = null) throws Error {
+                type = "image/png";
+                if (stream != null)
+                    return stream;
+                var icon = yield get_icon (uri, cancellable);
+                if (icon != null && icon is Gdk.Pixbuf) {
+                    var pixbuf = icon as Gdk.Pixbuf;
+                    // TODO: scale it to "size" here
+                    uint8[] buffer;
+                    pixbuf.save_to_buffer (out buffer, "png");
+                    stream = new MemoryInputStream.from_data (buffer, null);
+                }
+                else
+                    throw new FileError.EXIST ("No icon available");
+                return stream;
+            }
+        }
     }
 }
diff --git a/midori/CMakeLists.txt b/midori/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b8655e9
--- /dev/null
@@ -0,0 +1,86 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+set(LIBMIDORI_VERSION 0.5.5)
+set(LIBMIDORI_SOVERSION 0)
+
+file(GLOB MIDORI_VALA_SOURCE ../katze/*.vala *.vala ../panels/*.vala)
+file(GLOB LIBMIDORI_SOURCE ../katze/*.c ../panels/*.c ../toolbars/*.c midori-*.vala midori-*.c sokoke.c)
+include(GLibHelpers)
+add_glib_marshal(LIBMIDORI_SOURCE marshal ${CMAKE_PROJECT_NAME}_cclosure_marshal "midori.h")
+set(MIDORI_SOURCE
+    main.c
+    )
+
+include(ValaPrecompile)
+vala_precompile(LIBMIDORI_SOURCE_C ${CMAKE_PROJECT_NAME}
+    ${MIDORI_VALA_SOURCE}
+PACKAGES
+    ${PKGS}
+OPTIONS
+    ${VALAFLAGS}
+CUSTOM_VAPIS
+    ${EXTRA_VAPIS}
+GENERATE_VAPI
+    "${CMAKE_PROJECT_NAME}-core"
+GENERATE_HEADER
+    "${CMAKE_PROJECT_NAME}-core"
+)
+
+add_library("${LIBMIDORI}-vala" STATIC ${LIBMIDORI_SOURCE_C})
+target_link_libraries("${LIBMIDORI}-vala"
+                      ${DEPS_LIBRARIES}
+                      ${OPTS_LIBRARIES}
+                      ${DEPS_GTK_LIBRARIES}
+                      )
+set_target_properties("${LIBMIDORI}-vala" PROPERTIES
+                      COMPILE_FLAGS "${VALA_CFLAGS}"
+                      POSITION_INDEPENDENT_CODE ON
+                      )
+
+add_library(${LIBMIDORI} SHARED ${LIBMIDORI_SOURCE})
+include_directories(
+                    ${CMAKE_SOURCE_DIR}
+                    ${CMAKE_CURRENT_SOURCE_DIR}
+                    "${CMAKE_SOURCE_DIR}/katze"
+                    "${CMAKE_SOURCE_DIR}/toolbars"
+                    ${CMAKE_BINARY_DIR}
+                    ${DEPS_INCLUDE_DIRS}
+                    ${OPTS_INCLUDE_DIRS}
+                    ${DEPS_GTK_INCLUDE_DIRS}
+                    )
+target_link_libraries(${LIBMIDORI}
+                      "${LIBMIDORI}-vala"
+                      ${DEPS_LIBRARIES}
+                      ${OPTS_LIBRARIES}
+                      ${DEPS_GTK_LIBRARIES}
+                      )
+set_target_properties(${LIBMIDORI} PROPERTIES
+                      COMPILE_FLAGS ${CFLAGS}
+                      SOVERSION 1
+                      VERSION 0.0.0
+                      )
+if (WIN32)
+    install(TARGETS ${LIBMIDORI}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            )
+else ()
+    install(TARGETS ${LIBMIDORI}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
+endif ()
+
+if (WIN32)
+    add_executable(${CMAKE_PROJECT_NAME} WIN32 main.c "${CMAKE_SOURCE_DIR}/data/midori.rc")
+else()
+    add_executable(${CMAKE_PROJECT_NAME} main.c)
+endif()
+
+target_link_libraries(${CMAKE_PROJECT_NAME}
+                      ${LIBMIDORI})
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
+                      COMPILE_FLAGS ${CFLAGS}
+                      )
+install(TARGETS ${CMAKE_PROJECT_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )
diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
deleted file mode 100644 (file)
index c1dd746..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Christian Hammond.
- * Copyright (C) 2008 Cody Russell  <bratsche@gnome.org>
- *
- * 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.
- */
-
-#ifndef __GTK_ICON_ENTRY_H__
-#define __GTK_ICON_ENTRY_H__
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-    #define GtkIconEntryPosition GtkEntryIconPosition
-    #define GTK_ICON_ENTRY_PRIMARY GTK_ENTRY_ICON_PRIMARY
-    #define GTK_ICON_ENTRY_SECONDARY GTK_ENTRY_ICON_SECONDARY
-    #define GTK_ICON_ENTRY GTK_ENTRY
-    #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock
-    #define gtk_icon_entry_set_icon_from_icon_name gtk_entry_set_icon_from_icon_name
-
-    #define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text
-    #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
-
-G_END_DECLS
-
-#endif /* __GTK_ICON_ENTRY_H__ */
index 7c92ea71959878f25e197a98fd56b2825bb5de6c..00bc3b4b6f1645ec9b75d1ec3c0ddd5d13004533 100644 (file)
@@ -39,36 +39,16 @@ plain_entry_activate_cb (GtkWidget* entry,
     g_free (uri);
 }
 
-#define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0)
-
 #ifndef HAVE_WEBKIT2
 static void
 snapshot_load_finished_cb (GtkWidget*      web_view,
                            WebKitWebFrame* web_frame,
                            gchar*          filename)
 {
-    #if HAVE_OFFSCREEN
     GdkPixbuf* pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (
         gtk_widget_get_parent (web_view)));
     gdk_pixbuf_save (pixbuf, filename, "png", NULL, "compression", "7", NULL);
     g_object_unref (pixbuf);
-    #else
-    GError* error;
-    GtkPrintOperation* operation = gtk_print_operation_new ();
-
-    gtk_print_operation_set_export_filename (operation, filename);
-    error = NULL;
-    webkit_web_frame_print_full (web_frame, operation,
-        GTK_PRINT_OPERATION_ACTION_EXPORT, &error);
-
-    if (error != NULL)
-    {
-        g_error ("%s", error->message);
-        gtk_main_quit ();
-    }
-
-    g_object_unref (operation);
-    #endif
     g_print (_("Snapshot saved to: %s\n"), filename);
     gtk_main_quit ();
 }
@@ -174,7 +154,7 @@ main (int    argc,
         g_string_free (versions, TRUE);
 
         g_print (
-          "Copyright (c) 2007-2012 Christian Dywan\n\n"
+          "Copyright (c) 2007-2013 Christian Dywan\n\n"
           "%s\n"
           "\t%s\n\n"
           "%s\n"
@@ -239,7 +219,7 @@ main (int    argc,
             else if (type == G_TYPE_PARAM_ENUM)
             {
                 GEnumClass* enum_class = G_ENUM_CLASS (g_type_class_peek (pspec->value_type));
-                gint j = 0;
+                guint j = 0;
                 tname_string = g_string_new ("");
                 for (j = 0; j < enum_class->n_values; j++)
                 {
@@ -268,14 +248,10 @@ main (int    argc,
         gchar* filename;
         GtkWidget* web_view;
         gchar* uri;
-        #if HAVE_OFFSCREEN
         GtkWidget* offscreen;
         GdkScreen* screen;
 
         gint fd = g_file_open_tmp ("snapshot-XXXXXX.png", &filename, &error);
-        #else
-        gint fd = g_file_open_tmp ("snapshot-XXXXXX.pdf", &filename, &error);
-        #endif
         close (fd);
 
         if (error)
@@ -291,7 +267,6 @@ main (int    argc,
         }
 
         web_view = webkit_web_view_new ();
-        #if HAVE_OFFSCREEN
         offscreen = gtk_offscreen_window_new ();
         gtk_container_add (GTK_CONTAINER (offscreen), web_view);
         if ((screen = gdk_screen_get_default ()))
@@ -300,7 +275,6 @@ main (int    argc,
         else
             gtk_widget_set_size_request (web_view, 800, 600);
         gtk_widget_show_all (offscreen);
-        #endif
         #ifndef HAVE_WEBKIT2
         g_signal_connect (web_view, "load-finished",
             G_CALLBACK (snapshot_load_finished_cb), filename);
@@ -398,7 +372,7 @@ main (int    argc,
 
     if (webapp)
     {
-        MidoriBrowser* browser = midori_web_app_new (config, webapp,
+        MidoriBrowser* browser = midori_web_app_new (webapp,
             uris, execute, inactivity_reset, block_uris);
         g_signal_connect (browser, "destroy", G_CALLBACK (gtk_main_quit), NULL);
         g_signal_connect (browser, "quit", G_CALLBACK (gtk_main_quit), NULL);
@@ -407,7 +381,7 @@ main (int    argc,
     }
 
     MidoriApp* app = midori_normal_app_new (config,
-        portable ? "portable" : "normal", diagnostic_dialog, webapp,
+        portable ? "portable" : "normal", diagnostic_dialog,
         uris, execute, inactivity_reset, block_uris);
     if (app == NULL)
         return 0;
@@ -417,6 +391,7 @@ main (int    argc,
     g_signal_connect (app, "quit", G_CALLBACK (gtk_main_quit), NULL);
     gtk_main ();
     midori_normal_app_on_quit (app);
+    g_object_unref (app);
     return 0;
 }
 
index df8bfd3fcf77b01f6a103b773eaee456cd6f0c99..d331229ddf51e9ef9fc9f8c15eed783df9f4db28 100644 (file)
@@ -1,7 +1,9 @@
+BOOLEAN:POINTER
 BOOLEAN:OBJECT
 BOOLEAN:OBJECT,OBJECT
-BOOLEAN:OBJECT,UINT
+BOOLEAN:OBJECT,OBJECT,POINTER
 BOOLEAN:VOID
+BOOLEAN:STRING
 OBJECT:OBJECT
 VOID:BOOLEAN,STRING
 VOID:OBJECT,ENUM,BOOLEAN
index 25ba4c41e2d695c5653f2feb554b3b87224d9184..15b0a47099bdae4b00bfa654c81aa7b6bf232914 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -13,6 +13,7 @@
 #ifdef _WIN32
     #define _WIN32_WINNT 0x0501
     #include <unistd.h>
+    #include <windows.h>
 #endif
 
 #if HAVE_CONFIG_H
     #include <locale.h>
 #endif
 
-#if HAVE_UNIQUE
-    typedef gpointer MidoriAppInstance;
-    #define MidoriAppInstanceNull NULL
-    #if defined(G_DISABLE_DEPRECATED) && !defined(G_CONST_RETURN)
-        #define G_CONST_RETURN
-    #endif
-    #include <unique/unique.h>
-    #ifdef G_DISABLE_DEPRECATED
-        #undef G_CONST_RETUTN
-    #endif
-    #define MIDORI_UNIQUE_COMMAND 1
-#else
-    typedef gint MidoriAppInstance;
-    #define MidoriAppInstanceNull -1
-    #include "socket.h"
-#endif
-
-#if HAVE_LIBNOTIFY
+#ifdef HAVE_LIBNOTIFY
     #include <libnotify/notify.h>
     #ifndef NOTIFY_CHECK_VERSION
         #define NOTIFY_CHECK_VERSION(x,y,z) 0
@@ -63,7 +47,7 @@
 
 struct _MidoriApp
 {
-    GObject parent_instance;
+    GApplication parent_instance;
 
     MidoriWebSettings* settings;
     KatzeArray* bookmarks;
@@ -75,18 +59,13 @@ struct _MidoriApp
     KatzeArray* browsers;
 
     MidoriBrowser* browser;
-    MidoriAppInstance instance;
-
-    #if !HAVE_LIBNOTIFY
-    gchar* program_notify_send;
-    #endif
 };
 
 static gchar* app_name = NULL;
 
 struct _MidoriAppClass
 {
-    GObjectClass parent_class;
+    GApplicationClass parent_class;
 
     /* Signals */
     void
@@ -99,7 +78,7 @@ struct _MidoriAppClass
     (*quit)                   (MidoriApp*     app);
 };
 
-G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_APPLICATION);
 
 enum
 {
@@ -250,12 +229,6 @@ _midori_app_add_browser (MidoriApp*     app,
     #endif
 
     app->browser = browser;
-    #if HAVE_UNIQUE
-    /* We *do not* let unique watch windows because that includes
-        bringing windows in the foreground, even from other workspaces.
-    if (app->instance)
-        unique_app_watch_window (app->instance, GTK_WINDOW (browser)); */
-    #endif
 }
 
 #ifdef HAVE_SIGNAL_H
@@ -477,265 +450,183 @@ static void
 midori_app_raise_window (GtkWindow* window,
                          GdkScreen* screen)
 {
-    gtk_window_set_screen (window, screen);
+    if (screen)
+        gtk_window_set_screen (window, screen);
     gtk_window_present (window);
     gtk_window_deiconify (window);
 }
 
-static gboolean
-midori_app_command_received (MidoriApp*   app,
-                             const gchar* command,
-                             gchar**      uris,
-                             GdkScreen*   screen)
+static void
+midori_app_debug_open (MidoriApp*   app,
+                       GFile**      files,
+                       gint         n_files,
+                       const gchar* hint)
 {
-    if (!screen)
+    if (midori_debug ("app"))
     {
-        if (app->browser && gtk_widget_has_screen (GTK_WIDGET (app->browser)))
-            screen = gtk_widget_get_screen (GTK_WIDGET (app->browser));
-        else
-            screen = gdk_screen_get_default ();
+        g_print ("app(%s) open: %d files [",
+                 g_application_get_is_remote (G_APPLICATION (app)) ? "send" : "receive",
+                 n_files);
+        gint i;
+        for (i = 0; i < n_files; i++)
+        {
+            gchar* uri = g_file_get_uri (files[i]);
+            g_print ("%s ", uri);
+            g_free (uri);
+        }
+        g_print ("] hint '%s'\n", hint);
     }
+}
 
-    if (g_str_equal (command, "activate"))
-    {
-        if (!app->browser)
-            return FALSE;
+static void
+midori_app_activate_cb (MidoriApp* app,
+                        gpointer   user_data)
+{
+    if (midori_debug ("app"))
+        g_print ("app(receive) activate\n");
+    if (app->browser)
+        midori_app_raise_window (GTK_WINDOW (app->browser), NULL);
+}
 
-        midori_app_raise_window (GTK_WINDOW (app->browser), screen);
-        return TRUE;
-    }
-    else if (g_str_equal (command, "new"))
+static void
+midori_app_open_cb (MidoriApp* app,
+                    GFile**    files,
+                    gint       n_files,
+                    gchar*     hint,
+                    gpointer   user_data)
+{
+    midori_app_debug_open (app, files, n_files, hint);
+
+    if (!strcmp (hint, "window"))
     {
         MidoriBrowser* browser = midori_app_create_browser (app);
         midori_app_add_browser (app, browser);
         midori_browser_add_uri (browser, "about:home");
         midori_browser_activate_action (browser, "Location");
         gtk_widget_show (GTK_WIDGET (browser));
-        midori_app_raise_window (GTK_WINDOW (browser), screen);
-        return TRUE;
+        midori_app_raise_window (GTK_WINDOW (browser), NULL);
+        return;
     }
-    else if (g_str_equal (command, "open"))
-    {
-        if (!app->browser)
-            return FALSE;
 
-        if (!uris)
-            return FALSE;
-        else
-        {
-            MidoriBrowser* browser;
-            MidoriNewPage open_external_pages_in;
-            gboolean first;
-
-            g_object_get (app->settings, "open-new-pages-in",
-                          &open_external_pages_in, NULL);
-            if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW)
-            {
-                browser = midori_app_create_browser (app);
-                midori_app_add_browser (app, browser);
-                gtk_widget_show (GTK_WIDGET (browser));
-            }
-            else
-                browser = app->browser;
-
-            midori_app_raise_window (GTK_WINDOW (browser), screen);
-
-            first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT);
-            while (*uris)
-            {
-                gchar* fixed_uri = g_uri_unescape_string (*uris, NULL);
-                if (sokoke_recursive_fork_protection (fixed_uri, FALSE))
-                {
-                    if (first)
-                    {
-                        midori_browser_set_current_uri (browser, fixed_uri);
-                        first = FALSE;
-                    }
-                    else
-                    {
-                        /* Switch to already open tab if possible */
-                        KatzeArray* items = midori_browser_get_proxy_array (browser);
-                        KatzeItem* found = katze_array_find_uri (items, fixed_uri);
-                        if (found != NULL)
-                            midori_browser_set_current_item (browser, found);
-                        else
-                            midori_browser_set_current_tab (browser,
-                                midori_browser_add_uri (browser, fixed_uri));
-                    }
-                }
-                g_free (fixed_uri);
-                uris++;
-            }
-            return TRUE;
-        }
-    }
-    else if (g_str_equal (command, "command"))
+    if (n_files == 0 && strcmp (hint, ""))
     {
-        if (!uris || !app->browser)
-            return FALSE;
-        gint i;
-        for (i = 0; uris && uris[i]; i++)
-            midori_browser_activate_action (app->browser, uris[i]);
-        return TRUE;
+        midori_browser_activate_action (app->browser, hint);
+        return;
     }
 
-    return FALSE;
-}
+    MidoriBrowser* browser;
+    MidoriNewPage open_external_pages_in;
+    gboolean first;
 
-#if HAVE_UNIQUE
-static UniqueResponse
-midori_browser_message_received_cb (UniqueApp*         instance,
-                                    gint               command,
-                                    UniqueMessageData* message,
-                                    guint              timestamp,
-                                    MidoriApp*         app)
-{
-  gboolean success;
-  GdkScreen* screen = unique_message_data_get_screen (message);
-
-  switch (command)
-  {
-  case UNIQUE_ACTIVATE:
-      success = midori_app_command_received (app, "activate", NULL, screen);
-      break;
-  case UNIQUE_NEW:
-      success = midori_app_command_received (app, "new", NULL, screen);
-      break;
-  case UNIQUE_OPEN:
-  {
-      gchar** uris = unique_message_data_get_uris (message);
-      success = midori_app_command_received (app, "open", uris, screen);
-      /* g_strfreev (uris); */
-      break;
-  }
-  case MIDORI_UNIQUE_COMMAND:
-  {
-      gchar** uris = unique_message_data_get_uris (message);
-      success = midori_app_command_received (app, "command", uris, screen);
-      /* g_strfreev (uris); */
-      break;
-  }
-  default:
-      success = FALSE;
-      break;
-  }
-
-  return success ? UNIQUE_RESPONSE_OK : UNIQUE_RESPONSE_FAIL;
-}
-#else
-static gboolean
-midori_app_io_channel_watch_cb (GIOChannel*  channel,
-                                GIOCondition condition,
-                                MidoriApp*   app)
-{
-    GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (app->browser));
-    gint fd, sock;
-    gchar buf[4096];
-    struct sockaddr_in caddr;
-    guint caddr_len = sizeof(caddr);
+    g_object_get (app->settings, "open-new-pages-in", &open_external_pages_in, NULL);
+    if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW)
+    {
+        browser = midori_app_create_browser (app);
+        midori_app_add_browser (app, browser);
+        gtk_widget_show (GTK_WIDGET (browser));
+    }
+    else
+        browser = app->browser;
+    midori_app_raise_window (GTK_WINDOW (browser), NULL);
 
-    fd = app->instance;
-    sock = accept (fd, (struct sockaddr *)&caddr, &caddr_len);
+    first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT);
 
-    while (fd_gets (sock, buf, sizeof (buf)) != -1)
+    gint i;
+    for (i = 0; i < n_files; i++)
     {
-        if (strncmp (buf, "activate", 8) == 0)
+        gchar* uri = g_file_get_uri (files[i]);
+        if (midori_uri_recursive_fork_protection (uri, FALSE))
         {
-            midori_app_command_received (app, "open", NULL, screen);
-        }
-        else if (strncmp (buf, "new", 3) == 0)
-        {
-            midori_app_command_received (app, "new", NULL, screen);
-        }
-        else if (strncmp (buf, "open", 4) == 0)
-        {
-            while (fd_gets (sock, buf, sizeof (buf)) != -1 && *buf != '.')
+            if (first)
             {
-                gchar** uris = g_strsplit (g_strstrip (buf), "\n", 2);
-                midori_app_command_received (app, "open", uris, screen);
-                g_strfreev (uris);
+                midori_browser_set_current_uri (browser, uri);
+                first = FALSE;
             }
-        }
-        else if (strncmp (buf, "command", 7) == 0)
-        {
-            guint i = 0;
-            gchar** uris = g_new (gchar*, 100);
-            while (fd_gets (sock, buf, sizeof (buf)) != -1 && *buf != '.')
+            else
             {
-                uris[i++] = g_strdup (g_strstrip (buf));
-                if (i == 99)
-                    break;
+                /* Switch to already open tab if possible */
+                KatzeArray* items = midori_browser_get_proxy_array (browser);
+                KatzeItem* found = katze_array_find_uri (items, uri);
+                if (found != NULL)
+                    midori_browser_set_current_item (browser, found);
+                else
+                    midori_browser_set_current_tab (browser,
+                        midori_browser_add_uri (browser, uri));
             }
-            uris[i] = NULL;
-            midori_app_command_received (app, "command", uris, screen);
-            g_strfreev (uris);
         }
+        g_free (uri);
     }
-
-    fd_close (sock);
-
-    return TRUE;
 }
-#endif
 
-static MidoriAppInstance
-midori_app_create_instance (MidoriApp* app)
+static void
+midori_app_startup_cb (GApplication* app,
+                       gpointer      user_data)
 {
-    MidoriAppInstance instance;
-    GdkDisplay* display;
-    gchar* display_name;
-    gchar* instance_name;
-    #if !HAVE_UNIQUE
-    gboolean exists;
-    GIOChannel* channel;
-    #endif
-
-    if (!(display = gdk_display_get_default ()))
-        return MidoriAppInstanceNull;
+    g_signal_connect (app, "activate",
+                      G_CALLBACK (midori_app_activate_cb), NULL);
+    g_signal_connect (app, "open",
+                      G_CALLBACK (midori_app_open_cb), NULL);
+}
 
+static void
+midori_app_network_changed (GNetworkMonitor* monitor,
+                            gboolean         available,
+                            MidoriApp*       app)
+{
+    if (available) 
     {
-        #if HAVE_UNIQUE
-        const gchar* config = midori_paths_get_config_dir_for_reading ();
-        gchar* config_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1);
-        gchar* name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, app_name, -1);
-        katze_assign (app_name, g_strconcat (PACKAGE_NAME,
-            "_", config_hash, "_", name_hash, NULL));
-        g_free (config_hash);
-        g_free (name_hash);
-        #else
-        katze_assign (app_name, g_strdup (PACKAGE_NAME));
-        #endif
-        g_object_notify (G_OBJECT (app), "name");
+        MidoriBrowser *browser;
+        KATZE_ARRAY_FOREACH_ITEM (browser, app->browsers) {
+            GList* tabs = midori_browser_get_tabs (browser);
+            for (; tabs != NULL; tabs = g_list_next (tabs))
+                if (midori_tab_get_load_error (MIDORI_TAB (tabs->data)) == MIDORI_LOAD_ERROR_NETWORK)
+                    midori_view_reload (tabs->data, FALSE);
+            g_list_free (tabs);
+        }
     }
+}
 
+static void
+midori_app_create_instance (MidoriApp* app)
+{
+    if (g_application_get_is_registered (G_APPLICATION (app)))
+        return;
+
+    const gchar* config = midori_paths_get_config_dir_for_reading ();
+    gchar* config_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1);
+    gchar* name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, app_name, -1);
+    katze_assign (app_name, g_strconcat (PACKAGE_NAME,
+        "_", config_hash, "_", name_hash, NULL));
+    g_free (config_hash);
+    g_free (name_hash);
+    g_object_notify (G_OBJECT (app), "name");
+
+    GdkDisplay* display = gdk_display_get_default ();
     #ifdef GDK_WINDOWING_X11
     /* On X11: :0 or :0.0 which is equivalent */
-    display_name = g_strndup (gdk_display_get_name (display), 2);
+    gchar* display_name = g_strndup (gdk_display_get_name (display), 2);
     #else
-    display_name = g_strdup (gdk_display_get_name (display));
+    gchar* display_name = g_strdup (gdk_display_get_name (display));
     #endif
     g_strdelimit (display_name, ":.\\/", '_');
-    instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app_name, display_name);
+    gchar* instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app_name, display_name);
     g_free (display_name);
     katze_assign (app_name, instance_name);
 
-    #if HAVE_UNIQUE
-    instance = unique_app_new (instance_name, NULL);
-    unique_app_add_command (instance, "midori-command", MIDORI_UNIQUE_COMMAND);
-    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_for_writing (), &exists);
-    g_object_set_data (G_OBJECT (app), "sock-exists",
-        exists ? (gpointer)0xdeadbeef : NULL);
-    if (instance != MidoriAppInstanceNull)
-    {
-        channel = g_io_channel_unix_new (instance);
-        g_io_add_watch (channel, G_IO_IN | G_IO_PRI | G_IO_ERR,
-            (GIOFunc)midori_app_io_channel_watch_cb, app);
-    }
-    #endif
-    return instance;
+    if (midori_debug ("app"))
+        g_print ("app registering %s\n", app_name);
+    g_object_set (app,
+                  "application-id", app_name,
+                  "flags", G_APPLICATION_HANDLES_OPEN,
+                  NULL);
+    g_signal_connect (app, "startup", G_CALLBACK (midori_app_startup_cb), NULL);
+
+    g_signal_connect (g_network_monitor_get_default (), "network-changed",
+                       G_CALLBACK (midori_app_network_changed), app);
+
+    GError* error = NULL;
+    if (!g_application_register (G_APPLICATION (app), NULL, &error))
+        midori_error (error->message);
 }
 
 const gchar*
@@ -747,6 +638,11 @@ midori_app_get_name (MidoriApp* app)
 gboolean
 midori_app_get_crashed (MidoriApp* app)
 {
+    static gint cache = -1;
+
+    if (cache != -1)
+        return (gboolean) cache;
+
     if (!midori_paths_is_readonly ())
     {
         /* We test for the presence of a dummy file which is created once
@@ -756,10 +652,14 @@ midori_app_get_crashed (MidoriApp* app)
         if (!crashed)
             g_file_set_contents (config_file, "RUNNING", -1, NULL);
         g_free (config_file);
-        if (crashed)
+        if (crashed) {
+            cache = 1;
             return TRUE;
+        }
     }
 
+    cache = 0;
+
     return FALSE;
 }
 
@@ -791,12 +691,8 @@ midori_app_init (MidoriApp* app)
     app->extensions = katze_array_new (KATZE_TYPE_ARRAY);
     app->browsers = katze_array_new (MIDORI_TYPE_BROWSER);
 
-    app->instance = MidoriAppInstanceNull;
-
-    #if HAVE_LIBNOTIFY
+    #ifdef HAVE_LIBNOTIFY
     notify_init (PACKAGE_NAME);
-    #else
-    app->program_notify_send = g_find_program_in_path ("notify-send");
     #endif
 }
 
@@ -815,17 +711,9 @@ midori_app_finalize (GObject* object)
     katze_object_assign (app->extensions, NULL);
     katze_object_assign (app->browsers, NULL);
 
-    #if HAVE_UNIQUE
-    katze_object_assign (app->instance, NULL);
-    #else
-    sock_cleanup ();
-    #endif
-
-    #if HAVE_LIBNOTIFY
+    #ifdef HAVE_LIBNOTIFY
     if (notify_is_initted ())
         notify_uninit ();
-    #else
-        katze_assign (app->program_notify_send, NULL);
     #endif
 
     G_OBJECT_CLASS (midori_app_parent_class)->finalize (object);
@@ -981,14 +869,8 @@ midori_app_instance_is_running (MidoriApp* app)
     else if (instance_is_running)
         return TRUE;
 
-    if (app->instance == MidoriAppInstanceNull)
-        app->instance = midori_app_create_instance (app);
-
-    #if HAVE_UNIQUE
-    return app->instance && unique_app_is_running (app->instance);
-    #else
-    return g_object_get_data (G_OBJECT (app), "sock-exists") != NULL;
-    #endif
+    midori_app_create_instance (app);
+    return g_application_get_is_remote (G_APPLICATION (app));
 }
 
 /**
@@ -1008,21 +890,10 @@ midori_app_instance_send_activate (MidoriApp* app)
     g_return_val_if_fail (MIDORI_IS_APP (app), FALSE);
     g_return_val_if_fail (midori_app_instance_is_running (app), FALSE);
 
-    #if HAVE_UNIQUE
-    if (app->instance)
-    {
-        UniqueResponse response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL);
-        if (response == UNIQUE_RESPONSE_OK)
-            return TRUE;
-    }
-    #else
-    if (app->instance > -1)
-    {
-        send_open_command (app->instance, "activate", NULL);
-        return TRUE;
-    }
-    #endif
-    return FALSE;
+    if (midori_debug ("app"))
+        g_print ("app(send) activate\n");
+    g_application_activate (G_APPLICATION (app));
+    return TRUE;
 }
 
 /**
@@ -1040,21 +911,9 @@ midori_app_instance_send_new_browser (MidoriApp* app)
     g_return_val_if_fail (MIDORI_IS_APP (app), FALSE);
     g_return_val_if_fail (midori_app_instance_is_running (app), FALSE);
 
-    #if HAVE_UNIQUE
-    if (app->instance)
-    {
-        UniqueResponse response = unique_app_send_message (app->instance, UNIQUE_NEW, NULL);
-        if (response == UNIQUE_RESPONSE_OK)
-            return TRUE;
-    }
-    #else
-    if (app->instance > -1)
-    {
-        send_open_command (app->instance, "new", NULL);
-        return TRUE;
-    }
-    #endif
-    return FALSE;
+    midori_app_debug_open (app, NULL, -1, "window");
+    g_application_open (G_APPLICATION (app), NULL, -1, "window");
+    return TRUE;
 }
 
 /**
@@ -1077,37 +936,19 @@ midori_app_instance_send_uris (MidoriApp* app,
     g_return_val_if_fail (midori_app_instance_is_running (app), FALSE);
     g_return_val_if_fail (uris != NULL, FALSE);
 
-    #if HAVE_UNIQUE
-    if (app->instance)
+    gint n_files = g_strv_length (uris);
+    GFile** files = g_new (GFile*, n_files);
+    /* Encode URLs to avoid GFile treating them wrongly */
+    int i;
+    for (i = 0; i < n_files; i++)
     {
-        UniqueMessageData* message;
-        UniqueResponse response;
-        /* Encode any IDN addresses because libUnique doesn't like them */
-        int i = 0;
-        while (uris[i] != NULL)
-        {
-            gchar* new_uri = sokoke_magic_uri (uris[i], TRUE, TRUE);
-            gchar* escaped_uri = g_uri_escape_string (new_uri, NULL, FALSE);
-            g_free (new_uri);
-            katze_assign (uris[i], escaped_uri);
-            i++;
-        }
-
-        message = unique_message_data_new ();
-        unique_message_data_set_uris (message, uris);
-        response = unique_app_send_message (app->instance, UNIQUE_OPEN, message);
-        unique_message_data_free (message);
-        if (response == UNIQUE_RESPONSE_OK)
-            return TRUE;
+        gchar* new_uri = sokoke_magic_uri (uris[i], TRUE, TRUE);
+        files[i] = g_file_new_for_uri (new_uri);
+        g_free (new_uri);
     }
-    #else
-    if (app->instance > -1)
-    {
-        send_open_command (app->instance, "open", uris);
-        return TRUE;
-    }
-    #endif
-    return FALSE;
+    midori_app_debug_open (app, files, n_files, "");
+    g_application_open (G_APPLICATION (app), files, n_files, "");
+    return TRUE;
 }
 
 /**
@@ -1136,32 +977,19 @@ midori_app_send_command (MidoriApp* app,
     {
         MidoriBrowser* browser = midori_browser_new ();
         int i;
-        for (i=0; command && command[i]; i++)
+        for (i = 0; command && command[i]; i++)
             midori_browser_assert_action (browser, command[i]);
         gtk_widget_destroy (GTK_WIDGET (browser));
-        return midori_app_command_received (app, "command", command, NULL);
     }
 
-    #if HAVE_UNIQUE
-    if (app->instance)
+    gint n_files = g_strv_length (command);
+    int i;
+    for (i = 0; i < n_files; i++)
     {
-        UniqueResponse response;
-        UniqueMessageData* message = unique_message_data_new ();
-        unique_message_data_set_uris (message, command);
-        response = unique_app_send_message (app->instance,
-            MIDORI_UNIQUE_COMMAND, message);
-        unique_message_data_free (message);
-        if (response == UNIQUE_RESPONSE_OK)
-            return TRUE;
+        midori_app_debug_open (app, NULL, 0, command[i]);
+        g_application_open (G_APPLICATION (app), NULL, 0, command[i]);
     }
-    #else
-    if (app->instance > -1)
-    {
-        send_open_command (app->instance, "command", command);
-        return TRUE;
-    }
-    #endif
-    return FALSE;
+    return TRUE;
 }
 
 /**
@@ -1301,7 +1129,7 @@ midori_app_send_notification (MidoriApp*   app,
     g_return_if_fail (MIDORI_IS_APP (app));
     g_return_if_fail (title);
 
-    #if HAVE_LIBNOTIFY
+    #ifdef HAVE_LIBNOTIFY
     if (notify_is_initted ())
     {
         #if NOTIFY_CHECK_VERSION (0, 7, 0)
@@ -1312,21 +1140,14 @@ midori_app_send_notification (MidoriApp*   app,
         notify_notification_show (note, NULL);
         g_object_unref (note);
     }
-    #else
-    /* Fall back to the command line program "notify-send" */
-    if (app->program_notify_send)
-    {
-        gchar* msgq = g_shell_quote (message);
-        gchar* titleq = g_shell_quote (title);
-        gchar* command = g_strdup_printf ("%s -i midori %s %s",
-            app->program_notify_send, titleq, msgq);
-
-        g_spawn_command_line_async (command, NULL);
-
-        g_free (titleq);
-        g_free (msgq);
-        g_free (command);
-    }
+    #elif !defined(G_OS_WIN32)
+    GNotification* notification = g_notification_new (title);
+    g_notification_set_body (notification, message);
+    GIcon* icon = g_themed_icon_new ("midori");
+    g_notification_set_icon (notification, icon);
+    g_object_unref (icon);
+    g_application_send_notification (G_APPLICATION (app), NULL, notification);
+    g_object_unref (notification);
     #endif
 }
 
@@ -1343,6 +1164,7 @@ midori_app_setup (gint               *argc,
                   gchar**            *argument_vector,
                   const GOptionEntry *entries)
 {
+
     GtkIconSource* icon_source;
     GtkIconSet* icon_set;
     GtkIconFactory* factory;
@@ -1352,6 +1174,8 @@ midori_app_setup (gint               *argc,
 
     static GtkStockItem items[] =
     {
+        { "network-error" },
+        { "network-idle" },
         { STOCK_IMAGE },
         { MIDORI_STOCK_WEB_BROWSER },
         { STOCK_NEWS_FEED },
@@ -1394,12 +1218,6 @@ midori_app_setup (gint               *argc,
     }
     #endif
 
-    /* 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 */
@@ -1422,10 +1240,7 @@ midori_app_setup (gint               *argc,
     textdomain (GETTEXT_PACKAGE);
     #endif
 
-    #ifdef HAVE_GRANITE_CLUTTER
-    success = gtk_clutter_init_with_args (argc, argument_vector, _("[Addresses]"),
-                                          (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
-    #elif GTK_CHECK_VERSION (3, 0, 0)
+    #if GTK_CHECK_VERSION (3, 0, 0)
     success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
                                   entries, GETTEXT_PACKAGE, &error);
     #else
@@ -1469,8 +1284,7 @@ gboolean
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks ";
-    const gchar* full_debug_tokens = "adblock:match adblock:time startup ";
+    const gchar* debug_tokens = "wk2:no-multi-render-process adblock:match adblock:parse adblock:time adblock:element adblock:css startup headers body referer cookies paths hsts unarmed db:bookmarks db:history db:tabby mouse app database addons:match ";
     if (debug_token == NULL)
     {
         gchar* found_token;
@@ -1480,15 +1294,7 @@ midori_debug (const gchar* token)
             g_warning ("MIDORI_TOUCHSCREEN is obsolete: "
                 "GTK+ 3.4 enables touchscreens automatically, "
                 "older GTK+ versions aren't supported as of Midori 0.4.9");
-        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)) == ' ')
+        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);
@@ -1497,12 +1303,11 @@ midori_debug (const gchar* token)
         if (!debug_token)
         {
             debug_token = "INVALID";
-            g_print ("Supported values: %s\nWith full debugging: %s\n",
-                     debug_tokens, full_debug_tokens);
+            g_print ("Supported values: %s\n", debug_tokens);
         }
     }
     if (debug_token != g_intern_static_string ("NONE")
-     && !strstr (debug_tokens, token) && !strstr (full_debug_tokens, token))
+     && !strstr (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);
 }
index 65d12ccf28289b8ba46f160690decbdf6910ba7a..13aaedd61c5c5dca1473b854fec1631624d95e2f 100644 (file)
@@ -97,13 +97,13 @@ katze_array_from_xmlNodePtr (xmlNodePtr cur)
         if (katze_str_equal ((gchar*)cur->name, "title"))
         {
             gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
-            katze_item_set_text (KATZE_ITEM (array), value);
+            katze_item_set_name (KATZE_ITEM (array), value);
             xmlFree (value);
         }
         else if (katze_str_equal ((gchar*)cur->name, "desc"))
         {
             gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
-            katze_item_set_name (KATZE_ITEM (array), value);
+            katze_item_set_text (KATZE_ITEM (array), value);
             xmlFree (value);
         }
         else if (katze_str_equal ((gchar*)cur->name, "info"))
@@ -986,7 +986,17 @@ midori_array_to_file (KatzeArray*  array,
     return FALSE;
 }
 
-static void
+/**
+ * katze_item_set_value_from_columne:
+ * @stmt: prepared statement
+ * @column: column to read
+ * @item: #KatzeItem to populate
+ *
+ * Stores the column in the given #KatzeItem.
+ *
+ * Since: 0.2.7
+ **/
+void
 katze_item_set_value_from_column (sqlite3_stmt* stmt,
                                   gint          column,
                                   KatzeItem*    item)
@@ -1021,9 +1031,10 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt,
           || g_str_equal (name, "last_visit") || g_str_equal (name, "visit_count")
           || g_str_equal (name, "pos_panel") || g_str_equal (name, "pos_bar"))
     {
-        gint value;
-        value = sqlite3_column_int64 (stmt, column);
-        katze_item_set_meta_integer (item, name, value);
+        /* use text to properly handle NULL values */
+        const unsigned char* text;
+        text = sqlite3_column_text (stmt, column);
+        katze_item_set_meta_string (item, name, (gchar*)text);
     }
     else if (g_str_equal (name, "desc"))
     {
@@ -1069,6 +1080,17 @@ katze_array_from_statement (sqlite3_stmt* stmt)
         item = katze_item_new ();
         for (i = 0; i < cols; i++)
             katze_item_set_value_from_column (stmt, i, item);
+
+        if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            g_object_unref (item);
+
+            item = KATZE_ITEM (katze_array_new (KATZE_TYPE_ITEM));
+
+            for (i = 0; i < cols; i++)
+                katze_item_set_value_from_column (stmt, i, item);
+        }
+
         katze_array_add_item (array, item);
     }
 
@@ -1102,95 +1124,3 @@ katze_array_from_sqlite (sqlite3*     db,
 
     return katze_array_from_statement (stmt);
 }
-
-/**
- * midori_array_query_recursive:
- * @array: the main bookmark array
- * @fields: comma separated list of fields
- * @condition: condition, like "folder = '%q'"
- * @value: a value to be inserted if @condition contains %q
- * @recursive: if %TRUE include children
- *
- * Stores the result in a #KatzeArray.
- *
- * Return value: a #KatzeArray on success, %NULL otherwise
- *
- * Since: 0.4.4
- **/
-KatzeArray*
-midori_array_query_recursive (KatzeArray*  bookmarks,
-                              const gchar* fields,
-                              const gchar* condition,
-                              const gchar* value,
-                              gboolean     recursive)
-{
-    sqlite3* db;
-    gchar* sqlcmd;
-    char* sqlcmd_value;
-    KatzeArray* array;
-    KatzeItem* item;
-    GList* list;
-
-    g_return_val_if_fail (KATZE_IS_ARRAY (bookmarks), NULL);
-    g_return_val_if_fail (fields, NULL);
-    g_return_val_if_fail (condition, NULL);
-    db = g_object_get_data (G_OBJECT (bookmarks), "db");
-    g_return_val_if_fail (db != NULL, NULL);
-
-    sqlcmd = g_strdup_printf ("SELECT %s FROM bookmarks WHERE %s "
-                              "ORDER BY (uri='') ASC, title DESC", fields, condition);
-    if (strstr (condition, "%q"))
-    {
-        sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : "");
-        array = katze_array_from_sqlite (db, sqlcmd_value);
-        sqlite3_free (sqlcmd_value);
-    }
-    else
-        array = katze_array_from_sqlite (db, sqlcmd);
-    g_free (sqlcmd);
-
-    if (!recursive)
-        return array;
-
-    KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
-    {
-        if (KATZE_ITEM_IS_FOLDER (item))
-        {
-            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), katze_item_get_name (item));
-            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);
-}
-
index 1ff78638f980347b08b2eb86609a9406818cd5e7..adaa107649e8060b1cfcb0b3df866c1e585ce6ed 100644 (file)
@@ -27,21 +27,13 @@ midori_array_to_file   (KatzeArray*  array,
                         const gchar* format,
                         GError**     error);
 
-KatzeArray*
-katze_array_from_statement (sqlite3_stmt* stmt);
+void
+katze_item_set_value_from_column (sqlite3_stmt* stmt,
+                                  gint          column,
+                                  KatzeItem*    item);
 
 KatzeArray*
-midori_array_query     (KatzeArray*  array,
-                        const gchar* fields,
-                        const gchar* condition,
-                        const gchar* value);
-
-KatzeArray*
-midori_array_query_recursive (KatzeArray*  array,
-                              const gchar* fields,
-                              const gchar* condition,
-                              const gchar* value,
-                              gboolean     recursive);
+katze_array_from_statement (sqlite3_stmt* stmt);
 
 KatzeArray*
 katze_array_from_sqlite (sqlite3*     db,
diff --git a/midori/midori-bookmarks-db.c b/midori/midori-bookmarks-db.c
new file mode 100644 (file)
index 0000000..7a633d0
--- /dev/null
@@ -0,0 +1,1151 @@
+/*
+ Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010 Alexander Butenko <a.butenka@gmail.com>
+
+ 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-db.h"
+
+#include "midori-app.h"
+#include "midori-array.h"
+#include "sokoke.h"
+#include "midori-core.h"
+
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+
+#include <config.h>
+#ifdef HAVE_UNISTD_H
+    #include <unistd.h>
+#endif
+
+/**
+ * SECTION:midory-bookmarks-db
+ * @short_description: A #KatzeArray connected to a database
+ * @see_also: #KatzeArray
+ *
+ * #MidoriBookmarksDb is a #KatzeArray specialized for database
+ * interraction.
+ */
+
+struct _MidoriBookmarksDb
+{
+    KatzeArray  parent_instance;
+
+    sqlite3*    db;
+    GHashTable* all_items;
+};
+
+struct _MidoriBookmarksDbClass
+{
+    KatzeArrayClass parent_class;
+
+    /* Signals */
+    void
+    (*update_item)            (MidoriBookmarksDb* bookmarks,
+                               gpointer    item);
+};
+
+G_DEFINE_TYPE (MidoriBookmarksDb, midori_bookmarks_db, KATZE_TYPE_ARRAY);
+
+enum {
+    UPDATE_ITEM,
+
+    LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+static void
+_midori_bookmarks_db_add_item (KatzeArray* array,
+                               gpointer    item);
+
+static void
+_midori_bookmarks_db_update_item (MidoriBookmarksDb* bookmarks,
+                                  gpointer    item);
+
+static void
+_midori_bookmarks_db_remove_item (KatzeArray* array,
+                                  gpointer   item);
+
+static void
+_midori_bookmarks_db_move_item (KatzeArray* array,
+                                gpointer    item,
+                                gint        position);
+
+static void
+_midori_bookmarks_db_clear (KatzeArray* array);
+
+static void
+midori_bookmarks_db_finalize (GObject* object);
+
+static gint64
+midori_bookmarks_db_insert_item_db (sqlite3*   db,
+                                    KatzeItem* item,
+                                    gint64     parentid);
+
+static gboolean
+midori_bookmarks_db_update_item_db (sqlite3*   db,
+                                    KatzeItem* item);
+
+static gboolean
+midori_bookmarks_db_remove_item_db (sqlite3*   db,
+                                    KatzeItem* item);
+
+static guint
+item_hash (gconstpointer item)
+{
+    gint64 id = katze_item_get_meta_integer (KATZE_ITEM (item), "id");
+    return g_int64_hash (&id);
+}
+
+static gboolean
+item_equal (gconstpointer item_a, gconstpointer item_b)
+{
+    gint64 id_a = katze_item_get_meta_integer (KATZE_ITEM (item_a), "id");
+    gint64 id_b = katze_item_get_meta_integer (KATZE_ITEM (item_b), "id");
+    return (id_a == id_b)? TRUE : FALSE;
+}
+
+static void
+midori_bookmarks_db_class_init (MidoriBookmarksDbClass* class)
+{
+    GObjectClass* gobject_class;
+    KatzeArrayClass* katze_array_class;
+
+    gobject_class = G_OBJECT_CLASS (class);
+    gobject_class->finalize = midori_bookmarks_db_finalize;
+
+    signals[UPDATE_ITEM] = g_signal_new (
+        "update-item",
+        G_TYPE_FROM_CLASS (class),
+        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+        G_STRUCT_OFFSET (MidoriBookmarksDbClass, update_item),
+        0,
+        NULL,
+        g_cclosure_marshal_VOID__POINTER,
+        G_TYPE_NONE, 1,
+        G_TYPE_POINTER);
+
+    katze_array_class = KATZE_ARRAY_CLASS (class);
+
+    katze_array_class->add_item = _midori_bookmarks_db_add_item;
+    katze_array_class->remove_item = _midori_bookmarks_db_remove_item;
+    katze_array_class->move_item = _midori_bookmarks_db_move_item;
+    katze_array_class->clear = _midori_bookmarks_db_clear;
+
+    class->update_item = _midori_bookmarks_db_update_item;
+}
+
+static void
+midori_bookmarks_db_init (MidoriBookmarksDb* bookmarks)
+{
+    bookmarks->db = NULL;
+    bookmarks->all_items = g_hash_table_new (item_hash, item_equal);
+
+    katze_item_set_meta_integer (KATZE_ITEM (bookmarks), "id", -1);
+    katze_item_set_name (KATZE_ITEM (bookmarks), _("Bookmarks"));
+    g_hash_table_insert (bookmarks->all_items, bookmarks, bookmarks);
+    /* g_object_ref (bookmarks); */
+}
+
+static void
+midori_bookmarks_db_finalize (GObject* object)
+{
+    MidoriBookmarksDb* bookmarks = MIDORI_BOOKMARKS_DB (object);
+
+    if (bookmarks->db)
+    {
+        sqlite3_close (bookmarks->db);
+    }
+
+    g_hash_table_unref (bookmarks->all_items);
+
+    G_OBJECT_CLASS (midori_bookmarks_db_parent_class)->finalize (object);
+}
+
+/**
+ * midori_bookmarks_db_get_item_parent:
+ * @bookmarks: the main bookmarks array
+ * @item: a #KatzeItem
+ *
+ * Internal function that find the parent of the @item thanks to its %parentid
+ **/
+static KatzeArray*
+midori_bookmarks_db_get_item_parent (MidoriBookmarksDb* bookmarks,
+                                     gpointer    item)
+{
+    gint64 parentid = katze_item_get_meta_integer (KATZE_ITEM (item), "parentid");
+    KatzeItem *search = katze_item_new ();
+    KatzeArray* parent;
+
+    if (!parentid)
+    {
+        parentid = katze_item_get_meta_integer (KATZE_ITEM (bookmarks), "id");
+        katze_item_set_meta_integer (KATZE_ITEM (item), "parentid", parentid);
+    }
+
+    katze_item_set_meta_integer(search, "id", parentid);
+
+    parent = KATZE_ARRAY (g_hash_table_lookup (bookmarks->all_items, search));
+
+    g_object_unref (search);
+
+    if (!parent)
+    {
+        parent = KATZE_ARRAY (bookmarks);
+        katze_item_set_meta_integer (KATZE_ITEM (item), "parentid",
+            katze_item_get_meta_integer (KATZE_ITEM (bookmarks), "id"));
+    }
+
+    return parent;
+}
+
+/**
+ * _midori_bookmarks_db_add_item:
+ * @array: the main bookmarks array
+ * @item: a #KatzeItem
+ *
+ * Internal function that overloads the #KatzeArray %katze_array_add_item().
+ * It relays the add item to the appropriate #KatzeArray.
+ **/
+static void
+_midori_bookmarks_db_add_item (KatzeArray* array,
+                               gpointer    item)
+{
+    MidoriBookmarksDb *bookmarks;
+    KatzeArray* parent;
+    KatzeArray* db_parent;
+
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (array));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+
+    bookmarks = MIDORI_BOOKMARKS_DB (array);
+
+    parent = katze_item_get_parent (KATZE_ITEM (item));
+
+    db_parent = midori_bookmarks_db_get_item_parent (bookmarks, item);
+
+    if (parent == db_parent)
+    {
+        if (IS_MIDORI_BOOKMARKS_DB (parent))
+            KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->update (parent);
+        else if (KATZE_IS_ARRAY (parent))
+            katze_array_update (parent);
+        return;
+    }
+
+    if (IS_MIDORI_BOOKMARKS_DB (db_parent))
+        KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->add_item (db_parent, item);
+    else if (KATZE_IS_ARRAY (db_parent))
+        katze_array_add_item (db_parent, item);
+
+    g_assert (db_parent == katze_item_get_parent (KATZE_ITEM (item)));
+}
+
+/**
+ * _midori_bookmarks_db_update_item:
+ * @array: the main bookmarks array
+ * @item: a #KatzeItem
+ *
+ * Internal function that implements the %midori_bookmarks_db_update_item() post-processing.
+ * It relays an update to the appropriate #KatzeArray.
+ **/
+static void
+_midori_bookmarks_db_update_item (MidoriBookmarksDb* bookmarks,
+                                  gpointer    item)
+{
+    KatzeArray* parent;
+
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+
+    parent = katze_item_get_parent (KATZE_ITEM (item));
+
+    g_return_if_fail (parent);
+
+    if (IS_MIDORI_BOOKMARKS_DB (parent))
+        KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->update (parent);
+    else
+        katze_array_update (parent);
+}
+
+/**
+ * _midori_bookmarks_db_remove_item:
+ * @array: the main bookmarks array
+ * @item: a #KatzeItem
+ *
+ * Internal function that overloads the #KatzeArray %katze_array_remove_item().
+ * It relays the remove item to the appropriate #KatzeArray.
+ **/
+static void
+_midori_bookmarks_db_remove_item (KatzeArray* array,
+                                  gpointer   item)
+{
+    KatzeArray* parent;
+
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (array));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+
+    parent = katze_item_get_parent (KATZE_ITEM (item));
+
+    g_return_if_fail (parent);
+
+    if (IS_MIDORI_BOOKMARKS_DB (parent))
+        KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->remove_item (parent, item);
+    else if (KATZE_IS_ARRAY (parent))
+        katze_array_remove_item (parent, item);
+}
+
+/**
+ * _midori_bookmarks_db_move_item:
+ * @array: the main bookmarks array
+ * @item: a #KatzeItem
+ * @position: the new @item position
+ *
+ * Internal function that overloads the #KatzeArray %katze_array_move_item().
+ * It relays the move @item to the appropriate #KatzeArray.
+ **/
+static void
+_midori_bookmarks_db_move_item (KatzeArray* array,
+                                gpointer    item,
+                                gint        position)
+{
+    KatzeArray* parent;
+
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (array));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+
+    parent = katze_item_get_parent (KATZE_ITEM (item));
+
+    g_return_if_fail (parent);
+
+    KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->move_item (parent, item, position);
+}
+
+/**
+ * _midori_bookmarks_db_clear:
+ * @array: the main bookmarks array
+ *
+ * Internal function that overloads the #KatzeArray %katze_array_clear().
+ * It deletes the whole bookmarks data.
+ **/
+static void
+_midori_bookmarks_db_clear (KatzeArray* array)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (array));
+
+    g_critical ("_midori_bookmarks_db_clear: not implemented\n");
+}
+
+/**
+ * midori_bookmarks_db_signal_update_item:
+ * @array: a #KatzeArray
+ * @item: an item
+ *
+ * Notify an update of the item of the array.
+ *
+ **/
+static void
+midori_bookmarks_db_signal_update_item (MidoriBookmarksDb* array,
+                                        gpointer    item)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (array));
+
+    g_signal_emit (array, signals[UPDATE_ITEM], 0, item);
+}
+
+/**
+ * midori_bookmarks_db_add_item_recursive:
+ * @item: the removed #KatzeItem
+ * @bookmarks : the main bookmarks array
+ *
+ * Internal function that creates memory records of the added @item.
+ * If @item is a #KatzeArray, the function recursiveley adds records
+ * of all its childs.
+ **/
+static gint
+midori_bookmarks_db_add_item_recursive (MidoriBookmarksDb* bookmarks,
+                                        KatzeItem* item)
+{
+    GList* list;
+    KatzeArray* array;
+    gint64 id = 0;
+    gint count = 0;
+    gint64 parentid = katze_item_get_meta_integer (item, "parentid");
+
+    id = midori_bookmarks_db_insert_item_db (bookmarks->db, item, parentid);
+    count++;
+
+    g_object_ref (item);
+    g_hash_table_insert (bookmarks->all_items, item, item);
+
+    if (!KATZE_IS_ARRAY (item))
+        return count;
+
+    array = KATZE_ARRAY (item);
+
+    KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
+    {
+        katze_item_set_meta_integer (item, "parentid", id);
+        count += midori_bookmarks_db_add_item_recursive (bookmarks, item);
+    }
+
+    g_list_free (list);
+    return count;
+}
+
+/**
+ * midori_bookmarks_db_remove_item_recursive:
+ * @item: the removed #KatzeItem
+ * @bookmarks : the main bookmarks array
+ *
+ * Internal function that removes memory records of the removed @item.
+ * If @item is a #KatzeArray, the function recursiveley removes records
+ * of all its childs.
+ **/
+static void
+midori_bookmarks_db_remove_item_recursive (KatzeItem*  item,
+                                           MidoriBookmarksDb* bookmarks)
+{
+    gpointer found;
+    KatzeArray* array;
+    KatzeItem* child;
+    GList* list;
+
+    if (NULL != (found = g_hash_table_lookup (bookmarks->all_items, item)))
+    {
+        g_hash_table_remove (bookmarks->all_items, found);
+        g_object_unref (found);
+    }
+
+    if (!KATZE_IS_ARRAY (item))
+        return;
+
+    array = KATZE_ARRAY (item);
+
+    KATZE_ARRAY_FOREACH_ITEM_L (child, array, list)
+    {
+        midori_bookmarks_db_remove_item_recursive (child, bookmarks);
+    }
+
+    g_list_free (list);
+}
+
+/**
+ * midori_bookmarks_db_insert_item_db:
+ * @db: the #sqlite3
+ * @item: #KatzeItem the item to insert
+ *
+ * Internal function that does the actual SQL INSERT of the @item in @db.
+ *
+ * Since: 0.5.2
+ **/
+static gint64
+midori_bookmarks_db_insert_item_db (sqlite3*   db,
+                                    KatzeItem* item,
+                                    gint64     parentid)
+{
+    gchar* sqlcmd;
+    char* errmsg = NULL;
+    KatzeItem* old_parent;
+    gchar* new_parentid;
+    gchar* id = NULL;
+    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);
+
+    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");
+
+    if (KATZE_ITEM_IS_BOOKMARK (item))
+        uri = katze_item_get_uri (item);
+
+    if (katze_item_get_text (item))
+        desc = katze_item_get_text (item);
+
+    /* Use folder, otherwise fallback to parent folder */
+    old_parent = katze_item_get_parent (item);
+    if (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"));
+    else
+        new_parentid = g_strdup_printf ("NULL");
+
+    sqlcmd = sqlite3_mprintf (
+        "INSERT INTO bookmarks (id, parentid, title, uri, desc, toolbar, app) "
+        "VALUES (%q, %q, '%q', '%q', '%q', %d, %d)",
+        id,
+        new_parentid,
+        katze_item_get_name (item),
+        katze_str_non_null (uri),
+        katze_str_non_null (desc),
+        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
+    {
+        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;
+}
+
+/**
+ * midori_bookmarks_db_update_item_db:
+ * @db: the #sqlite3
+ * @item: #KatzeItem the item to update
+ *
+ * Internal function that does the actual SQL UPDATE of the @item in @db.
+ *
+ * Since: 0.5.2
+ **/
+static gboolean
+midori_bookmarks_db_update_item_db (sqlite3*   db,
+                                 KatzeItem* item)
+{
+    gchar* sqlcmd;
+    char* errmsg = NULL;
+    gchar* parentid;
+    gboolean updated;
+    gchar* id;
+
+    id = g_strdup_printf ("%" G_GINT64_FORMAT,
+                          katze_item_get_meta_integer (item, "id"));
+
+    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 = %q ;",
+        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"),
+        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);
+    g_free (id);
+
+    return updated;
+}
+
+/**
+ * midori_bookmarks_db_remove_item_db:
+ * @db: the #sqlite3
+ * @item: #KatzeItem the item to delete
+ *
+ * Internal function that does the actual SQL DELETE of the @item in @db.
+ *
+ * Since: 0.5.2
+ **/
+static gboolean
+midori_bookmarks_db_remove_item_db (sqlite3*    db,
+                                    KatzeItem*  item)
+{
+    char* errmsg = NULL;
+    gchar* sqlcmd;
+    gboolean removed = TRUE;
+    gchar* id;
+
+    id = g_strdup_printf ("%" G_GINT64_FORMAT,
+                          katze_item_get_meta_integer (item, "id"));
+
+    sqlcmd = sqlite3_mprintf ("DELETE FROM bookmarks WHERE id = %q", id);
+
+    if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
+    {
+        g_printerr (_("Failed to remove bookmark item: %s\n"), errmsg);
+        sqlite3_free (errmsg);
+        removed = FALSE;
+    }
+
+    sqlite3_free (sqlcmd);
+    g_free (id);
+    return removed;
+}
+
+/**
+ * midori_bookmarks_db_add_item:
+ * @bookmarks: the main bookmark array
+ * @item: #KatzeItem the item to update
+ *
+ * Adds the @item in the bookmark data base.
+ *
+ * Since: 0.5.2
+ **/
+void
+midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+    g_return_if_fail (NULL == katze_item_get_meta_string (item, "id"));
+
+    midori_bookmarks_db_add_item_recursive (bookmarks, item);
+
+    katze_array_add_item (KATZE_ARRAY (bookmarks), item);
+}
+
+/**
+ * midori_bookmarks_db_update_item:
+ * @bookmarks: the main bookmark array
+ * @item: #KatzeItem the item to update
+ *
+ * Updates the @item in the bookmark data base.
+ *
+ * Since: 0.5.2
+ **/
+void
+midori_bookmarks_db_update_item (MidoriBookmarksDb* bookmarks, KatzeItem* item)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+    g_return_if_fail (katze_item_get_meta_string (item, "id"));
+    g_return_if_fail (0 != katze_item_get_meta_integer (item, "id"));
+
+    midori_bookmarks_db_update_item_db (bookmarks->db, item);
+
+    midori_bookmarks_db_signal_update_item (bookmarks, item);
+}
+
+/**
+ * midori_bookmarks_db_remove_item:
+ * @bookmarks: the main bookmark array
+ * @item: #KatzeItem the item to remove
+ *
+ * Removes the @item from the bookmark data base.
+ *
+ * Since: 0.5.2
+ **/
+void
+midori_bookmarks_db_remove_item (MidoriBookmarksDb* bookmarks, KatzeItem* item)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+    g_return_if_fail (KATZE_IS_ITEM (item));
+    g_return_if_fail (katze_item_get_meta_string (item, "id"));
+    g_return_if_fail (0 != katze_item_get_meta_integer (item, "id"));
+
+    midori_bookmarks_db_remove_item_recursive (item, bookmarks);
+    midori_bookmarks_db_remove_item_db (bookmarks->db, item);
+
+    katze_array_remove_item (KATZE_ARRAY (bookmarks), item);
+}
+
+/**
+ * midori_bookmarks_db_new:
+ *
+ * Initializes the bookmark data base.
+ *
+ * Returns: the main bookmarks array
+ *
+ * Since: 0.5.2
+ **/
+MidoriBookmarksDb*
+midori_bookmarks_db_new (char** errmsg)
+{
+    MidoriBookmarksDatabase* database;
+    GError*                  error = NULL;
+    sqlite3*                 db;
+    MidoriBookmarksDb*       bookmarks;
+
+    g_return_val_if_fail (errmsg != NULL, NULL);
+
+    database = midori_bookmarks_database_new (&error);
+
+    if (error != NULL)
+    {
+       *errmsg = g_strdup (error->message);
+        g_error_free (error);
+        return NULL;
+    }
+
+    db = midori_database_get_db (MIDORI_DATABASE (database));
+    g_return_val_if_fail (db != NULL, NULL);
+
+    bookmarks = MIDORI_BOOKMARKS_DB (g_object_new (TYPE_MIDORI_BOOKMARKS_DB,
+            "type", KATZE_TYPE_ITEM,
+            NULL));
+
+    bookmarks->db = db;
+
+    g_object_set_data (G_OBJECT (bookmarks), "db", db);
+    return bookmarks;
+}
+
+/**
+ * midori_bookmarks_db_on_quit:
+ * @bookmarks: the main bookmark array
+ *
+ * Delete the main bookmark array.
+ *
+ * Since: 0.5.2
+ **/
+void
+midori_bookmarks_db_on_quit (MidoriBookmarksDb* bookmarks)
+{
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+
+    g_object_unref (bookmarks);
+}
+
+/**
+ * midori_bookmarks_db_import_array:
+ * @bookmarks: the main bookmark array
+ * @array: #KatzeArray containing the items to import
+ * @parentid: the id of folder
+ *
+ * Imports the items of @array as children of the folder
+ * identfied by @parentid.
+ *
+ * Since: 0.5.2
+ **/
+void
+midori_bookmarks_db_import_array (MidoriBookmarksDb* bookmarks,
+                               KatzeArray* array,
+                               gint64      parentid)
+{
+    GList* list;
+    KatzeItem* item;
+
+    g_return_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks));
+    g_return_if_fail (KATZE_IS_ARRAY (array));
+
+    KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
+    {
+        /* IDs coming from previously exported database must be forgotten */
+        katze_item_set_meta_integer (item, "id", -1);
+        katze_item_set_meta_integer (item, "parentid", parentid);
+        midori_bookmarks_db_add_item (bookmarks, item);
+    }
+    g_list_free (list);
+}
+
+/**
+ * midori_bookmarks_db_array_from_statement:
+ * @stmt: the sqlite returned statement
+ * @bookmarks: the database controller
+ *
+ * Internal function that populate a #KatzeArray by processing the @stmt
+ * rows identifying:
+ * a- if the item is already in memory
+ *    in this case the item data is updated with retreived database content
+ *    and the already existing item is populated in the returned #KatzeArray
+ * b- if the data is a folder
+ *    a new #KatzeArray item is populated in the returned  #KatzeArray and
+ *    memorized for future use.
+ * c- if the data is a bookmark
+ *    a new #KatzeItem item is populated in the returned  #KatzeArray and
+ *    memorized for furure use.
+ *
+ * Return value: the populated #KatzeArray
+ **/
+static KatzeArray*
+midori_bookmarks_db_array_from_statement (sqlite3_stmt* stmt,
+                                       MidoriBookmarksDb* bookmarks)
+{
+    KatzeArray *array;
+    gint result;
+    gint cols;
+
+    array = katze_array_new (KATZE_TYPE_ITEM);
+    cols = sqlite3_column_count (stmt);
+
+    while ((result = sqlite3_step (stmt)) == SQLITE_ROW)
+    {
+        gint i;
+        KatzeItem* item;
+        gpointer found;
+
+        item = katze_item_new ();
+        for (i = 0; i < cols; i++)
+            katze_item_set_value_from_column (stmt, i, item);
+
+        if (NULL != (found = g_hash_table_lookup (bookmarks->all_items, item)))
+        {
+            for (i = 0; i < cols; i++)
+                katze_item_set_value_from_column (stmt, i, found);
+
+            g_object_unref (item);
+
+            item = found;
+        }
+        else if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            g_object_unref (item);
+
+            item = KATZE_ITEM (katze_array_new (KATZE_TYPE_ITEM));
+
+            for (i = 0; i < cols; i++)
+                katze_item_set_value_from_column (stmt, i, item);
+
+            g_object_ref (item);
+            g_hash_table_insert (bookmarks->all_items, item, item);
+        }
+        else
+        {
+            g_object_ref (item);
+            g_hash_table_insert (bookmarks->all_items, item, item);
+        }
+
+        katze_array_add_item (array, item);
+    }
+
+    sqlite3_clear_bindings (stmt);
+    sqlite3_reset (stmt);
+    return array;
+}
+
+/**
+ * midori_bookmarks_db_array_from_sqlite:
+ * @array: the main bookmark array
+ * @sqlcmd: the sqlcmd to execute
+ *
+ * Internal function that process the requested @sqlcmd.
+ *
+ * Return value: a #KatzeArray on success, %NULL otherwise
+ **/
+static KatzeArray*
+midori_bookmarks_db_array_from_sqlite (MidoriBookmarksDb* bookmarks,
+                                    const gchar* sqlcmd)
+{
+    sqlite3_stmt* stmt;
+    gint result;
+
+    g_return_val_if_fail (bookmarks->db != NULL, NULL);
+
+    result = sqlite3_prepare_v2 (bookmarks->db, sqlcmd, -1, &stmt, NULL);
+    if (result != SQLITE_OK)
+        return NULL;
+
+    return midori_bookmarks_db_array_from_statement (stmt, bookmarks);
+}
+
+/**
+ * midori_bookmarks_db_query_recursive:
+ * @array: the main bookmark array
+ * @fields: comma separated list of fields
+ * @condition: condition, like "folder = '%q'"
+ * @value: a value to be inserted if @condition contains %q
+ * @recursive: if %TRUE include children
+ *
+ * Stores the result in a #KatzeArray.
+ *
+ * Return value: a #KatzeArray on success, %NULL otherwise
+ *
+ * Since: 0.5.2
+ **/
+KatzeArray*
+midori_bookmarks_db_query_recursive (MidoriBookmarksDb*  bookmarks,
+                                  const gchar* fields,
+                                  const gchar* condition,
+                                  const gchar* value,
+                                  gboolean     recursive)
+{
+    gchar* sqlcmd;
+    char* sqlcmd_value;
+    KatzeArray* array;
+    KatzeItem* item;
+    GList* list;
+
+    g_return_val_if_fail (IS_MIDORI_BOOKMARKS_DB (bookmarks), NULL);
+    g_return_val_if_fail (fields, NULL);
+    g_return_val_if_fail (condition, NULL);
+
+    sqlcmd = g_strdup_printf ("SELECT %s FROM bookmarks WHERE %s "
+                              "ORDER BY (uri='') ASC, title DESC", fields, condition);
+    if (strstr (condition, "%q"))
+    {
+        sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : "");
+        array = midori_bookmarks_db_array_from_sqlite (bookmarks, sqlcmd_value);
+        sqlite3_free (sqlcmd_value);
+    }
+    else
+        array = midori_bookmarks_db_array_from_sqlite (bookmarks, 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_bookmarks_db_query_recursive (bookmarks,
+                                                                        fields, "parentid=%q", parentid, TRUE);
+            KatzeItem* subitem;
+            GList* sublist;
+
+            katze_array_clear (KATZE_ARRAY (item));
+
+            KATZE_ARRAY_FOREACH_ITEM_L (subitem, subarray, sublist)
+            {
+                katze_array_add_item (KATZE_ARRAY (item), subitem);
+            }
+
+            g_object_unref (subarray);
+            g_free (parentid);
+        }
+    }
+    g_list_free (list);
+    return array;
+}
+
+static gint64
+midori_bookmarks_db_count_from_sqlite (sqlite3*     db,
+                                       const gchar* sqlcmd)
+{
+    gint64 count = -1;
+    sqlite3_stmt* stmt;
+    gint result;
+
+    result = sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
+    if (result != SQLITE_OK)
+        return -1;
+
+    g_assert (sqlite3_column_count (stmt) == 1);
+
+    if ((result = sqlite3_step (stmt)) == SQLITE_ROW)
+        count = sqlite3_column_int64(stmt, 0);
+
+    sqlite3_clear_bindings (stmt);
+    sqlite3_reset (stmt);
+
+    return count;
+}
+
+static gint64
+midori_bookmarks_db_count_recursive_by_id (MidoriBookmarksDb*  bookmarks,
+                                           const gchar*        condition,
+                                           const gchar*        value,
+                                           gint64              id,
+                                           gboolean            recursive)
+{
+    gint64 count = -1;
+    gchar* sqlcmd;
+    char* sqlcmd_value;
+    sqlite3_stmt* stmt;
+    gint result;
+    GList* ids;
+    GList* iter_ids;
+
+    g_return_val_if_fail (condition, -1);
+    g_return_val_if_fail (MIDORI_BOOKMARKS_DB (bookmarks), -1);
+    g_return_val_if_fail (bookmarks->db != NULL, -1);
+
+    g_assert(!strstr("parentid", condition));
+
+    if (id > 0)
+        sqlcmd = g_strdup_printf ("SELECT COUNT(*) FROM bookmarks "
+                                  "WHERE parentid = %" G_GINT64_FORMAT " AND %s",
+                                  id,
+                                  condition);
+    else
+        sqlcmd = g_strdup_printf ("SELECT COUNT(*) FROM bookmarks "
+                                  "WHERE parentid IS NULL AND %s ",
+                                  condition);
+
+    if (strstr (condition, "%q"))
+    {
+        sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : "");
+        count = midori_bookmarks_db_count_from_sqlite (bookmarks->db, sqlcmd_value);
+        sqlite3_free (sqlcmd_value);
+    }
+    else
+        count = midori_bookmarks_db_count_from_sqlite (bookmarks->db, sqlcmd);
+
+    g_free (sqlcmd);
+
+    if (!recursive || (count < 0))
+        return count;
+
+    ids = NULL;
+
+    if (id > 0)
+        sqlcmd_value = sqlite3_mprintf (
+            "SELECT id FROM bookmarks "
+            "WHERE parentid = %" G_GINT64_FORMAT " AND uri = ''", id);
+    else
+        sqlcmd_value = sqlite3_mprintf (
+            "SELECT id FROM bookmarks "
+            "WHERE parentid IS NULL AND uri = ''");
+
+    if (sqlite3_prepare_v2 (bookmarks->db, sqlcmd_value, -1, &stmt, NULL) == SQLITE_OK)
+    {
+        g_assert (sqlite3_column_count (stmt) == 1);
+
+        if ((result = sqlite3_step (stmt)) == SQLITE_ROW)
+        {
+            gint64* pid = g_new (gint64, 1);
+
+            *pid = sqlite3_column_int64(stmt, 0);
+            ids = g_list_append (ids, pid);
+        }
+
+        sqlite3_clear_bindings (stmt);
+        sqlite3_reset (stmt);
+    }
+
+    sqlite3_free (sqlcmd_value);
+
+    iter_ids = ids;
+    while (iter_ids)
+    {
+        gint64 sub_count = midori_bookmarks_db_count_recursive_by_id (bookmarks,
+                                                                      condition,
+                                                                      value,
+                                                                      *(gint64*)(iter_ids->data),
+                                                                      recursive);
+
+        if (sub_count < 0)
+        {
+            g_list_free_full (ids, g_free);
+            return -1;
+        }
+
+        count += sub_count;
+        iter_ids = g_list_next (iter_ids);
+    }
+
+    g_list_free_full (ids, g_free);
+    return count;
+}
+
+/**
+ * midori_bookmarks_db_count_recursive:
+ * @bookmarks: the main bookmark array
+ * @condition: condition, like "folder = '%q'"
+ * @value: a value to be inserted if @condition contains %q
+ * @recursive: if %TRUE include children
+ *
+ * Return value: the number of elements on success, -1 otherwise
+ *
+ * Since: 0.5.2
+ **/
+gint64
+midori_bookmarks_db_count_recursive (MidoriBookmarksDb*  bookmarks,
+                                     const gchar*        condition,
+                                     const gchar*        value,
+                                     KatzeItem*          folder,
+                                     gboolean            recursive)
+{
+    gint64 id = -1;
+
+    g_return_val_if_fail (!folder || KATZE_ITEM_IS_FOLDER (folder), -1);
+
+    id = folder ? katze_item_get_meta_integer (folder, "id") : 0;
+
+    return midori_bookmarks_db_count_recursive_by_id (bookmarks, condition,
+                                                      value, id,
+                                                      recursive);
+}
+
+/**
+ * midori_bookmarks_db_populate_folder:
+ **/
+
+void
+midori_bookmarks_db_populate_folder (MidoriBookmarksDb* bookmarks,
+    KatzeArray *folder)
+{
+    const gchar* id = katze_item_get_meta_string (KATZE_ITEM (folder), "id");
+    const gchar *condition;
+    KatzeArray* array;
+    KatzeItem* item;
+    GList* list;
+
+    if (id == NULL)
+    {
+        condition = "parentid is NULL";
+    }
+    else
+    {
+        condition = "parentid = %q";
+    }
+
+    array = midori_bookmarks_db_query_recursive (bookmarks,
+        "id, title, parentid, uri, app, pos_panel, pos_bar", condition, id, FALSE);
+
+    if (IS_MIDORI_BOOKMARKS_DB (folder))
+    {
+        KATZE_ARRAY_FOREACH_ITEM_L (item, folder, list)
+        {
+            KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->remove_item (folder, item);
+        }
+
+        KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
+        {
+            KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->add_item (folder, item);
+        }
+    }
+    else
+    {
+        katze_array_clear(folder);
+
+        KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
+        {
+            katze_array_add_item (folder, item);
+        }
+    }
+
+    g_object_unref (array);
+}
diff --git a/midori/midori-bookmarks-db.h b/midori/midori-bookmarks-db.h
new file mode 100644 (file)
index 0000000..988518f
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010 Alexander Butenko <a.butenka@gmail.com>
+
+ 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_BOOKMARKS_DB_H__
+#define __MIDORI_BOOKMARKS_DB_H__ 1
+
+#include <sqlite3.h>
+#include <katze/katze.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_MIDORI_BOOKMARKS_DB \
+    (midori_bookmarks_db_get_type ())
+#define MIDORI_BOOKMARKS_DB(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MIDORI_BOOKMARKS_DB, MidoriBookmarksDb))
+#define MIDORI_BOOKMARKS_DB_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MIDORI_BOOKMARKS_DB, MidoriBookmarksDbClass))
+#define IS_MIDORI_BOOKMARKS_DB(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MIDORI_BOOKMARKS_DB))
+#define IS_MIDORI_BOOKMARKS_DB_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MIDORI_BOOKMARKS_DB))
+#define MIDORI_BOOKMARKS_DB_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MIDORI_BOOKMARKS_DB, MidoriBookmarksDbClass))
+
+typedef struct _MidoriBookmarksDb                       MidoriBookmarksDb;
+typedef struct _MidoriBookmarksDbClass                  MidoriBookmarksDbClass;
+
+GType
+midori_bookmarks_db_get_type               (void) G_GNUC_CONST;
+
+MidoriBookmarksDb*
+midori_bookmarks_db_new (char** errmsg);
+
+void
+midori_bookmarks_db_on_quit (MidoriBookmarksDb* array);
+
+void
+midori_bookmarks_db_add_item (MidoriBookmarksDb* bookmarks, KatzeItem* item);
+
+void
+midori_bookmarks_db_update_item (MidoriBookmarksDb* bookmarks, KatzeItem* item);
+
+void
+midori_bookmarks_db_remove_item (MidoriBookmarksDb* bookmarks, KatzeItem* item);
+
+void
+midori_bookmarks_db_import_array (MidoriBookmarksDb* bookmarks,
+                                  KatzeArray* array,
+                                  gint64      parentid);
+
+KatzeArray*
+midori_bookmarks_db_query_recursive (MidoriBookmarksDb*  bookmarks,
+                                     const gchar* fields,
+                                     const gchar* condition,
+                                     const gchar* value,
+                                     gboolean     recursive);
+
+gint64
+midori_bookmarks_db_count_recursive (MidoriBookmarksDb*  bookmarks,
+                                    const gchar*        condition,
+                                     const gchar*        value,
+                                    KatzeItem*          folder,
+                                    gboolean            recursive);
+
+void
+midori_bookmarks_db_populate_folder (MidoriBookmarksDb* bookmarks,
+    KatzeArray *folder);
+
+#endif /* !__MIDORI_BOOKMARKS_DB_H__ */
+
diff --git a/midori/midori-bookmarks.c b/midori/midori-bookmarks.c
deleted file mode 100644 (file)
index 41c4d50..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
- Copyright (C) 2010 Alexander Butenko <a.butenka@gmail.com>
-
- 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-app.h"
-#include "midori-array.h"
-#include "sokoke.h"
-#include "midori-core.h"
-
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-
-#include <config.h>
-#ifdef HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-void
-midori_bookmarks_dbtracer (void*       dummy,
-                           const char* query)
-{
-    g_printerr ("%s\n", query);
-}
-
-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
-
-KatzeArray*
-midori_bookmarks_new (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;
-    KatzeArray* array;
-
-    g_return_val_if_fail (errmsg != NULL, NULL);
-
-    oldfile = midori_paths_get_config_filename_for_writing ("bookmarks.db");
-    oldfile_exists = g_access (oldfile, F_OK) == 0;
-    newfile = midori_paths_get_config_filename_for_writing ("bookmarks_v2.db");
-    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)
-    {
-        *errmsg = g_strdup_printf (_("Failed to open database: %s\n"),
-            db ? sqlite3_errmsg (db) : "(db = NULL)");
-        goto init_failed;
-    }
-
-    if (midori_debug ("bookmarks"))
-        sqlite3_trace (db, midori_bookmarks_dbtracer, NULL);
-
-    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)
-        {
-            *errmsg = g_strdup_printf (_("Couldn't create bookmarks table: %s\n"),
-                sql_errmsg ? sql_errmsg : "(err = NULL)");
-            sqlite3_free (sql_errmsg);
-
-            /* 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))
-        {
-            *errmsg = g_strdup_printf (_("Couldn't import from old database: %s\n"),
-                import_errmsg ? import_errmsg : "(err = NULL)");
-            g_free (import_errmsg);
-        }
-
-    init_success:
-        g_free (newfile);
-        g_free (oldfile);
-        array = katze_array_new (KATZE_TYPE_ARRAY);
-        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);
-        g_object_set_data (G_OBJECT (array), "db", db);
-        return array;
-
-    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);
-}
-
-void
-midori_bookmarks_on_quit (KatzeArray* array)
-{
-    g_return_if_fail (KATZE_IS_ARRAY (array));
-
-    sqlite3* db = g_object_get_data (G_OBJECT (array), "db");
-    g_return_if_fail (db != NULL);
-    sqlite3_close (db);
-}
-
diff --git a/midori/midori-bookmarks.h b/midori/midori-bookmarks.h
deleted file mode 100644 (file)
index 63eb033..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
- Copyright (C) 2010 Alexander Butenko <a.butenka@gmail.com>
-
- 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_BOOKMARKS_H__
-#define __MIDORI_BOOKMARKS_H__ 1
-
-#include <sqlite3.h>
-#include <katze/katze.h>
-
-void
-midori_bookmarks_add_item_cb (KatzeArray* array,
-                              KatzeItem*  item,
-                              sqlite3*    db);
-
-void
-midori_bookmarks_remove_item_cb (KatzeArray* array,
-                                 KatzeItem*  item,
-                                 sqlite3*    db);
-
-KatzeArray*
-midori_bookmarks_new (char** errmsg);
-
-void
-midori_bookmarks_on_quit (KatzeArray* array);
-
-void
-midori_bookmarks_import (const gchar* filename,
-                         sqlite3*     db);
-
-#endif /* !__MIDORI_BOOKMARKS_H__ */
-
diff --git a/midori/midori-bookmarksdatabase.vala b/midori/midori-bookmarksdatabase.vala
new file mode 100644 (file)
index 0000000..04e324d
--- /dev/null
@@ -0,0 +1,100 @@
+/*
+ Copyright (C) 2013 Andre Auzi <aauzi@free.fr>
+ Copyright (C) 2013 Christian Dywan <christian@twotoats.de>
+
+ 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 BookmarksDatabase : Midori.Database {
+        public BookmarksDatabase () throws DatabaseError {
+            Object (path: "bookmarks.db");
+            preinit ();
+            init ();
+            exec ("PRAGMA foreign_keys = ON;");
+        }
+
+        protected void preinit () throws DatabaseError {
+            string dbfile = Paths.get_config_filename_for_writing (path);
+            string olddbfile = dbfile + ".old";
+            string dbfile_v2 = Paths.get_config_filename_for_reading ("bookmarks_v2.db");
+
+            if (Posix.access (dbfile_v2, Posix.F_OK) == 0) {
+                if (Posix.access (dbfile, Posix.F_OK) == 0) {
+                    if (Posix.access (olddbfile, Posix.F_OK) == 0)
+                        Posix.unlink (olddbfile);
+                    GLib.FileUtils.rename (dbfile, olddbfile);
+                }
+
+                GLib.FileUtils.rename (dbfile_v2, dbfile);
+
+                if (Sqlite.Database.open_v2 (dbfile, out _db) != Sqlite.OK)
+                    throw new DatabaseError.OPEN ("Failed to open database %s".printf (path));
+
+                Sqlite.Statement stmt;
+                if (db.prepare_v2 ("PRAGMA user_version;", -1, out stmt, null) != Sqlite.OK)
+                    throw new DatabaseError.EXECUTE ("Failed to compile statement %s".printf (db.errmsg ()));
+                if (stmt.step () != Sqlite.ROW)
+                    throw new DatabaseError.EXECUTE ("Failed to get row %s".printf (db.errmsg ()));
+                int64 user_version = stmt.column_int64 (0);
+                
+                if (user_version == 0) {
+                    exec ("PRAGMA user_version = 1;");
+                }
+
+                _db = null;
+            } else if (Posix.access (dbfile, Posix.F_OK) == 0) {
+
+                if (Sqlite.Database.open_v2 (dbfile, out _db) != Sqlite.OK)
+                    throw new DatabaseError.OPEN ("Failed to open database %s".printf (path));
+
+                Sqlite.Statement stmt;
+                if (db.prepare_v2 ("PRAGMA user_version;", -1, out stmt, null) != Sqlite.OK)
+                    throw new DatabaseError.EXECUTE ("Failed to compile statement %s".printf (db.errmsg ()));
+                if (stmt.step () != Sqlite.ROW)
+                    throw new DatabaseError.EXECUTE ("Failed to get row %s".printf (db.errmsg ()));
+                int64 user_version = stmt.column_int64 (0);
+
+                _db = null;
+                
+                if (user_version == 0) {
+                    if (Posix.access (olddbfile, Posix.F_OK) == 0)
+                        Posix.unlink (olddbfile);
+
+                    GLib.FileUtils.rename (dbfile, olddbfile);
+
+                    if (Sqlite.Database.open_v2 (dbfile, out _db) != Sqlite.OK)
+                        throw new DatabaseError.OPEN ("Failed to open database %s".printf (path));
+
+                    exec_script ("Create");
+
+                    attach (olddbfile, "old_db");
+                    
+                    bool failure = false;
+                    try {
+                        exec_script ("Import_old_db_bookmarks");
+                    } catch (DatabaseError error) {
+                        if (error is DatabaseError.EXECUTE)
+                            failure = true;
+                        else
+                            throw error;
+                    }
+                    
+                    /* try to get back to previous state */
+                    if (failure)
+                        exec ("ROLLBACK TRANSACTION;");
+                    
+                    exec ("DETACH DATABASE old_db;");
+                    exec ("PRAGMA user_version = 1;");
+
+                    _db = null;
+                }
+            }
+        }
+    }
+}
index b5ff23c9ba00fded5ed387a5089cb7ffb2411b96..54c25bb581664678f788499ab0be529f8a96d804 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2011 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
  Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
  Copyright (C) 2009 Jérôme Geulfucci <jeromeg@xfce.org>
 
@@ -26,6 +26,8 @@
 #include "midori-privatedata.h"
 #include "midori-core.h"
 #include "midori-privatedata.h"
+#include "midori-bookmarks-db.h"
+#include "katze-cellrenderercomboboxtext.h"
 
 #include "marshal.h"
 
@@ -80,15 +82,15 @@ struct _MidoriBrowser
 
     gint last_window_width, last_window_height;
     guint alloc_timeout;
-    gint last_tab_size;
     guint panel_timeout;
 
     MidoriWebSettings* settings;
     KatzeArray* proxy_array;
-    KatzeArray* bookmarks;
+    MidoriBookmarksDb* bookmarks;
     KatzeArray* trash;
     KatzeArray* search_engines;
     KatzeArray* history;
+    MidoriHistoryDatabase* history_database;
     MidoriSpeedDial* dial;
     gboolean show_tabs;
 
@@ -96,6 +98,8 @@ struct _MidoriBrowser
     gboolean show_statusbar;
     guint maximum_history_age;
     guint last_web_search;
+
+    gboolean bookmarkbar_populate;
 };
 
 G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW)
@@ -149,6 +153,12 @@ midori_browser_dispose (GObject* object);
 static void
 midori_browser_finalize (GObject* object);
 
+#ifdef HAVE_WEBKIT2
+void download_created_destination_cb (WebKitDownload *download,
+                                      gchar          *destination,
+                                      gpointer        user_data);
+#endif
+
 static void
 midori_browser_set_property (GObject*      object,
                              guint         prop_id,
@@ -161,38 +171,22 @@ midori_browser_get_property (GObject*    object,
                              GValue*     value,
                              GParamSpec* pspec);
 
-void
-midori_bookmarks_import_array_db (sqlite3*    db,
-                                  KatzeArray* array,
-                                  gint64      parentid);
-
 gboolean
-midori_bookmarks_update_item_db (sqlite3*   db,
-                                 KatzeItem* item);
-
-void
 midori_browser_open_bookmark (MidoriBrowser* browser,
                               KatzeItem*     item);
 
 static void
 midori_bookmarkbar_populate (MidoriBrowser* browser);
-
 static void
-midori_bookmarkbar_clear (GtkWidget* toolbar);
+midori_bookmarkbar_populate_idle (MidoriBrowser* browser);
 
 static void
-midori_browser_new_history_item (MidoriBrowser* browser,
-                                 KatzeItem*     item);
+midori_bookmarkbar_clear (GtkWidget* toolbar);
 
 static void
 _midori_browser_set_toolbar_style (MidoriBrowser*     browser,
                                    MidoriToolbarStyle toolbar_style);
 
-GtkWidget*
-midori_panel_construct_menu_item (MidoriPanel*    panel,
-                                  MidoriViewable* viewable,
-                                  gboolean        popup);
-
 static void
 midori_browser_settings_notify (MidoriWebSettings* web_settings,
                                 GParamSpec*        pspec,
@@ -203,16 +197,15 @@ midori_panel_set_toolbar_style (MidoriPanel*    panel,
                                 GtkToolbarStyle style);
 
 static void
-midori_browser_set_bookmarks (MidoriBrowser* browser,
-                              KatzeArray*    bookmarks);
+midori_browser_set_bookmarks (MidoriBrowser*     browser,
+                              MidoriBookmarksDb* bookmarks);
 
 static void
 midori_browser_add_speed_dial (MidoriBrowser* browser);
 
 static void
-midori_browser_notebook_size_allocate_cb (GtkWidget*     notebook,
-                                          GdkRectangle*  allocation,
-                                          MidoriBrowser* browser);
+midori_browser_step_history (MidoriBrowser* browser,
+                             MidoriView*    view);
 
 #define _action_by_name(brwsr, nme) \
     gtk_action_group_get_action (brwsr->action_group, nme)
@@ -224,6 +217,10 @@ midori_browser_notebook_size_allocate_cb (GtkWidget*     notebook,
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION ( \
     _action_by_name (brwsr, nme)), actv);
 
+static void
+midori_browser_disconnect_tab (MidoriBrowser* browser,
+                               MidoriView*    view);
+
 static gboolean
 midori_browser_is_fullscreen (MidoriBrowser* browser)
 {
@@ -240,15 +237,7 @@ _toggle_tabbar_smartly (MidoriBrowser* browser,
     gboolean show_tabs = !midori_browser_is_fullscreen (browser) || ignore_fullscreen;
     if (!browser->show_tabs)
         show_tabs = FALSE;
-#ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_show_tabs (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
-#else
-    if (!(has_tabs || katze_object_get_boolean (browser->settings, "always-show-tabbar")))
-        show_tabs = FALSE;
-    gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), show_tabs);
-    gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), show_tabs);
-#endif
+    midori_notebook_set_labels_visible (MIDORI_NOTEBOOK (browser->notebook), show_tabs);
     return has_tabs;
 }
 
@@ -306,6 +295,7 @@ _midori_browser_update_interface (MidoriBrowser* browser,
 
     _action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view));
+    _action_set_sensitive (browser, "MailTo", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "SaveAs", midori_tab_can_save (MIDORI_TAB (view)));
     _action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
     _action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view));
@@ -315,6 +305,8 @@ _midori_browser_update_interface (MidoriBrowser* browser,
         midori_tab_can_view_source (MIDORI_TAB (view)));
     _action_set_sensitive (browser, "SourceView",
         midori_tab_can_view_source (MIDORI_TAB (view)));
+    _action_set_sensitive (browser, "SourceViewDom",
+        midori_tab_can_view_source (MIDORI_TAB (view)));
 
     action = _action_by_name (browser, "NextForward");
     if (midori_tab_can_go_forward (MIDORI_TAB (view)))
@@ -443,8 +435,6 @@ _midori_browser_update_progress (MidoriBrowser* browser,
         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
     {
@@ -453,8 +443,7 @@ _midori_browser_update_progress (MidoriBrowser* browser,
                       "tooltip", _("Stop loading the current page"), NULL);
     }
 
-    gtk_widget_set_sensitive (browser->throbber, loading);
-    katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
+    g_object_set (browser->throbber, "active", loading, "visible", loading, NULL);
 }
 
 /**
@@ -470,6 +459,8 @@ midori_browser_update_history (KatzeItem*   item,
                                const gchar* type,
                                const gchar* event)
 {
+    g_return_if_fail (!KATZE_ITEM_IS_SEPARATOR (item));
+
     #ifdef HAVE_ZEITGEIST
     const gchar* inter;
     if (strstr (event, "access"))
@@ -484,6 +475,11 @@ midori_browser_update_history (KatzeItem*   item,
         inter = ZEITGEIST_ZG_DELETE_EVENT;
     else
         g_assert_not_reached ();
+
+    /* FIXME: Should insert folders into the log (ZEITGEIST_NFO_BOOKMARK_FOLDER) */
+    if (KATZE_ITEM_IS_FOLDER (item))
+        return;
+
     zeitgeist_log_insert_events_no_reply (zeitgeist_log_get_default (),
         zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY,
                                   "application://midori.desktop",
@@ -558,6 +554,7 @@ midori_browser_assert_action (MidoriBrowser* browser,
              || type == G_TYPE_PARAM_STRING
              || type == G_TYPE_PARAM_INT
              || type == G_TYPE_PARAM_FLOAT
+             || type == G_TYPE_PARAM_DOUBLE
              || type == G_TYPE_PARAM_ENUM))
                 midori_error (_("Value '%s' is invalid for %s"), parts[1], parts[0]);
         }
@@ -606,7 +603,7 @@ _midori_browser_activate_action (MidoriBrowser* browser,
                 g_object_set (browser->settings, parts[0], parts[1], NULL);
             else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT)
                 g_object_set (browser->settings, parts[0], atoi (parts[1]), NULL);
-            else if (type == G_TYPE_PARAM_FLOAT)
+            else if (type == G_TYPE_PARAM_FLOAT || type == G_TYPE_PARAM_DOUBLE)
                 g_object_set (browser->settings, parts[0], g_ascii_strtod (parts[1], NULL), NULL);
             else if (type == G_TYPE_PARAM_ENUM)
             {
@@ -660,7 +657,7 @@ midori_view_notify_icon_cb (MidoriView*    view,
     if (midori_browser_get_current_tab (browser) != (GtkWidget*)view)
         return;
 
-    if (midori_paths_is_readonly () /* APP, PRIVATE */)
+    if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
         gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view));
 }
 
@@ -669,28 +666,31 @@ midori_view_notify_load_status_cb (GtkWidget*      widget,
                                    GParamSpec*     pspec,
                                    MidoriBrowser*  browser)
 {
+    MidoriView* view = MIDORI_VIEW (widget);
+    MidoriLoadStatus load_status = midori_view_get_load_status (view);
+
     if (widget == midori_browser_get_current_tab (browser))
     {
-        MidoriView* view = MIDORI_VIEW (widget);
-        MidoriLoadStatus load_status = midori_view_get_load_status (view);
-
         if (load_status == MIDORI_LOAD_COMMITTED)
         {
             const gchar* uri = midori_view_get_display_uri (view);
             GtkAction* action = _action_by_name (browser, "Location");
             midori_location_action_set_text (
                 MIDORI_LOCATION_ACTION (action), uri);
-            g_object_notify (G_OBJECT (browser), "uri");
+
+            /* Focus the urlbar on blank pages */
+            if (midori_view_is_blank (view))
+                midori_browser_activate_action (browser, "Location");
         }
 
         _midori_browser_update_interface (browser, view);
         _midori_browser_set_statusbar_text (browser, view, NULL);
-
-        /* Focus the urlbar on blank pages */
-        if (midori_view_is_blank (view))
-            midori_browser_activate_action (browser, "Location");
     }
 
+    if (load_status == MIDORI_LOAD_FINISHED)
+        katze_item_set_meta_string (midori_view_get_proxy_item (view),
+                                    "history-step", NULL);
+
     g_object_notify (G_OBJECT (browser), "load-status");
 }
 
@@ -716,6 +716,7 @@ midori_view_notify_uri_cb (GtkWidget*     widget,
         midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
         _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
         _action_set_sensitive (browser, "Forward", midori_tab_can_go_forward (MIDORI_TAB (view)));
+        g_object_notify (G_OBJECT (browser), "uri");
     }
 }
 
@@ -742,53 +743,65 @@ midori_view_notify_title_cb (GtkWidget*     widget,
                              MidoriBrowser* browser)
 {
     MidoriView* view = MIDORI_VIEW (widget);
-
-    if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
-    {
-        KatzeItem* proxy;
-        if (browser->history && browser->maximum_history_age)
-        {
-            const gchar* proxy_uri;
-            proxy = midori_view_get_proxy_item (view);
-            proxy_uri = katze_item_get_uri (proxy);
-            if (!midori_uri_is_blank (proxy_uri) &&
-                (katze_item_get_meta_integer (proxy, "history-step") == -1))
-            {
-                if (!katze_item_get_meta_boolean (proxy, "dont-write-history"))
-                {
-                    midori_browser_new_history_item (browser, proxy);
-                    katze_item_set_meta_integer (proxy, "history-step", 1);
-                }
-            }
-            else if (katze_item_get_name (proxy) &&
-                     !midori_uri_is_blank (proxy_uri) &&
-                     (katze_item_get_meta_integer (proxy, "history-step") == 1))
-            {
-                midori_browser_update_history_title (browser, proxy);
-                katze_item_set_meta_integer (proxy, "history-step", 2);
-            }
-        }
-    }
-
     if (widget == midori_browser_get_current_tab (browser))
+    {
         midori_browser_set_title (browser, midori_view_get_display_title (view));
+        g_object_notify (G_OBJECT (browser), "title");
+    }
+    midori_browser_step_history (browser, view);
 }
 
 static void
-midori_view_notify_minimized_cb (GtkWidget*     widget,
-                                 GParamSpec*    pspec,
-                                 MidoriBrowser* browser)
+midori_browser_step_history (MidoriBrowser* browser,
+                             MidoriView*    view)
 {
-    if (katze_object_get_boolean (widget, "minimized"))
+    if (midori_view_get_load_status (view) != MIDORI_LOAD_COMMITTED)
+        return;
+    if (!browser->history_database || !browser->maximum_history_age)
+        return;
+
+    KatzeItem* proxy = midori_view_get_proxy_item (view);
+    const gchar* proxy_uri = katze_item_get_uri (proxy);
+    if (midori_uri_is_blank (proxy_uri))
+        return;
+
+    //Do not save pages that fail to load in the history
+    if (midori_tab_get_load_error (MIDORI_TAB (view)) == MIDORI_LOAD_ERROR_NETWORK)
+        return;
+
+    const gchar* history_step = katze_item_get_meta_string (proxy, "history-step");
+    if (history_step == NULL)
+    {
+        GError* error = NULL;
+        time_t now = time (NULL);
+        katze_item_set_added (proxy, now);
+        gint64 day = sokoke_time_t_to_julian (&now);
+        midori_history_database_insert (browser->history_database,
+            katze_item_get_uri (proxy),
+            katze_item_get_name (proxy),
+            katze_item_get_added (proxy), day, &error);
+        if (error != NULL)
+        {
+            g_printerr (_("Failed to insert new history item: %s\n"), error->message);
+            g_error_free (error);
+            return;
+        }
+        katze_item_set_meta_string (proxy, "history-step", "update");
+        /* FIXME: No signal for adding/ removing */
+        katze_array_add_item (browser->history, proxy);
+        katze_array_remove_item (browser->history, proxy);
+    }
+    else if (!strcmp (history_step, "update"))
     {
-        #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
+        if (proxy->name != NULL)
+            midori_browser_update_history_title (browser, proxy);
+    }
+    else if (!strcmp (history_step, "ignore"))
+    {
+        /* This is set when restoring sessions */
     }
     else
-        midori_browser_notebook_size_allocate_cb (NULL, NULL, browser);
+        g_warning ("Unexpected history-step: %s", history_step);
 }
 
 static void
@@ -816,74 +829,232 @@ midori_view_notify_statusbar_text_cb (GtkWidget*     view,
     }
 }
 
+static gboolean
+midori_bookmark_folder_button_reach_parent (GtkTreeModel* model, GtkTreeIter *iter, gint64 parentid)
+{
+    do
+    {
+        gint64 id;
+
+        gtk_tree_model_get (model, iter, 1, &id, -1);
+
+        if (parentid == id)
+            return TRUE;
+
+        if (gtk_tree_model_iter_has_child (model, iter))
+        {
+            GtkTreeIter child;
+            gtk_tree_model_iter_children (model, &child, iter);
+            if (midori_bookmark_folder_button_reach_parent (model, &child, parentid))
+            {
+                *iter = child;
+                return TRUE;
+            }
+        }
+    }
+    while (gtk_tree_model_iter_next (model, iter));
+
+    return FALSE;
+}
+
+typedef struct _FolderEntry
+{
+    const gchar *title;
+    gint64 id;
+    gint64 parentid;
+} FolderEntry;
+
+static void
+midori_bookmark_folder_free_folder_entry (FolderEntry* folder)
+{
+    g_free ((gpointer)folder->title);
+}
+
 static GtkWidget*
-midori_bookmark_folder_button_new (KatzeArray* array,
-                                   gboolean    new_bookmark,
-                                   gint64      selected,
-                                   gint64      parentid)
+midori_bookmark_folder_button_new (MidoriBookmarksDb* array,
+                                   gint64      selected_parentid)
 {
-    GtkListStore* model;
+    GtkTreeStore* model;
     GtkWidget* combo;
     GtkCellRenderer* renderer;
     guint n;
     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, id, parentid FROM bookmarks WHERE uri='' ORDER BY parentid, title ASC";
+    gint64 current_parentid;
+    GtkTreeIter tree_iter;
+    GtkTreeIter stock_parent_iter;
+    GtkTreeIter* parent_iter;
+    GList *folders = NULL;
+
+    db = g_object_get_data (G_OBJECT (array), "db");
+    g_return_val_if_fail (db != NULL, NULL);
 
-    model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT64);
+    /* folder combo box model content:
+    ** 0: title
+    ** 1: id
+    */
+    model = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT64);
     combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
-    renderer = gtk_cell_renderer_text_new ();
+
+    /* setup combo layout
+    ** 0: a folder icon
+    ** 1: the folder name
+     */
+
+    gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
+
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    g_object_set (G_OBJECT (renderer),
+        "stock-id", GTK_STOCK_DIRECTORY,
+        "stock-size", GTK_ICON_SIZE_MENU,
+        NULL);
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+
+    renderer = katze_cell_renderer_combobox_text_new ();
+    g_object_set (G_OBJECT (renderer),
+        "width-chars", 40,    /* FIXME: figure out a way to define an acceptable string length */
+        "ellipsize", PANGO_ELLIPSIZE_END,
+        "unfolded-text", _("Select [text]"),
+        NULL);
     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);
-    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 
-    db = g_object_get_data (G_OBJECT (array), "db");
-    g_return_val_if_fail (db != NULL, NULL);
-    n = 1;
+    /* read the folders list from the database */
+    /* FIXME: this should be a service of midori/midori-bookmarks-db */
+
     if ((result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL)) == SQLITE_OK)
-    while ((result = sqlite3_step (statement)) == SQLITE_ROW)
     {
-        const unsigned char* name = sqlite3_column_text (statement, 0);
-        gint64 id = sqlite3_column_int64 (statement, 1);
+        while ((result = sqlite3_step (statement)) == SQLITE_ROW)
+        {
+            FolderEntry* folder = g_new (FolderEntry, 1);
+
+            folder->title = g_strdup ((const gchar*)sqlite3_column_text (statement, 0));
+            folder->id = sqlite3_column_int64 (statement, 1);
+            folder->parentid = sqlite3_column_int64 (statement, 2);
+
+            folders = g_list_append (folders, folder);
+        }
+
+        sqlite3_clear_bindings (statement);
+        sqlite3_reset (statement);
+    }
+
+    /* populate the combo box */
+    /* FIXME: here we should have the root bookmark array's name and id, not hard encoded values */
+
+    gtk_tree_store_insert_with_values (model, &tree_iter, NULL, G_MAXINT,
+        0, _("Bookmarks"), 1, (gint64)-1, -1);
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
+
+    current_parentid = -1;
+    parent_iter = NULL;
+    n = 1;
+    while (g_list_first (folders))
+    {
+        gboolean something_done = FALSE;
+        GList* list_iter = g_list_first (folders);
 
-        /* do not show the folder itself */
-        if (id != selected)
+        do
         {
-            gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-                0, name, 1, PANGO_ELLIPSIZE_END, 2, id, -1);
+            FolderEntry* folder = list_iter->data;
+            const gchar* title = folder->title;
+            gint64 id = folder->id;
+            gint64 parentid = folder->parentid;
+
+            if (parentid != current_parentid)  /* optimize case of sub-folders of the same parent */
+            {
+                if (!parentid)
+                {
+                    /* folder's parent is the stree store root */
+
+                    current_parentid = -1;
+                    parent_iter = NULL;
+                }
+                else if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &tree_iter))
+                {
+                    if (midori_bookmark_folder_button_reach_parent (
+                            GTK_TREE_MODEL (model), &tree_iter, parentid))
+                    {
+                        /* folder's parent found in the tree store */
+
+                        current_parentid = parentid;
+                        stock_parent_iter = tree_iter;
+                        parent_iter = &stock_parent_iter;
+                    }
+                    else
+                    {
+                        /* folder's parent not found, skip it */
+
+                        list_iter = g_list_next (list_iter);
+                        continue;
+                    }
+                }
+                else
+                    g_assert_not_reached ();
+            }
+
+            /* insert folder in the tree store and remove it from the folders list */
+
+            gtk_tree_store_insert_with_values (model, &tree_iter, parent_iter, G_MAXINT,
+                0, title, 1, id, -1);
+
+            if (id == selected_parentid)
+                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &tree_iter);
 
-            if (!new_bookmark && id == parentid)
-                gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n);
             n++;
+
+            something_done = TRUE;
+
+            g_free ((gpointer)title);
+            folders = g_list_delete_link (folders, list_iter);
+
+            list_iter = g_list_first (folders);
         }
+        while (list_iter);
+
+        if (!something_done)  /* avoid infinite loop in case of orphan folders */
+            break;
     }
+
+    if (g_list_first (folders))
+    {
+        GList* iter;
+        g_printerr ("midori_bookmark_folder_button_new: orphan folder(s) detected in bookmarks db\n");
+
+        for (iter = g_list_first (folders) ; iter ; iter = g_list_next (iter))
+        {
+            FolderEntry* folder = iter->data;
+            const gchar* title = folder->title;
+            gint64 id = folder->id;
+            gint64 parentid = folder->parentid;
+
+            g_printerr ("  id=%" G_GINT64_FORMAT ", parentid=%" G_GINT64_FORMAT ", title=%s\n",
+                id, parentid, title);
+        }
+
+        g_list_free_full (folders, (GDestroyNotify)midori_bookmark_folder_free_folder_entry);
+    }
+
     if (n < 2)
         gtk_widget_set_sensitive (combo, FALSE);
+
     return combo;
 }
 
 static gint64
 midori_bookmark_folder_button_get_active (GtkWidget* combo)
 {
-    gint64 id = 0;
+    gint64 id = -1;
     GtkTreeIter iter;
 
     g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), 0);
 
     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, 1, &id, -1);
     }
 
     return id;
@@ -891,33 +1062,98 @@ midori_bookmark_folder_button_get_active (GtkWidget* combo)
 
 static void
 midori_browser_edit_bookmark_title_changed_cb (GtkEntry*      entry,
-                                               GtkDialog*     dialog)
+                                               GtkWidget*     button)
 {
     const gchar* title = gtk_entry_get_text (entry);
-    gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT,
+    gtk_widget_set_sensitive (button,
         title != NULL && title[0] != '\0');
 }
 
+static void
+midori_browser_edit_bookmark_response_cb (GtkWidget*     dialog,
+                                          gint           response,
+                                          MidoriBrowser* browser)
+{
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        KatzeItem* bookmark = g_object_get_data (G_OBJECT (dialog), "bookmark");
+        GtkWidget* entry_title = g_object_get_data (G_OBJECT (dialog), "entry-title");
+        katze_item_set_name (bookmark,
+            gtk_entry_get_text (GTK_ENTRY (entry_title)));
+        GtkWidget* check_toolbar = g_object_get_data (G_OBJECT (dialog), "check-toolbar");
+        katze_item_set_meta_integer (bookmark, "toolbar",
+            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)));
+        GtkWidget* entry_uri = g_object_get_data (G_OBJECT (dialog), "entry-uri");
+        if (!KATZE_IS_ARRAY (bookmark))
+            katze_item_set_uri (bookmark,
+                gtk_entry_get_text (GTK_ENTRY (entry_uri)));
+
+        GtkWidget* combo_folder = g_object_get_data (G_OBJECT (dialog), "combo-folder");
+        gint64 selected = midori_bookmark_folder_button_get_active (combo_folder);
+        katze_item_set_meta_integer (bookmark, "parentid", selected);
+
+        gboolean new_bookmark = g_object_get_data (G_OBJECT (dialog), "new-bookmark") != NULL;
+        if (new_bookmark)
+            midori_bookmarks_db_add_item (browser->bookmarks, bookmark);
+        else
+            midori_bookmarks_db_update_item (browser->bookmarks, bookmark);
+    }
+    gtk_widget_destroy (dialog);
+}
+
 static void
 midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button,
                                                 KatzeItem* bookmark)
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (button);
-    gtk_widget_set_sensitive (button, FALSE);
     midori_browser_add_speed_dial (browser);
+    #if GTK_CHECK_VERSION (3, 12, 0)
+    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
+    #else
+    GtkWidget* dialog = gtk_widget_get_toplevel (button);
+    #endif
+    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
+}
+
+static void
+midori_browser_edit_bookmark_create_launcher_cb (GtkWidget* button,
+                                                 KatzeItem* bookmark)
+{
+    MidoriBrowser* browser = midori_browser_get_for_widget (button);
+    GtkAction* action = g_object_get_data (G_OBJECT (button), "midori-action");
+    gtk_action_activate (action);
+    #if GTK_CHECK_VERSION (3, 12, 0)
+    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
+    #else
+    GtkWidget* dialog = gtk_widget_get_toplevel (button);
+    #endif
+    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
 }
 
+#if GTK_CHECK_VERSION (3, 12, 0)
+static void
+midori_browser_edit_bookmark_button_cb (GtkWidget*     button,
+                                        MidoriBrowser* browser)
+{
+    GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
+    midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_ACCEPT, browser);
+}
+#endif
+
 /* Private function, used by MidoriBookmarks and MidoriHistory */
 /* static */ gboolean
 midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
-                                         KatzeItem*     bookmark,
+                                         KatzeItem*     bookmark_or_parent,
                                          gboolean       new_bookmark,
                                          gboolean       is_folder,
                                          GtkWidget*     proxy)
 {
+    KatzeItem*   bookmark = bookmark_or_parent;
     const gchar* title;
     GtkWidget* dialog;
+    GtkWidget* accept;
     GtkWidget* content_area;
+    GtkWidget* actions;
     GtkWidget* view;
     GtkWidget* vbox;
     GtkWidget* hbox;
@@ -927,60 +1163,53 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     GtkWidget* entry_uri;
     GtkWidget* combo_folder;
     GtkWidget* check_toolbar;
-    GtkWidget* check_app;
     gboolean return_status = FALSE;
-    sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
-    if (!db)
-        return FALSE;
 
     if (is_folder)
-        title = new_bookmark ? _("New folder") : _("Edit folder");
+        title = new_bookmark ? _("New Folder") : _("Edit Folder");
     else
-        title = new_bookmark ? _("New bookmark") : _("Edit bookmark");
-    #ifdef HAVE_GRANITE
+        title = new_bookmark ? _("New Bookmark") : _("Edit Bookmark");
+    #if GTK_CHECK_VERSION (3, 12, 0)
     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);
+        dialog = gtk_popover_new (proxy);
+        content_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+        gtk_container_add (GTK_CONTAINER (dialog), content_area);
+        actions = gtk_hbox_new (FALSE, 6);
+        gtk_box_pack_end (GTK_BOX (content_area), actions, TRUE, TRUE, 0);
+        accept = gtk_button_new_from_stock (new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE);
+        gtk_box_pack_end (GTK_BOX (actions), accept, FALSE, FALSE, 0);
+        g_signal_connect (accept, "clicked", G_CALLBACK (midori_browser_edit_bookmark_button_cb), browser);
     }
     else
     #endif
     {
         dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (browser),
             GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL);
+        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+        actions = gtk_hbox_new (FALSE, 0);
+        gtk_box_pack_end (GTK_BOX (content_area), actions, TRUE, TRUE, 0);
+        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+            new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+        gtk_window_set_icon_name (GTK_WINDOW (dialog),
+            new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE);
+        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+        g_signal_connect (dialog, "response", G_CALLBACK (midori_browser_edit_bookmark_response_cb), browser);
+        accept = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
     }
-    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-        new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+    gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
 
-    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 ("<b>%s</b>", 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);
+    if (!is_folder)
+        label = gtk_label_new (_("Type a name for this bookmark, and choose where to keep it."));
+    else
+        label = gtk_label_new (_("Type a name for this folder, and choose where to keep it."));
 
-    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);
+    vbox = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
 
-    if (!bookmark)
+    if (new_bookmark)
     {
         view = midori_browser_get_current_tab (browser);
         if (is_folder)
@@ -993,96 +1222,71 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
             bookmark = g_object_new (KATZE_TYPE_ITEM,
                 "uri", midori_view_get_display_uri (MIDORI_VIEW (view)),
                 "name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL);
+        katze_item_set_meta_integer (
+            bookmark, "parentid",
+            (!bookmark_or_parent
+                ? 0
+                : katze_item_get_meta_integer (bookmark_or_parent, "id")));
+        g_object_set_data (G_OBJECT (dialog), "new-bookmark", bookmark);
     }
+    g_object_set_data_full (G_OBJECT (dialog), "bookmark", bookmark, (GDestroyNotify)g_object_unref);
 
     entry_title = gtk_entry_new ();
     gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE);
     value = katze_item_get_name (bookmark);
     gtk_entry_set_text (GTK_ENTRY (entry_title), katze_str_non_null (value));
     midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title),
-                                                   GTK_DIALOG (dialog));
+                                                   accept);
     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);
+        G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), accept);
+    gtk_box_pack_start (GTK_BOX (vbox), entry_title, FALSE, FALSE, 0);
+    g_object_set_data (G_OBJECT (dialog), "entry-title", entry_title);
 
     entry_uri = NULL;
     if (!is_folder)
     {
-        entry_uri = katze_uri_entry_new (
-        #if GTK_CHECK_VERSION (2, 20, 0)
-            gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT));
-        #else
-            NULL);
-        #endif
+        entry_uri = katze_uri_entry_new (accept);
         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 (vbox), entry_uri, FALSE, FALSE, 0);
+        g_object_set_data (G_OBJECT (dialog), "entry-uri", entry_uri);
     }
 
     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);
-
-    if (new_bookmark && !is_folder)
-    {
-        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_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP);
-    }
+    gtk_box_pack_start (GTK_BOX (vbox), combo_folder, FALSE, FALSE, 0);
+    g_object_set_data (G_OBJECT (dialog), "combo-folder", combo_folder);
 
-    hbox = gtk_hbox_new (FALSE, 4);
-    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
-    check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar"));
+    hbox = gtk_hbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+    check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in Bookmarks _Bar"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar),
         katze_item_get_meta_boolean (bookmark, "toolbar"));
     gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, FALSE, FALSE, 0);
+    g_object_set_data (G_OBJECT (dialog), "check-toolbar", check_toolbar);
 
-    check_app = NULL;
-    if (!is_folder)
-    {
-        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_box_pack_start (GTK_BOX (hbox), check_app, FALSE, FALSE, 0);
-    }
-    gtk_widget_show_all (content_area);
-
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+    if (new_bookmark && !is_folder)
     {
-        gint64 selected;
+        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_box_pack_start (GTK_BOX (actions), label, FALSE, FALSE, 0);
 
-        katze_item_set_name (bookmark,
-            gtk_entry_get_text (GTK_ENTRY (entry_title)));
-        katze_item_set_meta_integer (bookmark, "toolbar",
-            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)));
-        if (!is_folder)
+        /* FIXME: There's no API for extending the bookmark dialog */
+        GtkAction* action = _action_by_name (browser, "CreateLauncher");
+        if (action != NULL)
         {
-            katze_item_set_uri (bookmark,
-                gtk_entry_get_text (GTK_ENTRY (entry_uri)));
-            katze_item_set_meta_integer (bookmark, "app",
-                gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app)));
+            label = gtk_button_new_with_mnemonic (gtk_action_get_label (action));
+            g_object_set_data (G_OBJECT (label), "midori-action", action);
+            g_signal_connect (label, "clicked",
+                G_CALLBACK (midori_browser_edit_bookmark_create_launcher_cb), bookmark);
+            gtk_box_pack_start (GTK_BOX (actions), label, FALSE, FALSE, 0);
         }
+    }
 
-        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");
+    gtk_widget_show_all (content_area);
+    gtk_widget_show (dialog);
 
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
-            if (!gtk_widget_get_visible (browser->bookmarkbar))
-                _action_set_active (browser, "Bookmarkbar", TRUE);
-        return_status = TRUE;
-    }
-    if (gtk_widget_get_visible (browser->bookmarkbar))
-        midori_bookmarkbar_populate (browser);
-    gtk_widget_destroy (dialog);
     return return_status;
 }
 
@@ -1092,22 +1296,23 @@ midori_browser_prepare_download (MidoriBrowser*  browser,
                                  const gchar*    uri)
 
 {
-#ifndef HAVE_WEBKIT2
-    if (!midori_download_has_enough_space (download, uri))
+    if (!midori_download_has_enough_space (download, uri, FALSE))
         return FALSE;
+
+#ifdef HAVE_WEBKIT2
+    webkit_download_set_destination (download, uri);
+#else
     webkit_download_set_destination_uri (download, uri);
+#endif
     g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
     return TRUE;
-#else
-    return FALSE;
-#endif
 }
 
+#ifndef HAVE_WEBKIT2
 static void
 midori_browser_save_resources (GList*       resources,
                                const gchar* folder)
 {
-#ifndef HAVE_WEBKIT2
     GList* list;
     katze_mkdir_with_parents (folder, 0700);
 
@@ -1139,8 +1344,8 @@ midori_browser_save_resources (GList*       resources,
         g_free (sub_filename);
         g_free (sub_path);
     }
-#endif
 }
+#endif
 
 void
 midori_browser_save_uri (MidoriBrowser* browser,
@@ -1151,9 +1356,6 @@ midori_browser_save_uri (MidoriBrowser* browser,
     GtkWidget* dialog;
     const gchar* title = midori_view_get_display_title (view);
     gchar* filename;
-    GList* resources = midori_view_get_resources (view);
-    gboolean file_only = TRUE;
-    GtkWidget* checkbox = NULL;
 
     dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Save file as"),
         GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -1162,14 +1364,6 @@ midori_browser_save_uri (MidoriBrowser* browser,
     if (uri == NULL)
         uri = midori_view_get_display_uri (view);
 
-    if (resources != NULL && g_list_nth_data (resources, 1) != NULL)
-    {
-        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);
-    }
-
     if (last_dir && *last_dir)
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
     else
@@ -1181,6 +1375,19 @@ midori_browser_save_uri (MidoriBrowser* browser,
         g_free (dirname);
     }
 
+#ifndef HAVE_WEBKIT2
+    GList* resources = midori_view_get_resources (view);
+    gboolean file_only = TRUE;
+    GtkWidget* checkbox = NULL;
+
+    if (resources != NULL && g_list_nth_data (resources, 1) != NULL)
+    {
+        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);
+    }
+
     if (!file_only && !g_str_equal (title, uri))
         filename = midori_download_clean_filename (title);
     else
@@ -1200,17 +1407,37 @@ midori_browser_save_uri (MidoriBrowser* browser,
         if (!file_only)
         {
             gchar* fullname = g_strconcat (filename, ".html", NULL);
-            midori_view_save_source (view, uri, fullname);
+            midori_view_save_source (view, uri, fullname, FALSE);
             g_free (fullname);
             midori_browser_save_resources (resources, filename);
         }
         else
-            midori_view_save_source (view, uri, filename);
+            midori_view_save_source (view, uri, filename, FALSE);
         katze_assign (last_dir,
             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
-    gtk_widget_destroy (dialog);
+    g_list_foreach (resources, (GFunc)g_object_unref, NULL);
     g_list_free (resources);
+#else
+    filename = midori_download_clean_filename (title);
+    gchar* suggested_filename = g_strconcat (filename, ".mht", NULL);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename);
+
+    g_free (filename);
+    g_free (suggested_filename);
+    if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+        char *uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+        if (uri != NULL)
+        {
+            midori_view_save_source (view, uri, NULL, false);
+            g_free (uri);
+        }
+        katze_assign (last_dir,
+            gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
+    }
+#endif
+    gtk_widget_destroy (dialog);
 }
 
 static void
@@ -1219,7 +1446,7 @@ midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial,
 {
     GList* tabs = midori_browser_get_tabs (browser);
     for (; tabs != NULL; tabs = g_list_next (tabs))
-        if (midori_view_is_blank (tabs->data))
+        if (!strcmp (midori_tab_get_uri (tabs->data), "about:dial"))
             midori_view_reload (tabs->data, FALSE);
     g_list_free (tabs);
 }
@@ -1227,16 +1454,10 @@ midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial,
 static void
 midori_browser_add_speed_dial (MidoriBrowser* browser)
 {
-    GdkPixbuf* img;
     GtkWidget* view = midori_browser_get_current_tab (browser);
-
-    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);
-        g_object_unref (img);
-    }
+    midori_speed_dial_add (browser->dial,
+        midori_view_get_display_uri (MIDORI_VIEW (view)),
+        midori_view_get_display_title (MIDORI_VIEW (view)), NULL);
 }
 
 static gboolean
@@ -1248,6 +1469,56 @@ midori_browser_tab_leave_notify_event_cb (GtkWidget*        widget,
     return TRUE;
 }
 
+static void
+midori_browser_view_copy_to_item_history (GtkWidget* view,
+                                          KatzeItem* item)
+{
+#ifndef HAVE_WEBKIT2
+    WebKitWebView* copy_from;
+    WebKitWebBackForwardList* list_from;
+    guint length_from;
+    gint i;
+    GPtrArray* history;
+
+    copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
+    list_from = webkit_web_view_get_back_forward_list (copy_from);
+    length_from = webkit_web_back_forward_list_get_back_length (list_from);
+    history = g_ptr_array_new ();
+
+    for (i = -length_from; i <=  -1 ; i++)
+    {
+        WebKitWebHistoryItem* hist_item = webkit_web_back_forward_list_get_nth_item (list_from, i);
+        if (hist_item == NULL)
+            break;
+        g_object_ref ((gpointer) hist_item);
+        g_ptr_array_add (history, (gpointer) hist_item);
+    }
+    g_object_set_data (G_OBJECT (item), "tab-history", (gpointer) history);
+#endif
+}
+
+static void
+midori_view_destroy_cb (GtkWidget*     view,
+                        MidoriBrowser* browser)
+{
+    if (browser->proxy_array)
+    {
+        KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
+        if (katze_array_get_item_index (browser->proxy_array, item) != -1
+         && !midori_tab_is_blank (MIDORI_TAB (view)))
+        {
+            if (browser->trash)
+            {
+                midori_browser_view_copy_to_item_history (view,item);
+                katze_array_add_item (browser->trash, item);
+            }
+            midori_browser_update_history (item, "website", "leave");
+        }
+        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
+        g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
+    }
+}
+
 static void
 midori_view_attach_inspector_cb (GtkWidget*     view,
                                  GtkWidget*     inspector_view,
@@ -1302,16 +1573,49 @@ midori_browser_view_copy_history (GtkWidget* view_to,
     list_to = webkit_web_view_get_back_forward_list (copy_to);
     length_from = webkit_web_back_forward_list_get_back_length (list_from);
 
-    g_return_if_fail (!webkit_web_back_forward_list_get_back_length (list_to));
-
     for (i = -length_from; i <= (omit_last ? -1 : 0); i++)
     {
-        webkit_web_back_forward_list_add_item (list_to,
-            webkit_web_back_forward_list_get_nth_item (list_from, i));
+        WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_nth_item (list_from, i);
+        if (item == NULL)
+            break;
+        webkit_web_back_forward_list_add_item (list_to, item);
     }
 #endif
 }
 
+
+static void
+midori_browser_view_copy_from_item_history (GtkWidget* view,
+                                            KatzeItem* item)
+{
+#ifndef HAVE_WEBKIT2
+    WebKitWebView* copy_to;
+    WebKitWebBackForwardList* list_to;
+    guint i;
+    GPtrArray* list_from;
+
+    copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
+    list_to = webkit_web_view_get_back_forward_list (copy_to);
+
+    if (item == NULL)
+        return;
+    list_from = g_object_get_data (G_OBJECT (item), "tab-history");
+    if (list_from == NULL)
+        return;
+
+    for (i = 0; i < list_from->len; i++)
+    {
+        WebKitWebHistoryItem* hist_item = (WebKitWebHistoryItem*) g_ptr_array_index (list_from, i);
+        if (hist_item == NULL)
+            break;
+        webkit_web_back_forward_list_add_item (list_to, hist_item);
+    }
+    g_ptr_array_unref (list_from);
+#endif
+}
+
+
+
 static gboolean
 midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
 {
@@ -1334,14 +1638,40 @@ midori_browser_notify_new_tab (MidoriBrowser* browser)
     }
 }
 
+static bool
+midori_view_forward_external (GtkWidget*    view,
+                              const gchar*  uri,
+                              MidoriNewView where)
+{
+    if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
+    {
+        gboolean handled = FALSE;
+        g_signal_emit_by_name (view, "open-uri", uri, &handled);
+        return handled;
+    }
+    else if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_PRIVATE)
+    {
+        if (where == MIDORI_NEW_VIEW_WINDOW)
+        {
+            sokoke_spawn_app (uri, TRUE);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 static void
 midori_view_new_tab_cb (GtkWidget*     view,
                         const gchar*   uri,
                         gboolean       background,
                         MidoriBrowser* browser)
 {
+    if (midori_view_forward_external (view, uri, MIDORI_NEW_VIEW_TAB))
+        return;
+
     GtkWidget* new_view = midori_browser_add_uri (browser, uri);
-    midori_browser_view_copy_history (new_view, view, FALSE);
+    if (view != NULL)
+        midori_browser_view_copy_history (new_view, view, FALSE);
 
     if (!background)
         midori_browser_set_current_tab (browser, new_view);
@@ -1354,14 +1684,21 @@ midori_view_new_window_cb (GtkWidget*     view,
                            const gchar*   uri,
                            MidoriBrowser* browser)
 {
+    if (midori_view_forward_external (
+        view ? view : midori_browser_get_current_tab (browser),
+        uri, MIDORI_NEW_VIEW_WINDOW))
+        return;
+
     MidoriBrowser* new_browser;
     g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
-    if (new_browser)
-        midori_browser_add_uri (new_browser, uri);
-    else /* No MidoriApp, so this is app or private mode */
-        sokoke_spawn_app (uri, TRUE);
+    g_assert (new_browser != NULL);
+    midori_view_new_tab_cb (view, uri, FALSE, new_browser);
 }
 
+static void
+_midori_browser_set_toolbar_items (MidoriBrowser* browser,
+                                   const gchar*   items);
+
 static void
 midori_view_new_view_cb (GtkWidget*     view,
                          GtkWidget*     new_view,
@@ -1369,11 +1706,39 @@ midori_view_new_view_cb (GtkWidget*     view,
                          gboolean       user_initiated,
                          MidoriBrowser* browser)
 {
+    if (midori_tab_get_is_dialog (MIDORI_TAB (view)))
+    {
+        /* Dialog: URL, no toolbars, no tabs */
+        MidoriBrowser* new_browser;
+        g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
+        g_assert (new_browser != NULL);
+        gtk_window_set_transient_for (GTK_WINDOW (new_browser), GTK_WINDOW (browser));
+        gtk_window_set_destroy_with_parent (GTK_WINDOW (new_browser), TRUE);
+        g_object_set (new_browser,
+                      "show-tabs", FALSE,
+                      NULL);
+        sokoke_widget_set_visible (new_browser->menubar, FALSE);
+        sokoke_widget_set_visible (new_browser->bookmarkbar, FALSE);
+        sokoke_widget_set_visible (new_browser->statusbar, FALSE);
+        _action_set_visible (new_browser, "CompactMenu", FALSE);
+        _midori_browser_set_toolbar_items (new_browser, "Location");
+        sokoke_widget_set_visible (new_browser->panel, FALSE);
+        midori_browser_add_tab (new_browser, new_view);
+        midori_browser_set_current_tab (new_browser, new_view);
+        return;
+    }
+
+    if (midori_view_forward_external (new_view,
+        katze_item_get_uri (midori_view_get_proxy_item (MIDORI_VIEW (new_view))),
+        where))
+        return;
+
     midori_browser_view_copy_history (new_view, view, TRUE);
     if (where == MIDORI_NEW_VIEW_WINDOW)
     {
         MidoriBrowser* new_browser;
         g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
+        g_assert (new_browser != NULL);
         midori_browser_add_tab (new_browser, new_view);
         midori_browser_set_current_tab (new_browser, new_view);
     }
@@ -1403,37 +1768,6 @@ midori_view_new_view_cb (GtkWidget*     view,
     }
 }
 
-static void
-midori_browser_download_status_cb (WebKitDownload*  download,
-                                   GParamSpec*      pspec,
-                                   GtkWidget*       widget)
-{
-#ifndef HAVE_WEBKIT2
-    const gchar* uri = webkit_download_get_destination_uri (download);
-    switch (webkit_download_get_status (download))
-    {
-        case WEBKIT_DOWNLOAD_STATUS_FINISHED:
-            if (!sokoke_show_uri (gtk_widget_get_screen (widget), uri, 0, NULL))
-            {
-                sokoke_message_dialog (GTK_MESSAGE_ERROR,
-                    _("Error opening the image!"),
-                    _("Can not open selected image in a default viewer."), FALSE);
-            }
-            break;
-        case WEBKIT_DOWNLOAD_STATUS_ERROR:
-            webkit_download_cancel (download);
-            sokoke_message_dialog (GTK_MESSAGE_ERROR,
-                _("Error downloading the image!"),
-                _("Can not download selected image."), FALSE);
-            break;
-        case WEBKIT_DOWNLOAD_STATUS_CREATED:
-        case WEBKIT_DOWNLOAD_STATUS_STARTED:
-        case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
-            break;
-    }
-#endif
-}
-
 #ifdef HAVE_WEBKIT2
 static void
 midori_browser_close_tab_idle (GObject*      resource,
@@ -1469,18 +1803,6 @@ midori_view_download_requested_cb (GtkWidget*      view,
     {
         handled = FALSE;
     }
-    else if (type == MIDORI_DOWNLOAD_OPEN_IN_VIEWER)
-    {
-        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);
-        #ifndef HAVE_WEBKIT2
-        webkit_download_start (download);
-        #endif
-    }
     #ifdef HAVE_WEBKIT2
     else if (!webkit_download_get_destination (download))
     #else
@@ -1514,7 +1836,6 @@ midori_view_download_requested_cb (GtkWidget*      view,
                 g_signal_connect (dialog, "destroy",
                                   G_CALLBACK (gtk_widget_destroyed), &dialog);
             }
-
             filename = midori_download_get_suggested_filename (download);
             gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
             g_free (filename);
@@ -1567,6 +1888,12 @@ midori_view_download_requested_cb (GtkWidget*      view,
     return handled;
 }
 
+void download_created_destination_cb (WebKitDownload *download,
+                                      gchar          *destination,
+                                      gpointer        user_data){
+    g_print("%s: destination %s",G_STRFUNC,destination);
+}
+
 static void
 midori_view_search_text_cb (GtkWidget*     view,
                             gboolean       found,
@@ -1579,98 +1906,14 @@ midori_view_search_text_cb (GtkWidget*     view,
 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_disconnect_tab (MidoriBrowser* browser,
-                               MidoriView*    view);
-
-static gboolean
-midori_browser_tab_connected (MidoriBrowser* browser,
-                              MidoriView*    view)
-{
-    return browser->proxy_array &&
-        (katze_array_get_item_index (browser->proxy_array, midori_view_get_proxy_item (view)) != -1);
+    return midori_notebook_get_count (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 static void
 _midori_browser_remove_tab (MidoriBrowser* browser,
                             GtkWidget*     widget)
 {
-    MidoriView* view = MIDORI_VIEW (widget);
-#ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_remove_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), midori_view_get_tab (view));
-#else
     gtk_widget_destroy (widget);
-#endif
-    if (midori_browser_tab_connected (browser, view))
-        midori_browser_disconnect_tab (browser, view);
-}
-
-#ifndef HAVE_GRANITE
-static void
-midori_browser_notebook_resize (MidoriBrowser* browser,
-                                GdkRectangle*  allocation)
-{
-    gint new_size = 0;
-    gint n = MAX (1, gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)));
-    const gint max_size = 150;
-    gint min_size;
-    gint icon_size = 16;
-    GtkAllocation notebook_size;
-    GList* children;
-
-    if (allocation != NULL)
-        notebook_size.width = allocation->width;
-    else
-        gtk_widget_get_allocation (browser->notebook, &notebook_size);
-    new_size = notebook_size.width / n;
-
-    gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook),
-                                       GTK_ICON_SIZE_MENU, &icon_size, NULL);
-    min_size = icon_size;
-    if (katze_object_get_boolean (browser->settings, "close-buttons-on-tabs"))
-        min_size += icon_size;
-    if (new_size < min_size) new_size = min_size;
-    if (new_size > max_size) new_size = max_size;
-
-    if (new_size > browser->last_tab_size - 3
-     && new_size < browser->last_tab_size + 3)
-        return;
-    browser->last_tab_size = new_size;
-
-    children = gtk_container_get_children (GTK_CONTAINER (browser->notebook));
-    for (; children; children = g_list_next (children))
-    {
-        GtkWidget* view = children->data;
-        GtkWidget* label;
-        label = gtk_notebook_get_tab_label (GTK_NOTEBOOK(browser->notebook), view);
-        /* Don't resize empty bin, which is used for thumbnail tabs */
-        if (GTK_IS_BIN (label) && gtk_bin_get_child (GTK_BIN (label))
-         && !katze_object_get_boolean (view, "minimized"))
-            gtk_widget_set_size_request (label, new_size, -1);
-    }
-}
-#endif
-
-static void
-midori_browser_notebook_size_allocate_cb (GtkWidget*     widget,
-                                          GdkRectangle*  allocation,
-                                          MidoriBrowser* browser)
-{
-    #ifndef HAVE_GRANITE
-    if (!gtk_notebook_get_show_tabs (GTK_NOTEBOOK (browser->notebook)))
-        return;
-
-    midori_browser_notebook_resize (browser, allocation);
-    #endif
 }
 
 static void
@@ -1680,7 +1923,6 @@ midori_browser_connect_tab (MidoriBrowser* browser,
     KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
     katze_array_add_item (browser->proxy_array, item);
 
-    gtk_widget_set_can_focus (view, TRUE);
     g_object_connect (view,
                       "signal::notify::icon",
                       midori_view_notify_icon_cb, browser,
@@ -1692,8 +1934,6 @@ midori_browser_connect_tab (MidoriBrowser* browser,
                       midori_view_notify_uri_cb, browser,
                       "signal::notify::title",
                       midori_view_notify_title_cb, browser,
-                      "signal::notify::minimized",
-                      midori_view_notify_minimized_cb, browser,
                       "signal::notify::zoom-level",
                       midori_view_notify_zoom_level_cb, browser,
                       "signal::notify::statusbar-text",
@@ -1714,29 +1954,11 @@ midori_browser_connect_tab (MidoriBrowser* browser,
                       midori_view_search_text_cb, browser,
                       "signal::leave-notify-event",
                       midori_browser_tab_leave_notify_event_cb, browser,
+                      "signal::destroy",
+                      midori_view_destroy_cb, browser,
                       NULL);
 }
 
-static void
-midori_browser_add_tab_to_trash (MidoriBrowser* browser,
-                                 MidoriView*    view)
-{
-    if (browser->proxy_array)
-    {
-        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");
-            }
-        }
-    }
-}
-
-
 static void
 midori_browser_disconnect_tab (MidoriBrowser* browser,
                                MidoriView*    view)
@@ -1768,8 +1990,6 @@ midori_browser_disconnect_tab (MidoriBrowser* browser,
                          "any_signal",
                          midori_view_notify_title_cb, browser,
                          "any_signal",
-                         midori_view_notify_minimized_cb, browser,
-                         "any_signal",
                          midori_view_notify_zoom_level_cb, browser,
                          "any_signal",
                          midori_view_notify_statusbar_text_cb, browser,
@@ -1796,11 +2016,7 @@ 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);
@@ -1812,24 +2028,10 @@ _midori_browser_add_tab (MidoriBrowser* browser,
         katze_array_move_item (browser->proxy_array, item, n);
     }
     else
-        n = midori_browser_get_n_pages (browser);
+        n = -1;
     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
+    midori_notebook_insert (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view), n);
 
     _midori_browser_update_actions (browser);
 }
@@ -1840,6 +2042,53 @@ _midori_browser_quit (MidoriBrowser* browser)
     /* Nothing to do */
 }
 
+static void
+_update_tooltip_if_changed (GtkAction* action,
+                            const gchar* text)
+{
+    gchar *old;
+    g_object_get (action, "tooltip", &old, NULL);
+    if (g_strcmp0(old, text)) {
+        g_object_set (action,
+                      "tooltip", text, NULL);
+    }
+    g_free (old);
+}
+
+static void
+_update_reload_tooltip (GtkWidget*   widget,
+                        GdkEventKey* event,
+                        gboolean released)
+{
+    MidoriBrowser* browser = MIDORI_BROWSER (widget);
+
+    /* Update the reload/stop tooltip in case we are holding the hard refresh modifiers*/
+    GtkAction *reload_stop = _action_by_name (browser, "ReloadStop");
+    GtkAction *reload = _action_by_name (browser, "Reload");
+    GdkModifierType mask;
+    gdk_window_get_pointer (gtk_widget_get_window (widget), NULL, NULL, &mask);
+    const gchar *target;
+
+    if ( mask & GDK_SHIFT_MASK)
+    {
+        target = _("Reload page without caching");
+    }
+    else
+    {
+        target = _("Reload the current page");
+    }
+    _update_tooltip_if_changed (reload_stop, target);
+    _update_tooltip_if_changed (reload, target);
+}
+
+static gboolean
+midori_browser_key_release_event (GtkWidget*   widget,
+                                  GdkEventKey* event)
+{
+    _update_reload_tooltip (widget, event, TRUE);
+    return GTK_WIDGET_CLASS (midori_browser_parent_class)->key_release_event (widget, event);
+}
+
 static gboolean
 midori_browser_key_press_event (GtkWidget*   widget,
                                 GdkEventKey* event)
@@ -1848,8 +2097,8 @@ midori_browser_key_press_event (GtkWidget*   widget,
     MidoriBrowser* browser = MIDORI_BROWSER (widget);
     GtkWidgetClass* widget_class;
     guint clean_state;
-    GtkWidget* focus;
 
+    _update_reload_tooltip(widget, event, FALSE);
     /* Interpret Ctrl(+Shift)+Tab as tab switching for compatibility */
     if (midori_browser_get_nth_tab (browser, 1) != NULL
      && event->keyval == GDK_KEY_Tab
@@ -1880,7 +2129,7 @@ midori_browser_key_press_event (GtkWidget*   widget,
     }
 
 #ifndef HAVE_WEBKIT2
-    focus = gtk_window_get_focus (GTK_WINDOW (widget));
+    GtkWidget* focus = gtk_window_get_focus (GTK_WINDOW (widget));
     if (focus == NULL)
         gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER (widget)));
     else if (G_OBJECT_TYPE (focus) == WEBKIT_TYPE_WEB_VIEW
@@ -2175,6 +2424,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
 
     gtkwidget_class = GTK_WIDGET_CLASS (class);
     gtkwidget_class->key_press_event = midori_browser_key_press_event;
+    gtkwidget_class->key_release_event = midori_browser_key_release_event;
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->dispose = midori_browser_dispose;
@@ -2332,7 +2582,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
                                      "bookmarks",
                                      "Bookmarks",
                                      "The bookmarks folder, containing all bookmarks",
-                                     KATZE_TYPE_ARRAY,
+                                     TYPE_MIDORI_BOOKMARKS_DB,
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
     /**
@@ -2629,7 +2879,28 @@ static void
 _action_window_close_activate (GtkAction*     action,
                                MidoriBrowser* browser)
 {
-    gtk_widget_destroy (GTK_WIDGET (browser));
+    gboolean val = FALSE;
+    GdkEvent* event = gtk_get_current_event();
+    g_signal_emit_by_name (G_OBJECT (browser), "delete-event", event, &val);
+    gdk_event_free (event);
+
+    if (!val)
+        gtk_widget_destroy (GTK_WIDGET (browser));
+}
+
+static void
+_action_mail_to_activate (GtkAction*     action,
+                          MidoriBrowser* browser)
+{
+    MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
+    gchar* uri = g_uri_escape_string (midori_view_get_display_uri (view), NULL, TRUE);
+    gchar* title = g_uri_escape_string (midori_view_get_display_title (view), NULL, TRUE);
+    gchar* mailto = g_strconcat ("mailto:?cc=&bcc=&subject=", title, "&body=", uri, NULL);
+    gboolean handled = FALSE;
+    g_signal_emit_by_name (view, "open-uri", mailto, &handled);
+    g_free (mailto);
+    g_free (title);
+    g_free (uri);
 }
 
 static void
@@ -2638,32 +2909,7 @@ _action_print_activate (GtkAction*     action,
 {
     GtkWidget* view = midori_browser_get_current_tab (browser);
 
-    #if 0 // def 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_light_window_new (_("Share this page"));
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    GtkWidget* content_area = (GtkWidget*)granite_widgets_decorated_window_get_box (GRANITE_WIDGETS_DECORATED_WINDOW (dialog));
-    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);
-    /* FIXME: granite: "box" isn't visible by default */
-    gtk_widget_show_all (dialog);
-    #else
     midori_view_print (MIDORI_VIEW (view));
-    #endif
 }
 
 static void
@@ -2684,15 +2930,8 @@ _action_edit_activate (GtkAction*     action,
 
     if (WEBKIT_IS_WEB_VIEW (widget))
     {
-#ifndef HAVE_WEBKIT2
-        WebKitWebView* view = WEBKIT_WEB_VIEW (widget);
-        can_undo = webkit_web_view_can_undo (view);
-        can_redo = webkit_web_view_can_redo (view);
-        can_cut = webkit_web_view_can_cut_clipboard (view);
-        can_copy = webkit_web_view_can_copy_clipboard (view);
-        can_paste = webkit_web_view_can_paste_clipboard (view);
-        can_select_all = TRUE;
-#endif
+        midori_tab_update_actions (MIDORI_TAB (midori_browser_get_current_tab (browser)), browser->action_group, NULL, NULL);
+        return;
     }
     else if (GTK_IS_EDITABLE (widget))
     {
@@ -2727,9 +2966,11 @@ static void
 _action_undo_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
+#ifdef HAVE_WEBKIT2
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_UNDO);
+#else
         webkit_web_view_undo (WEBKIT_WEB_VIEW (widget));
 #endif
 }
@@ -2738,9 +2979,11 @@ static void
 _action_redo_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
+#ifdef HAVE_WEBKIT2
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_REDO);
+#else
         webkit_web_view_redo (WEBKIT_WEB_VIEW (widget));
 #endif
 }
@@ -2752,6 +2995,10 @@ _action_cut_activate (GtkAction*     action,
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("cut-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "cut-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_CUT);
+#endif
 }
 
 static void
@@ -2759,19 +3006,12 @@ _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))
-    {
-        GtkWidget* scrolled = gtk_widget_get_parent (widget);
-        GtkWidget* view = gtk_widget_get_parent (scrolled);
-        const gchar* selected = midori_view_get_selected_text (MIDORI_VIEW (view));
-        sokoke_widget_copy_clipboard (widget, selected, NULL, NULL);
-        return;
-    }
-#endif
     if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "copy-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_COPY);
+#endif
 }
 
 static void
@@ -2781,25 +3021,29 @@ _action_paste_activate (GtkAction*     action,
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("paste-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "paste-clipboard");
+#ifdef HAVE_WEBKIT2
+    else if (WEBKIT_IS_WEB_VIEW (widget))
+        webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_PASTE);
+#endif
 }
 
 static void
 _action_delete_activate (GtkAction*     action,
                          MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget))
     {
-        if (WEBKIT_IS_WEB_VIEW (widget))
-            webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget));
-        else if (GTK_IS_EDITABLE (widget))
+        if (GTK_IS_EDITABLE (widget))
             gtk_editable_delete_selection (GTK_EDITABLE (widget));
+#ifndef HAVE_WEBKIT2
+        else if (WEBKIT_IS_WEB_VIEW (widget))
+            webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget));
+#endif
         else if (GTK_IS_TEXT_VIEW (widget))
             gtk_text_buffer_delete_selection (
                 gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), TRUE, FALSE);
     }
-#endif
 }
 
 static void
@@ -2811,6 +3055,10 @@ _action_select_all_activate (GtkAction*     action,
     {
         if (GTK_IS_EDITABLE (widget))
             gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
+#ifdef HAVE_WEBKIT2
+        else if (WEBKIT_IS_WEB_VIEW (widget))
+            webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_SELECT_ALL);
+#endif
         else if (g_signal_lookup ("select-all", G_OBJECT_TYPE (widget)))
         {
             if (GTK_IS_TEXT_VIEW (widget))
@@ -2880,7 +3128,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", "NextForward", "Location",
             "ZoomOut", "Separator", "Back", "Forward", "Homepage",
             "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL };
 
@@ -2911,44 +3159,55 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget*     widget,
                                               gint           button,
                                               MidoriBrowser* browser)
 {
-    GtkWidget* menu;
-    GtkWidget* menuitem;
-
-    menu = gtk_menu_new ();
-    menuitem = sokoke_action_create_popup_menu_item (
-        _action_by_name (browser, "Menubar"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = sokoke_action_create_popup_menu_item (
-        _action_by_name (browser, "Navigationbar"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = sokoke_action_create_popup_menu_item (
-        _action_by_name (browser, "Bookmarkbar"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = sokoke_action_create_popup_menu_item (
-        _action_by_name (browser, "Statusbar"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-
-    g_signal_emit (browser, signals[POPULATE_TOOLBAR_MENU], 0, menu);
+    MidoriContextAction* menu = midori_context_action_new ("ToolbarContextMenu", NULL, NULL, NULL);
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add_by_name (menu, "Menubar");
+    midori_context_action_add_by_name (menu, "Navigationbar");
+    midori_context_action_add_by_name (menu, "Bookmarkbar");
+    midori_context_action_add_by_name (menu, "Statusbar");
 
-    katze_widget_popup (widget, GTK_MENU (menu), NULL,
+    GtkMenu* context_menu = midori_context_action_create_menu (menu, NULL, FALSE);
+    g_signal_emit (browser, signals[POPULATE_TOOLBAR_MENU], 0, context_menu);
+    katze_widget_popup (widget, GTK_MENU (context_menu), NULL,
         button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR);
     return TRUE;
 }
 
+static void
+midori_browser_bookmark_popup (GtkWidget*      proxy,
+                               GdkEventButton* event,
+                               KatzeItem*      item,
+                               MidoriBrowser*  browser);
+
+static void
+midori_bookmarkbar_activate_item (GtkAction*     action,
+                                  KatzeItem*     item,
+                                  MidoriBrowser* browser)
+{
+    midori_browser_open_bookmark (browser, item);
+}
+
+static void
+midori_bookmarkbar_activate_item_new_tab (GtkAction*     action,
+                                          KatzeItem*     item,
+                                          MidoriBrowser* browser)
+{
+    GtkWidget* view = midori_browser_add_item (browser, item);
+    midori_browser_set_current_tab_smartly (browser, view);
+}
+
 static gboolean
-midori_bookmarkbar_activate_item_alt (GtkAction*     action,
-                                      KatzeItem*     item,
-                                      guint          button,
-                                      MidoriBrowser* browser)
+midori_bookmarkbar_activate_item_alt (GtkAction*      action,
+                                      KatzeItem*      item,
+                                      GtkWidget*      proxy,
+                                      GdkEventButton* event,
+                                      MidoriBrowser*  browser)
 {
-    if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
-    {
-        GtkWidget* view = midori_browser_add_item (browser, item);
-        midori_browser_set_current_tab_smartly (browser, view);
-    }
-    else if (button == 1)
+    g_assert (event);
+
+    if (MIDORI_EVENT_CONTEXT_MENU (event))
     {
-        midori_browser_open_bookmark (browser, item);
+        midori_browser_bookmark_popup (proxy, NULL, item, browser);
     }
 
     return TRUE;
@@ -2975,35 +3234,34 @@ midori_browser_restore_tab (MidoriBrowser* browser,
                             KatzeItem*     item)
 {
     GtkWidget* view;
-
     g_object_ref (item);
     katze_array_remove_item (browser->trash, item);
     view = midori_browser_add_item (browser, item);
+    midori_browser_view_copy_from_item_history (view,item);
+
     g_object_unref (item);
     return view;
 }
 
-static gboolean
-_action_trash_activate_item_alt (GtkAction*     action,
-                                 KatzeItem*     item,
-                                 guint          button,
-                                 MidoriBrowser* browser)
+static void
+_action_trash_activate_item (GtkAction*     action,
+                             KatzeItem*     item,
+                             MidoriBrowser* browser)
 {
-    if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
-    {
-        midori_browser_set_current_tab_smartly (browser,
-            midori_browser_restore_tab (browser, item));
-    }
-    else if (button == 1)
-    {
-        midori_browser_set_current_tab (browser,
-            midori_browser_restore_tab (browser, item));
-    }
+    midori_browser_set_current_tab (browser,
+        midori_browser_restore_tab (browser, item));
+}
 
-    return TRUE;
+static void
+_action_trash_activate_item_new_tab (GtkAction*     action,
+                                     KatzeItem*     item,
+                                     MidoriBrowser* browser)
+{
+    midori_browser_set_current_tab_smartly (browser,
+        midori_browser_restore_tab (browser, item));
 }
 
-/* static */ void
+/* static */ gboolean
 midori_browser_open_bookmark (MidoriBrowser* browser,
                               KatzeItem*     item)
 {
@@ -3011,83 +3269,46 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
     gchar* uri_fixed;
 
     if (!(uri && *uri))
-        return;
+        return FALSE;
 
     /* Imported bookmarks may lack a protocol */
-    uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
-    if (!uri_fixed)
-        uri_fixed = g_strdup (uri);
-
-    if (katze_item_get_meta_boolean (item, "app"))
-        sokoke_spawn_app (uri_fixed, FALSE);
-    else
-    {
-        midori_browser_set_current_uri (browser, uri_fixed);
-        gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
-    }
-    g_free (uri_fixed);
-}
-
-static void
-_action_tools_populate_popup (GtkAction*     action,
-                              GtkMenu*       menu,
-                              MidoriBrowser* browser)
-{
-    static const GtkActionEntry actions[] =
-    {
-        { "ManageSearchEngines" },
-        { "ClearPrivateData" },
-        { "InspectPage" },
-        { "-" },
-        { NULL },
-        { "p" },
-        #ifdef G_OS_WIN32
-        { NULL },
-        { "Preferences" },
-        #endif
-    };
-    guint i;
-
-    for (i = 0; i < G_N_ELEMENTS (actions); i++)
-    {
-        GtkWidget* menuitem;
-        if (actions[i].name != NULL)
-        {
-            if (actions[i].name[0] == '-')
-            {
-                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), FALSE);
-                    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-                }
-                continue;
-            }
-            menuitem = sokoke_action_create_popup_menu_item (
-                _action_by_name (browser, actions[i].name));
-        }
-        else
-            menuitem = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        gtk_widget_show (menuitem);
+    uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
+    if (!uri_fixed)
+        uri_fixed = g_strdup (uri);
+
+    if (katze_item_get_meta_boolean (item, "app"))
+        sokoke_spawn_app (uri_fixed, FALSE);
+    else
+    {
+        midori_browser_set_current_uri (browser, uri_fixed);
+        gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
     }
+    g_free (uri_fixed);
+    return TRUE;
 }
 
 static void
-midori_browser_bookmark_popup (GtkWidget*      widget,
-                               GdkEventButton* event,
-                               KatzeItem*      item,
-                               MidoriBrowser*  browser);
+_action_tools_populate_popup (GtkAction*     action,
+                              GtkMenu*       default_menu,
+                              MidoriBrowser* browser)
+{
+    MidoriContextAction* menu = midori_context_action_new ("ToolsMenu", NULL, NULL, NULL);
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add_by_name (menu, "ManageSearchEngines");
+    midori_context_action_add_by_name (menu, "ClearPrivateData");
+    midori_context_action_add_by_name (menu, "InspectPage");
+    g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, default_menu);
+    midori_context_action_add (menu, NULL);
+    gsize j = 0;
+    GtkWidget* widget;
+    while ((widget = midori_panel_get_nth_page (MIDORI_PANEL (browser->panel), j++)))
+        midori_context_action_add (menu, g_object_get_data (G_OBJECT (widget), "midori-panel-action"));
+    #ifdef G_OS_WIN32
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "Preferences");
+    #endif
+    midori_context_action_create_menu (menu, default_menu, TRUE);
+}
 
 static gboolean
 _action_bookmarks_populate_folder (GtkAction*     action,
@@ -3095,28 +3316,34 @@ _action_bookmarks_populate_folder (GtkAction*     action,
                                    KatzeArray*    folder,
                                    MidoriBrowser* browser)
 {
-    KatzeArray* bookmarks;
-    const gchar* id = katze_item_get_meta_string (KATZE_ITEM (folder), "id");
-    gchar* condition;
-
     if (browser->bookmarks == NULL)
         return FALSE;
 
-    if (id == NULL)
-        condition = "parentid is NULL";
-    else
-        condition = "parentid = %q";
-
-    bookmarks = midori_array_query (browser->bookmarks,
-        "id, title, parentid, uri, app, pos_panel, pos_bar", condition, id);
-    if (!bookmarks)
-        return FALSE;
+    midori_bookmarks_db_populate_folder (browser->bookmarks, folder);
 
     /* Clear items from dummy array here */
     gtk_container_foreach (GTK_CONTAINER (menu),
         (GtkCallback)(gtk_widget_destroy), NULL);
 
-    if (katze_array_is_empty (bookmarks))
+    /* "Add Bookmark", "Import Bookmarks", and "Export Bookmarks" at the top */
+    if (folder == KATZE_ARRAY (browser->bookmarks))
+    {
+        GtkWidget* menuitem;
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarkAdd"));
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarksImport"));
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarksExport"));
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+        menuitem = gtk_separator_menu_item_new ();
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+    }
+
+    if (katze_array_is_empty (folder))
     {
         GtkWidget* menuitem = gtk_image_menu_item_new_with_label (_("Empty"));
         gtk_widget_set_sensitive (menuitem, FALSE);
@@ -3125,118 +3352,68 @@ _action_bookmarks_populate_folder (GtkAction*     action,
         return TRUE;
     }
 
-    katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), bookmarks,
+    katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), folder,
                                       menu, GTK_WIDGET (browser));
     return TRUE;
 }
 
 static void
 _action_window_populate_popup (GtkAction*     action,
-                               GtkMenu*       menu,
+                               GtkMenu*       default_menu,
                                MidoriBrowser* browser)
 {
-    GtkWidget* menuitem;
-
-    menuitem = gtk_separator_menu_item_new ();
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    menuitem = gtk_action_create_menu_item (
-        _action_by_name (browser, "LastSession"));
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    menuitem = gtk_action_create_menu_item (
-        _action_by_name (browser, "TabCurrent"));
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    menuitem = gtk_action_create_menu_item (
-        _action_by_name (browser, "NextView"));
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    menuitem = gtk_action_create_menu_item (
-        _action_by_name (browser, "TabNext"));
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    menuitem = gtk_action_create_menu_item (
-        _action_by_name (browser, "TabPrevious"));
-    gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
+    MidoriContextAction* menu = midori_context_action_new ("WindowMenu", NULL, NULL, NULL);
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "LastSession");
+    midori_context_action_add_by_name (menu, "TabCurrent");
+    midori_context_action_add_by_name (menu, "NextView");
+    midori_context_action_add_by_name (menu, "TabNext");
+    midori_context_action_add_by_name (menu, "TabPrevious");
+    midori_context_action_create_menu (menu, default_menu, TRUE);
 }
 
 static void
-_action_window_activate_item_alt (GtkAction*     action,
-                                  KatzeItem*     item,
-                                  gint           button,
-                                  MidoriBrowser* browser)
+_action_window_activate_item (GtkAction*     action,
+                              KatzeItem*     item,
+                              MidoriBrowser* browser)
 {
     midori_browser_set_current_item (browser, item);
 }
 
 static void
 _action_compact_menu_populate_popup (GtkAction*     action,
-                                     GtkWidget*     menu,
+                                     GtkMenu*       default_menu,
                                      MidoriBrowser* browser)
 {
-    static const GtkActionEntry actions[] = {
-      { "TabNew" },
-      { "WindowNew" },
-      { "PrivateBrowsing" },
-      { NULL },
-      { "Find" },
-      { "Print" },
-      { "Fullscreen" },
-      { NULL },
-      { "p" },
-      { NULL },
-      { "BookmarksImport" },
-      { "BookmarksExport" },
-      { "ClearPrivateData" },
-      { "-" },
-      { NULL },
-      #ifndef HAVE_GRANITE
-      { "HelpFAQ" },
-      { "HelpBugs"},
-      #endif
-      { "About" },
-      { "Preferences" },
-    };
-
-    guint i;
-
-    for (i = 0; i < G_N_ELEMENTS (actions); i++)
-    {
-        GtkWidget* menuitem;
-        if (actions[i].name != NULL)
-        {
-            if (actions[i].name[0] == '-')
-            {
-                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));
-        }
-        else
-        {
-            menuitem = gtk_separator_menu_item_new ();
-            gtk_widget_show (menuitem);
-        }
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    }
+    MidoriContextAction* menu = midori_context_action_new ("CompactMenu", NULL, NULL, NULL);
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add_by_name (menu, "WindowNew");
+    midori_context_action_add_by_name (menu, "PrivateBrowsing");
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "Find");
+    midori_context_action_add_by_name (menu, "Print");
+    midori_context_action_add_by_name (menu, "Fullscreen");
+    midori_context_action_add_by_name (menu, "MailTo");
+    midori_context_action_add (menu, NULL);
+    gsize j = 0;
+    GtkWidget* widget;
+    while ((widget = midori_panel_get_nth_page (MIDORI_PANEL (browser->panel), j++)))
+        midori_context_action_add (menu, g_object_get_data (G_OBJECT (widget), "midori-panel-action"));
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "BookmarkAdd");
+    midori_context_action_add_by_name (menu, "BookmarksImport");
+    midori_context_action_add_by_name (menu, "BookmarksExport");
+    midori_context_action_add_by_name (menu, "ClearPrivateData");
+    g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, default_menu);
+    midori_context_action_add (menu, NULL);
+    #ifndef HAVE_GRANITE
+    midori_context_action_add_by_name (menu, "HelpFAQ");
+    midori_context_action_add_by_name (menu, "HelpBugs");
+    #endif
+    midori_context_action_add_by_name (menu, "Preferences");
+    midori_context_action_add_by_name (menu, "About");
+    midori_context_action_create_menu (menu, default_menu, FALSE);
 }
 
 static void
@@ -3274,7 +3451,14 @@ midori_browser_has_native_menubar (void)
     static const gchar* ubuntu_menuproxy = NULL;
     if (ubuntu_menuproxy == NULL)
         ubuntu_menuproxy = g_getenv ("UBUNTU_MENUPROXY");
-    return ubuntu_menuproxy && strstr (ubuntu_menuproxy, ".so") != NULL;
+    /*
+     * Values when the global menu is enabled
+     * UBUNTU_MENUPROXY=libappmenu.so
+     * UBUNTU_MENUPROXY=1
+     * The official way to disable the menu is
+     * UBUNTU_MENUPROXY=
+     */
+    return ubuntu_menuproxy && (strstr (ubuntu_menuproxy, ".so") || !strcmp (ubuntu_menuproxy, "1"));
 }
 
 static void
@@ -3449,15 +3633,23 @@ _action_view_encoding_activate (GtkAction*     action,
 }
 
 static void
-_action_source_view_activate (GtkAction*     action,
-                              MidoriBrowser* browser)
+_action_source_view (GtkAction*     action,
+                     MidoriBrowser* browser,
+                     gboolean       use_dom)
 {
-    GtkWidget* view;
+    GtkWidget* view = midori_browser_get_current_tab (browser);
+    #ifdef HAVE_WEBKIT2
+    /* TODO: midori_view_save_source isn't async and not WebKit2-friendly */
+    GtkWidget* source = midori_view_new_with_item (NULL, browser->settings);
+    GtkWidget* source_view = midori_view_get_web_view (MIDORI_VIEW (source));
+    midori_tab_set_view_source (MIDORI_TAB (source), TRUE);
+    webkit_web_view_load_uri (WEBKIT_WEB_VIEW (source_view), midori_tab_get_uri (MIDORI_TAB (view)));
+    midori_browser_add_tab (browser, source);
+    #else
     gchar* text_editor;
     gchar* filename = NULL;
 
-    view = midori_browser_get_current_tab (browser);
-    filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL);
+    filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, use_dom);
     g_object_get (browser->settings, "text-editor", &text_editor, NULL);
     if (!(text_editor && *text_editor))
     {
@@ -3480,8 +3672,24 @@ _action_source_view_activate (GtkAction*     action,
         g_free (filename);
     }
     g_free (text_editor);
+    #endif
+}
+
+static void
+_action_source_view_activate (GtkAction*     action,
+                              MidoriBrowser* browser)
+{
+    _action_source_view (action, browser, FALSE);
+}
+
+static void
+_action_source_view_dom_activate (GtkAction*     action,
+                                  MidoriBrowser* browser)
+{
+    _action_source_view (action, browser, TRUE);
 }
 
+
 static void
 _action_caret_browsing_activate (GtkAction*     action,
                                  MidoriBrowser* browser)
@@ -3551,13 +3759,7 @@ _action_fullscreen_activate (GtkAction*     action,
         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
+        midori_notebook_set_labels_visible (MIDORI_NOTEBOOK (browser->notebook), FALSE);
 
         gtk_window_fullscreen (GTK_WINDOW (browser));
     }
@@ -3673,8 +3875,9 @@ _action_navigation_activate (GtkAction*     action,
             WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
             const gchar* back_uri = webkit_web_history_item_get_uri (item);
             #endif
-            GtkWidget* view = midori_browser_add_uri (browser, back_uri);
-            midori_browser_set_current_tab_smartly (browser, view);
+
+            GtkWidget* new_view = midori_browser_add_uri (browser, back_uri);
+            midori_browser_set_current_tab_smartly (browser, new_view);
         }
         else
             midori_view_go_back (view);
@@ -3695,8 +3898,9 @@ _action_navigation_activate (GtkAction*     action,
             WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
             const gchar* forward_uri = webkit_web_history_item_get_uri (item);
             #endif
-            GtkWidget* view = midori_browser_add_uri (browser, forward_uri);
-            midori_browser_set_current_tab_smartly (browser, view);
+
+            GtkWidget* new_view = midori_browser_add_uri (browser, forward_uri);
+            midori_browser_set_current_tab_smartly (browser, new_view);
         }
         else
           midori_tab_go_forward (MIDORI_TAB (view));
@@ -3710,8 +3914,8 @@ _action_navigation_activate (GtkAction*     action,
 
         if (middle_click)
         {
-            GtkWidget* view = midori_browser_add_uri (browser, uri);
-            midori_browser_set_current_tab_smartly (browser, view);
+            GtkWidget* new_view = midori_browser_add_uri (browser, uri);
+            midori_browser_set_current_tab_smartly (browser, new_view);
         }
         else
             midori_view_set_uri (view, uri);
@@ -3726,8 +3930,8 @@ _action_navigation_activate (GtkAction*     action,
 
         if (middle_click)
         {
-            GtkWidget* view = midori_browser_add_uri (browser, uri);
-            midori_browser_set_current_tab_smartly (browser, view);
+            GtkWidget* new_view = midori_browser_add_uri (browser, uri);
+            midori_browser_set_current_tab_smartly (browser, new_view);
         }
         else
             midori_view_set_uri (view, uri);
@@ -3739,8 +3943,8 @@ _action_navigation_activate (GtkAction*     action,
     {
         if (middle_click)
         {
-            GtkWidget* view = midori_browser_add_uri (browser, "about:home");
-            midori_browser_set_current_tab_smartly (browser, view);
+            GtkWidget* new_view = midori_browser_add_uri (browser, "about:home");
+            midori_browser_set_current_tab_smartly (browser, new_view);
         }
         else
             midori_view_set_uri (view, "about:home");
@@ -3793,14 +3997,8 @@ _action_location_reset_uri (GtkAction*     action,
 }
 
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 3, 13)
 static void
-#if WEBKIT_CHECK_VERSION (1, 8, 0)
 midori_browser_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-#elif WEBKIT_CHECK_VERSION (1, 3, 13)
-midori_browser_item_icon_loaded_cb (WebKitIconDatabase*    database,
-                                    WebKitWebFrame*        web_frame,
-#endif
                                     const gchar*           frame_uri,
                                     KatzeItem*             item)
 {
@@ -3808,30 +4006,19 @@ midori_browser_item_icon_loaded_cb (WebKitIconDatabase*    database,
     if (strcmp (frame_uri, uri))
         return;
 
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     gchar* icon_uri = webkit_favicon_database_get_favicon_uri (
         webkit_get_favicon_database (), frame_uri);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    gchar* icon_uri = webkit_icon_database_get_icon_uri (
-        webkit_get_icon_database (), frame_uri);
-    #endif
     if (icon_uri != NULL)
     {
         g_free (icon_uri);
         katze_item_set_icon (item, frame_uri);
         /* This signal fires extremely often (WebKit bug?)
            we must throttle it (disconnect) once we have an icon */
-        #if WEBKIT_CHECK_VERSION (1, 8, 0)
         g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
             midori_browser_item_icon_loaded_cb, item);
-        #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-        g_signal_handlers_disconnect_by_func (webkit_get_icon_database (),
-            midori_browser_item_icon_loaded_cb, item);
-        #endif
     }
 }
 #endif
-#endif
 
 static void
 midori_browser_queue_item_for_icon (KatzeItem*     item,
@@ -3841,13 +4028,8 @@ midori_browser_queue_item_for_icon (KatzeItem*     item,
     if (katze_item_get_icon (item) != NULL)
         return;
     g_object_set_data_full (G_OBJECT (item), "browser-queue-icon", g_strdup (uri), g_free);
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
         G_CALLBACK (midori_browser_item_icon_loaded_cb), item);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_connect (webkit_get_icon_database (), "icon-loaded",
-        G_CALLBACK (midori_browser_item_icon_loaded_cb), item);
-    #endif
 #endif
 }
 
@@ -3858,7 +4040,6 @@ _action_location_submit_uri (GtkAction*     action,
                              MidoriBrowser* browser)
 {
     gchar* new_uri;
-    gint n;
 
     /* Switch to already open tab if possible */
     KatzeItem* found = katze_array_find_uri (browser->proxy_array, uri);
@@ -3948,6 +4129,20 @@ midori_browser_news_feed_clicked_cb (GtkWidget*     menuitem,
     midori_browser_subscribe_to_news_feed (browser, uri);
 }
 
+static void
+_action_paste_proceed_activate (GtkAction*     action,
+                                MidoriBrowser* browser)
+{
+    GtkClipboard* clipboard = gtk_clipboard_get_for_display (
+        gtk_widget_get_display (GTK_WIDGET (browser)),GDK_SELECTION_CLIPBOARD);
+    gchar* uri = gtk_clipboard_wait_for_text (clipboard);
+    if (uri != NULL)
+    {
+        _action_location_submit_uri (action, uri, FALSE, browser);
+        g_free (uri);
+    }
+}
+
 static gboolean
 _action_location_secondary_icon_released (GtkAction*     action,
                                           GtkWidget*     widget,
@@ -3958,16 +4153,7 @@ _action_location_secondary_icon_released (GtkAction*     action,
         const gchar* feed;
         /* Clicking icon on blank is equal to Paste and Proceed */
         if (midori_view_is_blank (MIDORI_VIEW (view)))
-        {
-            GtkClipboard* clipboard = gtk_clipboard_get_for_display (
-                gtk_widget_get_display (view), GDK_SELECTION_CLIPBOARD);
-            gchar* text = gtk_clipboard_wait_for_text (clipboard);
-            if (text != NULL)
-            {
-                _action_location_submit_uri (action, text, FALSE, browser);
-                g_free (text);
-            }
-        }
+            _action_paste_proceed_activate (action, browser);
         else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
         {
             const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget));
@@ -4120,34 +4306,6 @@ _action_search_focus_out (GtkAction*     action,
     }
 }
 
-static void
-midori_browser_bookmark_popup_item (GtkWidget*     menu,
-                                    const gchar*   stock_id,
-                                    const gchar*   label,
-                                    KatzeItem*     item,
-                                    gpointer       callback,
-                                    gpointer       userdata)
-{
-    const gchar* uri;
-    GtkWidget* menuitem;
-
-    uri = katze_item_get_uri (item);
-
-    menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
-    if (label)
-        gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child (
-        GTK_BIN (menuitem))), label);
-    if (!strcmp (stock_id, GTK_STOCK_EDIT))
-        gtk_widget_set_sensitive (menuitem,
-            KATZE_IS_ARRAY (item) || uri != NULL);
-    else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
-        gtk_widget_set_sensitive (menuitem, uri != NULL);
-    g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-}
-
 static void
 midori_browser_bookmark_open_activate_cb (GtkWidget*     menuitem,
                                           MidoriBrowser* browser)
@@ -4162,14 +4320,17 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget*     menuitem,
 {
     KatzeItem* item;
     const gchar* uri;
-    guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
     if (KATZE_IS_ARRAY (item))
     {
         KatzeItem* child;
+        KatzeArray* array;
+
+        array = midori_bookmarks_db_query_recursive (browser->bookmarks,
+            "*", "parentid = %q", katze_item_get_meta_string (item, "id"), FALSE);
 
-        KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (item))
+        KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (array))
         {
             if ((uri = katze_item_get_uri (child)) && *uri)
             {
@@ -4177,6 +4338,7 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget*     menuitem,
                 midori_browser_set_current_tab_smartly (browser, view);
             }
         }
+        g_object_unref (G_OBJECT (array));
     }
     else
     {
@@ -4220,7 +4382,7 @@ midori_browser_bookmark_delete_activate_cb (GtkWidget*     menuitem,
     KatzeItem* item;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    katze_array_remove_item (browser->bookmarks, item);
+    midori_bookmarks_db_remove_item (browser->bookmarks, item);
 }
 
 static void
@@ -4229,34 +4391,56 @@ midori_browser_bookmark_popup (GtkWidget*      widget,
                                KatzeItem*      item,
                                MidoriBrowser*  browser)
 {
-    GtkWidget* menu;
-    GtkWidget* menuitem;
+    MidoriContextAction* menu = midori_context_action_new ("BookmarkContextMenu", NULL, NULL, NULL);
+    if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        gint child_bookmarks_count = midori_bookmarks_db_count_recursive (browser->bookmarks,
+            "uri <> ''", NULL, item, FALSE);
 
-    menu = gtk_menu_new ();
-    if (!katze_item_get_uri (item))
-        midori_browser_bookmark_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
+        GtkAction* action = gtk_action_new ("BookmarkOpenAllTabs", _("Open all in _Tabs"), NULL, STOCK_TAB_NEW);
+        gtk_action_set_sensitive (action, child_bookmarks_count > 0);
+        g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (midori_browser_bookmark_open_in_tab_activate_cb), browser);
+        midori_context_action_add (menu, action);
+    }
     else
     {
-        midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
-            item, midori_browser_bookmark_open_activate_cb, browser);
-        midori_browser_bookmark_popup_item (menu,
-            STOCK_TAB_NEW, _("Open in New _Tab"),
-            item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
-        midori_browser_bookmark_popup_item (menu,
-            STOCK_WINDOW_NEW, _("Open in New _Window"),
-            item, midori_browser_bookmark_open_in_window_activate_cb, browser);
-    }
-    menuitem = gtk_separator_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    gtk_widget_show (menuitem);
-    midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL,
-        item, midori_browser_bookmark_edit_activate_cb, widget);
-    midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL,
-        item, midori_browser_bookmark_delete_activate_cb, browser);
-
-    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
+        GtkAction* action = gtk_action_new ("BookmarkOpen", NULL, NULL, GTK_STOCK_OPEN);
+        gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
+        g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (midori_browser_bookmark_open_activate_cb), browser);
+        midori_context_action_add (menu, action);
+        action = gtk_action_new ("BookmarkOpenTab", NULL, NULL, STOCK_TAB_NEW);
+        gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
+        g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (midori_browser_bookmark_open_in_tab_activate_cb), browser);
+        midori_context_action_add (menu, action);
+        action = gtk_action_new ("BookmarkOpenWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW);
+        gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
+        g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (midori_browser_bookmark_open_in_window_activate_cb), browser);
+        midori_context_action_add (menu, action);
+    }
+
+    midori_context_action_add (menu, NULL);
+    GtkAction* action = gtk_action_new ("BookmarkEdit", NULL, NULL, GTK_STOCK_EDIT);
+    gtk_action_set_sensitive (action, !KATZE_ITEM_IS_SEPARATOR (item));
+    g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+    g_signal_connect (action, "activate",
+        G_CALLBACK (midori_browser_bookmark_edit_activate_cb), browser);
+    midori_context_action_add (menu, action);
+    action = gtk_action_new ("BookmarkDelete", NULL, NULL, GTK_STOCK_DELETE);
+    g_object_set_data (G_OBJECT (action), "KatzeItem", item);
+    g_signal_connect (action, "activate",
+        G_CALLBACK (midori_browser_bookmark_delete_activate_cb), browser);
+    midori_context_action_add (menu, action);
+
+    GtkMenu* context_menu = midori_context_action_create_menu (menu, NULL, FALSE);
+    katze_widget_popup (widget, context_menu, event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static gboolean
@@ -4272,6 +4456,9 @@ midori_browser_menu_button_press_event_cb (GtkWidget*      toolitem,
        it is an item, we forward it to the actual widget. */
     if ((GTK_IS_BOX (toolitem) || GTK_IS_MENU_BAR (toolitem)))
     {
+        if (gtk_widget_get_window (toolitem) != event->window)
+            return FALSE;
+
         midori_browser_toolbar_popup_context_menu_cb (
             GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
                 gtk_widget_get_parent (toolitem) : toolitem,
@@ -4440,12 +4627,11 @@ _action_bookmarks_import_activate (GtkAction*     action,
         0, _("Import from XBEL or HTML file"), 1, NULL, 2, NULL, 3, icon_width, -1);
     gtk_combo_box_set_active (combobox, 0);
     gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
-    gtk_widget_show_all (hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
 
-    combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks,
-                                                         FALSE, 0, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), combobox_folder);
+    combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, 0);
+    gtk_box_pack_start (GTK_BOX (content_area), combobox_folder, FALSE, TRUE, 0);
+    gtk_widget_show_all (content_area);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
     if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
@@ -4454,7 +4640,6 @@ _action_bookmarks_import_activate (GtkAction*     action,
         gchar* path = NULL;
         gint64 selected;
         GError* error;
-        sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
 
         if (gtk_combo_box_get_active_iter (combobox, &iter))
             gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1);
@@ -4482,8 +4667,7 @@ _action_bookmarks_import_activate (GtkAction*     action,
             if (error)
                 g_error_free (error);
         }
-        midori_bookmarks_import_array_db (db, bookmarks, selected);
-        katze_array_update (browser->bookmarks);
+        midori_bookmarks_db_import_array (browser->bookmarks, bookmarks, selected);
         g_object_unref (bookmarks);
         g_free (path);
     }
@@ -4520,11 +4704,15 @@ wrong_format:
     if (midori_dialog_run (GTK_DIALOG (file_dialog)) == GTK_RESPONSE_OK)
         path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
     gtk_widget_destroy (file_dialog);
+
+    if (path == NULL)
+        return;
+
     if (g_str_has_suffix (path, ".xbel"))
         format = "xbel";
     else if (g_str_has_suffix (path, ".html"))
         format = "netscape";
-    else if (path != NULL)
+    else
     {
         sokoke_message_dialog (GTK_MESSAGE_ERROR,
             _("Midori can only export to XBEL (*.xbel) and Netscape (*.html)"),
@@ -4533,11 +4721,8 @@ wrong_format:
         goto wrong_format;
     }
 
-    if (path == NULL)
-        return;
-
     error = NULL;
-    bookmarks = midori_array_query_recursive (browser->bookmarks,
+    bookmarks = midori_bookmarks_db_query_recursive (browser->bookmarks,
         "*", "parentid IS NULL", NULL, TRUE);
     if (!midori_array_to_file (bookmarks, path, format, &error))
     {
@@ -4625,13 +4810,7 @@ _action_tab_move_activate (GtkAction*     action,
     else
         g_assert_not_reached ();
 
-    #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
+    midori_notebook_move (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (widget), new_pos);
     g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
 }
 
@@ -4682,7 +4861,9 @@ static void
 _action_tab_duplicate_activate (GtkAction*     action,
                                 MidoriBrowser* browser)
 {
-    GtkWidget* view = midori_browser_get_current_tab (browser);
+    GtkWidget* view = g_object_get_data (G_OBJECT (action), "tab");
+    if (view == NULL)
+        view = midori_browser_get_current_tab (browser);
     midori_view_duplicate (MIDORI_VIEW (view));
 }
 
@@ -4707,38 +4888,17 @@ static const gchar* credits_documenters[] =
 static const gchar* credits_artists[] =
     { "Nancy Runge <nancy@twotoasts.de>", NULL };
 
-#if !GTK_CHECK_VERSION (2, 24, 0)
-static void
-_action_about_activate_link (GtkAboutDialog* about,
-                             const gchar*    uri,
-                             gpointer        user_data)
-{
-    MidoriBrowser* browser = MIDORI_BROWSER (user_data);
-    GtkWidget* view = midori_browser_add_uri (browser, uri);
-    midori_browser_set_current_tab (browser, view);
-}
-
-static void
-_action_about_activate_email (GtkAboutDialog* about,
-                              const gchar*    uri,
-                              gpointer        user_data)
-{
-    /* Some email clients need the 'mailto' to function properly */
-    gchar* newuri = NULL;
-    if (!g_str_has_prefix (uri, "mailto:"))
-        newuri = g_strconcat ("mailto:", uri, NULL);
-
-    sokoke_show_uri (NULL, newuri ? newuri : uri, GDK_CURRENT_TIME, NULL);
-    g_free (newuri);
-}
-#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);
-    gboolean found = (g_access (path, F_OK) == 0);
+    gchar* uri = g_filename_to_uri (path, NULL, NULL);
+    g_free (path);
+    return uri;
+    #else
+    gchar* path = midori_paths_get_res_filename ("faq.html");
+    gboolean found = g_access (path, F_OK) == 0;
     if (found)
     {
         gchar* uri = g_filename_to_uri (path, NULL, NULL);
@@ -4746,11 +4906,8 @@ midori_browser_get_docs (gboolean error)
         return uri;
     }
     g_free (path);
-    #else
-    if (g_access (DOCDIR "/faq.html", F_OK) == 0)
-        return g_strdup ("file://" DOCDIR "/faq.html");
+    return g_strdup ("file://" DOCDIR "/faq.html");
     #endif
-    return error ? g_strdup ("about:nodocs") : NULL;
 }
 
 static void
@@ -4766,10 +4923,6 @@ _action_about_activate (GtkAction*     action,
     "License as published by the Free Software Foundation; either "
     "version 2.1 of the License, or (at your option) any later version.");
 
-#if !GTK_CHECK_VERSION (2, 24, 0)
-    gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
-    gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
-#endif
 #ifdef HAVE_GRANITE
     gchar* docs = midori_browser_get_docs (FALSE);
     /* Avoid granite_widgets_show_about_dialog for invalid memory and crashes */
@@ -4779,12 +4932,12 @@ _action_about_activate (GtkAction*     action,
         "translate", "https://translations.xfce.org/projects/p/midori/",
         "bug", PACKAGE_BUGREPORT,
         "help", docs,
-        "copyright", "2007-2012 Christian Dywan",
+        "copyright", "2007-2015 Christian Dywan",
 #else
     GtkWidget* dialog = gtk_about_dialog_new ();
     g_object_set (dialog,
         "wrap-license", TRUE,
-        "copyright", "Copyright © 2007-2012 Christian Dywan",
+        "copyright", "Copyright © 2007-2015 Christian Dywan",
 #endif
         "transient-for", browser,
         "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)),
@@ -4946,10 +5099,10 @@ midori_panel_close_cb (MidoriPanel*   panel,
 }
 
 static void
-midori_browser_switched_tab (MidoriBrowser* browser,
-                             GtkWidget*     old_widget,
-                             MidoriView*    new_view,
-                             gint           new_page)
+midori_browser_switched_tab_cb (MidoriNotebook* notebook,
+                                GtkWidget*      old_widget,
+                                MidoriView*     new_view,
+                                MidoriBrowser*  browser)
 {
     GtkAction* action;
     const gchar* text;
@@ -4963,13 +5116,8 @@ midori_browser_switched_tab (MidoriBrowser* browser,
                                 g_strdup (text), g_free);
     }
 
-    if (new_view == NULL)
-    {
-        g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view);
-        return;
-    }
-
     g_return_if_fail (MIDORI_IS_VIEW (new_view));
+    g_return_if_fail (new_view != MIDORI_VIEW (old_widget));
 
     uri = g_object_get_data (G_OBJECT (new_view), "midori-browser-typed-text");
     if (!uri)
@@ -4977,259 +5125,95 @@ midori_browser_switched_tab (MidoriBrowser* browser,
     midori_browser_set_title (browser, midori_view_get_display_title (new_view));
     action = _action_by_name (browser, "Location");
     midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
-    if (midori_paths_is_readonly () /* APP, PRIVATE */)
+    if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
         gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (new_view));
 
-    if (browser->proxy_array)
-        katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", new_page);
-    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);
-}
-
-static void
-midori_browser_notebook_page_reordered_cb (GtkWidget*     notebook,
-                                           MidoriView*    view,
-                                           guint          page_num,
-                                           MidoriBrowser* browser)
-{
-    KatzeItem* item = midori_view_get_proxy_item (view);
-    katze_array_move_item (browser->proxy_array, item, page_num);
-    g_object_notify (G_OBJECT (browser), "tab");
-}
-
-static GtkWidget*
-midori_browser_notebook_create_window_cb (GtkWidget*     notebook,
-                                          GtkWidget*     view,
-                                          gint           x,
-                                          gint           y,
-                                          MidoriBrowser* browser)
-{
-    MidoriBrowser* new_browser;
-    g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
-    if (new_browser)
-    {
-        GtkWidget* new_notebook = new_browser->notebook;
-        gtk_window_move (GTK_WINDOW (new_browser), x, y);
-        return new_notebook;
-    }
-    else /* No MidoriApp, so this is app or private mode */
-        return NULL;
-}
-
-#ifdef HAVE_GRANITE
-static void
-midori_browser_notebook_tab_added_cb (GtkWidget*         notebook,
-                                      GraniteWidgetsTab* tab,
-                                      MidoriBrowser*     browser)
-{
-    gint n = granite_widgets_dynamic_notebook_get_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab);
-    midori_browser_set_current_page (browser, n);
-    GtkWidget* view = midori_view_new_with_item (NULL, browser->settings);
-    midori_view_set_tab (MIDORI_VIEW (view), tab);
-    midori_browser_connect_tab (browser, view);
-    midori_view_set_uri (MIDORI_VIEW (view), "about:new");
-    /* FIXME: signal add-tab */
-    _midori_browser_update_actions (browser);
-    midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
-        MIDORI_VIEW (view), n, browser);
-}
-
-static gboolean
-midori_browser_notebook_tab_removed_cb (GtkWidget*         notebook,
-                                        GraniteWidgetsTab* tab,
-                                        MidoriBrowser*     browser)
-{
-    MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab));
-    if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
-        midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
-
-    GraniteWidgetsTab* new_tab = granite_widgets_dynamic_notebook_get_current (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook));
-    gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), new_tab);
-    midori_browser_switched_tab (browser, granite_widgets_tab_get_page (tab),
-        MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos);
-    return TRUE;
-}
-
-static void
-midori_browser_move_tab_to_notebook (MidoriBrowser*     browser,
-                                     GtkWidget*         view,
-                                     GraniteWidgetsTab* tab,
-                                     GtkWidget*         new_notebook)
-{
-    g_object_ref (tab);
-    _midori_browser_remove_tab (browser, view);
-    granite_widgets_dynamic_notebook_insert_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (new_notebook), tab, 0);
-    midori_browser_connect_tab (midori_browser_get_for_widget (new_notebook), view);
-    g_object_unref (tab);
-}
-
-static void
-midori_browser_notebook_tab_switched_cb (GraniteWidgetsDynamicNotebook* notebook,
-                                         GraniteWidgetsTab* old_tab,
-                                         GraniteWidgetsTab* new_tab,
-                                         MidoriBrowser*     browser)
-{
-    if (old_tab && granite_widgets_dynamic_notebook_get_tab_position (notebook, old_tab) == -1)
-        return;
-
-    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)
-            midori_browser_move_tab_to_notebook (browser, view, tab, notebook);
-    }
-    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);
-    }
-}
-
-static void
-midori_browser_notebook_tab_duplicated_cb (GtkWidget*         notebook,
-                                           GraniteWidgetsTab* tab,
-                                           MidoriBrowser*     browser)
-{
-    GtkWidget* view = granite_widgets_tab_get_page (tab);
-    midori_view_duplicate (MIDORI_VIEW (view));
+    _midori_browser_update_interface (browser, new_view);
+    _midori_browser_update_progress (browser, new_view);
 }
 
-#else
 static void
-midori_browser_notebook_page_added_cb (GtkNotebook*   notebook,
-                                       GtkWidget*     child,
-                                       guint          page_num,
-                                       MidoriBrowser* browser)
+midori_browser_notify_tab_cb (GtkWidget*     notebook,
+                              GParamSpec*    pspec,
+                              MidoriBrowser* browser)
 {
-    if (!midori_browser_tab_connected (browser, MIDORI_VIEW (child)))
-        midori_browser_connect_tab (browser, child);
-    midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
-        MIDORI_VIEW (child), page_num, browser);
+    g_object_freeze_notify (G_OBJECT (browser));
+    g_object_notify (G_OBJECT (browser), "uri");
+    g_object_notify (G_OBJECT (browser), "title");
+    g_object_notify (G_OBJECT (browser), "tab");
+    g_object_thaw_notify (G_OBJECT (browser));
 }
 
 static void
-midori_browser_notebook_switch_page_cb (GtkWidget*       notebook,
-                                        gpointer         page,
-                                        guint            page_num,
-                                        MidoriBrowser*   browser)
+midori_browser_tab_moved_cb (GtkWidget*     notebook,
+                             MidoriView*    view,
+                             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);
+    KatzeItem* item = midori_view_get_proxy_item (view);
+    katze_array_move_item (browser->proxy_array, item, page_num);
 }
 
 static void
-midori_browser_notebook_page_removed_cb (GtkWidget*     notebook,
-                                         GtkWidget*     view,
-                                         guint          page_num,
-                                         MidoriBrowser* browser)
+midori_browser_notebook_create_window_cb (GtkWidget*     notebook,
+                                          GtkWidget*     view,
+                                          gint           x,
+                                          gint           y,
+                                          MidoriBrowser* browser)
 {
-    if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
+    MidoriBrowser* new_browser;
+    g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
+    if (new_browser)
+    {
+        gtk_window_move (GTK_WINDOW (new_browser), x, y);
+        g_object_ref (view);
         midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
-    midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
+        midori_notebook_remove (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
+        midori_browser_add_tab (new_browser, view);
+        g_object_unref (view);
+    }
 }
 
-static gboolean
-midori_browser_notebook_reorder_tab_cb (GtkNotebook*     notebook,
-                                        GtkDirectionType arg1,
-                                        gboolean         arg2,
-                                        gpointer         user_data)
+static void
+midori_browser_notebook_new_tab_cb (GtkWidget*     notebook,
+                                    MidoriBrowser* browser)
 {
-    g_signal_stop_emission_by_name (notebook, "reorder-tab");
-    return TRUE;
+    GtkWidget* view = midori_browser_add_uri (browser, "about:new");
+    midori_browser_set_current_tab (browser, view);
 }
 
 static void
-midori_browser_menu_item_switch_tab_cb (GtkWidget*     menuitem,
-                                        MidoriBrowser* browser)
+midori_browser_notebook_context_menu_cb (MidoriNotebook*      notebook,
+                                         MidoriContextAction* menu,
+                                         MidoriBrowser*       browser)
 {
-    gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index"));
-    midori_browser_set_current_page (browser, page);
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "TabNew");
+    midori_context_action_add_by_name (menu, "UndoTabClose");
 }
 
-static gboolean
-midori_browser_notebook_button_press_event_after_cb (GtkNotebook*    notebook,
-                                                     GdkEventButton* event,
-                                                     MidoriBrowser*  browser)
+static void
+midori_browser_notebook_tab_context_menu_cb (MidoriNotebook*      notebook,
+                                             MidoriTab*           tab,
+                                             MidoriContextAction* menu,
+                                             MidoriBrowser*       browser)
 {
-#if !GTK_CHECK_VERSION(3,0,0) /* TODO */
-    if (event->window != notebook->event_window)
-        return FALSE;
-#endif
-
-    /* FIXME: Handle double click only when it wasn't handled by GtkNotebook */
-
-    /* Open a new tab on double click or middle mouse click */
-    if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1)
-    || */(event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_NEW_TAB (event)))
-    {
-        GtkWidget* view = midori_browser_add_uri (browser, "about:new");
-        midori_browser_set_current_tab (browser, view);
-
-        return TRUE;
-    }
-    else if (event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_CONTEXT_MENU (event))
+    midori_context_action_add_action_group (menu, browser->action_group);
+    midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "TabNew");
+    midori_context_action_add_by_name (menu, "UndoTabClose");
+    if (MIDORI_IS_VIEW (tab))
     {
-        GtkWidget* menu = gtk_menu_new ();
-        GList* tabs = midori_browser_get_tabs (browser);
-        GtkWidget* menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (browser->action_group, "TabNew"));
-        gint i = 0;
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (browser->action_group, "UndoTabClose"));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        menuitem = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        for (; tabs != NULL; tabs = g_list_next (tabs))
-        {
-            const gchar* title = midori_view_get_display_title (tabs->data);
-            menuitem = katze_image_menu_item_new_ellipsized (title);
-            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
-                gtk_image_new_from_pixbuf (midori_view_get_icon (tabs->data)));
-            gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-            g_object_set_data (G_OBJECT (menuitem), "index", GINT_TO_POINTER (i));
-            g_signal_connect (menuitem, "activate",
-                G_CALLBACK (midori_browser_menu_item_switch_tab_cb), browser);
-            i++;
-        }
-        g_list_free (tabs);
-        gtk_widget_show_all (menu);
-        katze_widget_popup (GTK_WIDGET (notebook), GTK_MENU (menu), NULL,
-            KATZE_MENU_POSITION_CURSOR);
+        GtkAction* action = gtk_action_new ("TabDuplicate", _("_Duplicate Current Tab"), NULL, NULL);
+        g_object_set_data (G_OBJECT (action), "tab", tab);
+        g_signal_connect (action, "activate",
+            G_CALLBACK (_action_tab_duplicate_activate), browser);
+        midori_context_action_add (menu, action);
     }
-
-    return FALSE;
 }
-#endif
 
 static void
 _action_undo_tab_close_activate (GtkAction*     action,
@@ -5289,15 +5273,12 @@ static const GtkActionEntry entries[] =
     { "WindowClose", NULL,
         N_("C_lose Window"), "<Ctrl><Shift>w",
         NULL, G_CALLBACK (_action_window_close_activate) },
-    #if 0 // def HAVE_GRANITE
-    { "Print", "document-export",
-        N_("_Share"), "<Ctrl>p",
-        N_("Share this page"), G_CALLBACK (_action_print_activate) },
-    #else
     { "Print", GTK_STOCK_PRINT,
         NULL, "<Ctrl>p",
         N_("Print the current page"), G_CALLBACK (_action_print_activate) },
-    #endif
+    { "MailTo", NULL,
+        N_("Send Page Link Via Email"), "<Ctrl>m",
+        NULL, G_CALLBACK (_action_mail_to_activate) },
     { "Quit", GTK_STOCK_QUIT,
         N_("Close a_ll Windows"), "<Ctrl><Shift>q",
         NULL, G_CALLBACK (_action_quit_activate) },
@@ -5318,6 +5299,10 @@ static const GtkActionEntry entries[] =
     { "Paste", GTK_STOCK_PASTE,
         NULL, "<Ctrl>v",
         NULL, G_CALLBACK (_action_paste_activate) },
+    { "PasteProceed", NULL,
+    /* i18n: Right-click on Location, Open an URL from the clipboard */
+        N_("Paste and p_roceed"), "<Ctrl><Shift>v",
+        NULL, G_CALLBACK (_action_paste_proceed_activate) },
     { "Delete", GTK_STOCK_DELETE,
         NULL, NULL,
         NULL, G_CALLBACK (_action_delete_activate) },
@@ -5364,6 +5349,9 @@ static const GtkActionEntry entries[] =
     { "SourceView", NULL,
         N_("View So_urce"), "<Ctrl><Alt>U",
         NULL, G_CALLBACK (_action_source_view_activate) },
+    { "SourceViewDom", NULL,
+        N_("View _DOM Source"), "<Ctrl><Alt><Shift>U",
+        NULL, G_CALLBACK (_action_source_view_dom_activate) },
     { "CaretBrowsing", NULL,
         N_("Ca_ret Browsing"), "F7",
         NULL, G_CALLBACK (_action_caret_browsing_activate) },
@@ -5402,8 +5390,8 @@ static const GtkActionEntry entries[] =
         /* 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) },
+        N_("Next or Forward"), "",
+        N_("Go to the next sub-page or next page in history"), G_CALLBACK (_action_navigation_activate) },
     { "Homepage", GTK_STOCK_HOME,
         N_("_Homepage"), "<Alt>Home",
         N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },
@@ -5421,16 +5409,16 @@ static const GtkActionEntry entries[] =
         N_("Add a new _folder"), "",
         NULL, G_CALLBACK (_action_bookmark_add_activate) },
     { "BookmarksImport", NULL,
-        N_("_Import bookmarks"), "",
+        N_("_Import bookmarks"), "",
         NULL, G_CALLBACK (_action_bookmarks_import_activate) },
     { "BookmarksExport", NULL,
-        N_("_Export bookmarks"), "",
+        N_("_Export bookmarks"), "",
         NULL, G_CALLBACK (_action_bookmarks_export_activate) },
     { "ManageSearchEngines", GTK_STOCK_PROPERTIES,
-        N_("_Manage Search Engines"), "<Ctrl><Alt>s",
+        N_("_Manage Search Engines"), "<Ctrl><Alt>s",
         NULL, G_CALLBACK (_action_manage_search_engines_activate) },
     { "ClearPrivateData", NULL,
-        N_("_Clear Private Data"), "<Ctrl><Shift>Delete",
+        N_("_Clear Private Data"), "<Ctrl><Shift>Delete",
         NULL, G_CALLBACK (_action_clear_private_data_activate) },
     { "InspectPage", NULL,
         N_("_Inspect Page"), "<Ctrl><Shift>i",
@@ -5506,7 +5494,6 @@ static const GtkToggleActionEntry toggle_entries[] =
         NULL, G_CALLBACK (_action_statusbar_activate),
         FALSE },
 };
-static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);
 
 static const GtkRadioActionEntry encoding_entries[] =
 {
@@ -5539,7 +5526,6 @@ static const GtkRadioActionEntry encoding_entries[] =
         N_("Custom…"), "",
         NULL, 1 },
 };
-static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
 
 typedef struct {
      MidoriBrowser* browser;
@@ -5575,7 +5561,6 @@ midori_inactivity_timeout (gpointer data)
         XScreenSaverQueryInfo (xdisplay, RootWindow (xdisplay, 0), mit_info);
         if (mit_info->idle / 1000 > mit->timeout)
         {
-            GtkWidget* view;
             midori_private_data_clear_all (mit->browser);
             midori_browser_activate_action (mit->browser, "Homepage");
         }
@@ -5601,7 +5586,7 @@ midori_browser_set_inactivity_reset (MidoriBrowser* browser,
     }
 }
 
-static void
+static gboolean
 midori_browser_window_state_event_cb (MidoriBrowser*       browser,
                                       GdkEventWindowState* event)
 {
@@ -5613,6 +5598,8 @@ 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);
+
+    return FALSE;
 }
 
 static gboolean
@@ -5669,6 +5656,7 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser,
 static void
 midori_browser_destroy_cb (MidoriBrowser* browser)
 {
+
     g_object_set_data (G_OBJECT (browser), "midori-browser-destroyed", (void*)1);
 
     if (G_UNLIKELY (browser->panel_timeout))
@@ -5678,14 +5666,6 @@ midori_browser_destroy_cb (MidoriBrowser* browser)
 
     /* Destroy panel first, so panels don't need special care */
     gtk_widget_destroy (browser->panel);
-    #ifndef HAVE_GRANITE
-    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);
@@ -5707,9 +5687,8 @@ static const gchar* ui_markup =
                 "<menuitem action='TabClose'/>"
                 "<menuitem action='WindowClose'/>"
                 "<separator/>"
+                "<menuitem action='MailTo'/>"
                 "<menuitem action='Print'/>"
-                "<menuitem action='BookmarksImport'/>"
-                "<menuitem action='BookmarksExport'/>"
                 "<separator/>"
                 "<menuitem action='Quit'/>"
             "</menu>"
@@ -5720,6 +5699,7 @@ static const gchar* ui_markup =
                 "<menuitem action='Cut'/>"
                 "<menuitem action='Copy'/>"
                 "<menuitem action='Paste'/>"
+                "<menuitem action='PasteProceed'/>"
                 "<menuitem action='Delete'/>"
                 "<separator/>"
                 "<menuitem action='SelectAll'/>"
@@ -5759,6 +5739,7 @@ static const gchar* ui_markup =
                     "<menuitem action='EncodingCustom'/>"
                 "</menu>"
                 "<menuitem action='SourceView'/>"
+                "<menuitem action='SourceViewDom'/>"
                 "<menuitem action='Fullscreen'/>"
                 "<menuitem action='Readable'/>"
             "</menu>"
@@ -5772,7 +5753,11 @@ static const gchar* ui_markup =
                 "<menuitem action='Search'/>"
                 "<menuitem action='Trash'/>"
             "</menu>"
-            "<menuitem action='Bookmarks'/>"
+            "<menu action='Bookmarks'>"
+                "<menuitem action='BookmarkAdd'/>"
+                "<menuitem action='BookmarksImport'/>"
+                "<menuitem action='BookmarksExport'/>"
+            "</menu>"
             "<menuitem action='Tools'/>"
             "<menuitem action='Window'/>"
             "<menu action='Help'>"
@@ -5833,46 +5818,6 @@ midori_browser_realize_cb (GtkStyle*      style,
     }
 }
 
-static void
-midori_browser_new_history_item (MidoriBrowser* browser,
-                                 KatzeItem*     item)
-{
-    time_t now;
-    gint64 day;
-    sqlite3* db;
-    static sqlite3_stmt* stmt = NULL;
-
-    g_return_if_fail (katze_item_get_uri (item) != NULL);
-
-    now = time (NULL);
-    katze_item_set_added (item, now);
-    day = sokoke_time_t_to_julian (&now);
-
-    db = g_object_get_data (G_OBJECT (browser->history), "db");
-    g_return_if_fail (db != NULL);
-    if (!stmt)
-    {
-        const gchar* sqlcmd;
-
-        sqlcmd = "INSERT INTO history (uri, title, date, day) VALUES (?,?,?,?)";
-        sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
-    }
-    sqlite3_bind_text (stmt, 1, katze_item_get_uri (item), -1, 0);
-    sqlite3_bind_text (stmt, 2, katze_item_get_name (item), -1, 0);
-    sqlite3_bind_int64 (stmt, 3, katze_item_get_added (item));
-    sqlite3_bind_int64 (stmt, 4, day);
-
-    if (sqlite3_step (stmt) != SQLITE_DONE)
-        g_printerr (_("Failed to insert new history item: %s\n"),
-                    sqlite3_errmsg (db));
-    sqlite3_reset (stmt);
-    sqlite3_clear_bindings (stmt);
-
-    /* FIXME: Workaround for the lack of a database interface */
-    katze_array_add_item (browser->history, item);
-    katze_array_remove_item (browser->history, item);
-}
-
 static void
 midori_browser_set_history (MidoriBrowser* browser,
                             KatzeArray*    history)
@@ -5883,10 +5828,20 @@ midori_browser_set_history (MidoriBrowser* browser,
     if (history)
         g_object_ref (history);
     katze_object_assign (browser->history, history);
+    katze_object_assign (browser->history_database, NULL);
 
     if (!history)
         return;
 
+    GError* error = NULL;
+    browser->history_database = midori_history_database_new (NULL, &error);
+    if (error != NULL)
+    {
+        g_printerr (_("Failed to initialize history: %s"), error->message);
+        g_printerr ("\n");
+        g_error_free (error);
+        return;
+    }
     g_object_set (_action_by_name (browser, "Location"), "history",
                   browser->history, NULL);
 }
@@ -5963,6 +5918,21 @@ midori_browser_add_actions (MidoriBrowser* browser)
     }
 }
 
+static gboolean
+midori_browser_idle (gpointer data)
+{
+    MidoriBrowser* browser = MIDORI_BROWSER (data);
+
+    if (browser->bookmarkbar_populate)
+    {
+        midori_bookmarkbar_populate_idle (browser);
+
+        browser->bookmarkbar_populate = FALSE;
+    }
+
+    return FALSE;
+}
+
 static void
 midori_browser_init (MidoriBrowser* browser)
 {
@@ -5986,6 +5956,8 @@ midori_browser_init (MidoriBrowser* browser)
     browser->settings = midori_web_settings_new ();
     browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY);
     browser->bookmarks = NULL;
+    browser->history = NULL;
+    browser->history_database = NULL;
     browser->trash = NULL;
     browser->search_engines = NULL;
     browser->dial = NULL;
@@ -6002,8 +5974,10 @@ midori_browser_init (MidoriBrowser* browser)
     gtk_window_set_role (GTK_WINDOW (browser), "browser");
     gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER);
     #if GTK_CHECK_VERSION (3, 4, 0)
+    #ifndef HAVE_GRANITE
     gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
     #endif
+    #endif
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (browser), vbox);
     gtk_widget_show (vbox);
@@ -6051,6 +6025,7 @@ midori_browser_init (MidoriBrowser* browser)
         "label", _("_Location…"),
         "stock-id", GTK_STOCK_JUMP_TO,
         "tooltip", _("Open a particular location"),
+        "placeholder-text", _("Search or enter an address"),
         NULL);
     g_object_connect (action,
                       "signal::activate",
@@ -6106,8 +6081,10 @@ midori_browser_init (MidoriBrowser* browser)
     g_object_connect (action,
                       "signal::populate-popup",
                       _action_trash_populate_popup, browser,
-                      "signal::activate-item-alt",
-                      _action_trash_activate_item_alt, browser,
+                      "signal::activate-item",
+                      _action_trash_activate_item, browser,
+                      "signal::activate-item-new-tab",
+                      _action_trash_activate_item_new_tab, browser,
                       NULL);
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);
@@ -6126,6 +6103,10 @@ midori_browser_init (MidoriBrowser* browser)
                       _action_bookmarks_populate_folder, browser,
                       "signal::activate-item-alt",
                       midori_bookmarkbar_activate_item_alt, browser,
+                      "signal::activate-item",
+                      midori_bookmarkbar_activate_item, browser,
+                      "signal::activate-item-new-tab",
+                      midori_bookmarkbar_activate_item_new_tab, browser,
                       NULL);
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);
@@ -6142,8 +6123,6 @@ midori_browser_init (MidoriBrowser* browser)
     g_object_connect (action,
                       "signal::populate-popup",
                       _action_tools_populate_popup, browser,
-                      "signal::activate-item-alt",
-                      midori_bookmarkbar_activate_item_alt, browser,
                       NULL);
     gtk_action_group_add_action (browser->action_group, action);
     g_object_unref (action);
@@ -6159,8 +6138,11 @@ midori_browser_init (MidoriBrowser* browser)
     g_object_connect (action,
                       "signal::populate-popup",
                       _action_window_populate_popup, browser,
-                      "signal::activate-item-alt",
-                      _action_window_activate_item_alt, browser,
+                      "signal::activate-item",
+                      _action_window_activate_item, browser,
+                      /* middle-clicks on tab menu entries behave like left-clicks */
+                      "signal::activate-item-new-tab",
+                      _action_window_activate_item, browser,
                       NULL);
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);
@@ -6189,10 +6171,17 @@ midori_browser_init (MidoriBrowser* browser)
 
     menuitem = gtk_menu_item_new ();
     gtk_widget_show (menuitem);
-    browser->throbber = katze_throbber_new ();
-    gtk_widget_show (browser->throbber);
-    gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber);
-    gtk_widget_set_sensitive (menuitem, FALSE);
+    browser->throbber = gtk_spinner_new ();
+    /* Wrap the spinner in an event box to retain its size when hidden */
+    GtkWidget* throbber_box = gtk_event_box_new ();
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX (throbber_box), FALSE);
+    gint icon_size = 16;
+    gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (browser)),
+                                       GTK_ICON_SIZE_MENU, &icon_size, NULL);
+    gtk_widget_set_size_request (throbber_box, icon_size, icon_size);
+    gtk_container_add (GTK_CONTAINER (throbber_box), browser->throbber);
+    gtk_widget_show (throbber_box);
+    gtk_container_add (GTK_CONTAINER (menuitem), throbber_box);
     #if GTK_CHECK_VERSION (3, 2, 0)
     /* FIXME: Doesn't work */
     gtk_widget_set_hexpand (menuitem, TRUE);
@@ -6291,78 +6280,26 @@ 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);
-    granite_widgets_dynamic_notebook_set_allow_duplication (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), TRUE);
-    /* FIXME: work-around a bug */
-    gtk_widget_show_all (browser->notebook);
-    granite_widgets_dynamic_notebook_set_group_name (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), PACKAGE_NAME);
-    #else
-    browser->notebook = gtk_notebook_new ();
-    gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_notebook_set_group_name (GTK_NOTEBOOK (browser->notebook), PACKAGE_NAME);
-    #else
-    gtk_notebook_set_group_id (GTK_NOTEBOOK (browser->notebook), GPOINTER_TO_INT (PACKAGE_NAME));
-    #endif
-    #endif
+    browser->notebook = midori_notebook_new ();
 
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    {
-    /* Remove the inner border between scrollbars and the window border */
-    GtkRcStyle* rcstyle = gtk_rc_style_new ();
-    rcstyle->xthickness = 0;
-    gtk_widget_modify_style (browser->notebook, rcstyle);
-    g_object_unref (rcstyle);
-    }
-    #endif
     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),
+                      G_CALLBACK (midori_browser_switched_tab_cb),
                       browser);
+    g_signal_connect (browser->notebook, "notify::tab",
+                      G_CALLBACK (midori_browser_notify_tab_cb), browser);
     g_signal_connect (browser->notebook, "tab-moved",
-                      G_CALLBACK (midori_browser_notebook_tab_moved_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "tab-duplicated",
-                      G_CALLBACK (midori_browser_notebook_tab_duplicated_cb),
-                      browser);
-    #else
-    g_signal_connect (browser->notebook, "switch-page",
-                      G_CALLBACK (midori_browser_notebook_switch_page_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-reordered",
-                      G_CALLBACK (midori_browser_notebook_page_reordered_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-added",
-                      G_CALLBACK (midori_browser_notebook_page_added_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "page-removed",
-                      G_CALLBACK (midori_browser_notebook_page_removed_cb),
+                      G_CALLBACK (midori_browser_tab_moved_cb),
                       browser);
-    g_signal_connect (browser->notebook, "size-allocate",
-                      G_CALLBACK (midori_browser_notebook_size_allocate_cb),
+    g_signal_connect (browser->notebook, "context-menu",
+        G_CALLBACK (midori_browser_notebook_context_menu_cb),
                       browser);
-    g_signal_connect_after (browser->notebook, "button-press-event",
-        G_CALLBACK (midori_browser_notebook_button_press_event_after_cb),
-                      browser);
-    g_signal_connect (browser->notebook, "reorder-tab",
-                      G_CALLBACK (midori_browser_notebook_reorder_tab_cb), NULL);
-    g_signal_connect (browser->notebook, "create-window",
+    g_signal_connect (browser->notebook, "tab-context-menu",
+        G_CALLBACK (midori_browser_notebook_tab_context_menu_cb), browser);
+    g_signal_connect (browser->notebook, "tab-detached",
                       G_CALLBACK (midori_browser_notebook_create_window_cb), browser);
-    #endif
+    g_signal_connect (browser->notebook, "new-tab",
+                      G_CALLBACK (midori_browser_notebook_new_tab_cb), browser);
     gtk_widget_show (browser->notebook);
 
     /* Inspector container */
@@ -6384,29 +6321,8 @@ midori_browser_init (MidoriBrowser* browser)
 
     /* Statusbar */
     browser->statusbar = gtk_statusbar_new ();
-    #if GTK_CHECK_VERSION (2, 20, 0)
     browser->statusbar_contents =
         gtk_statusbar_get_message_area (GTK_STATUSBAR (browser->statusbar));
-    #else
-    /* Rearrange the statusbar packing. This is necessariy to keep
-        themes happy while there is no support from GtkStatusbar. */
-    forward = GTK_STATUSBAR (browser->statusbar)->label;
-    if (GTK_IS_BOX (gtk_widget_get_parent (forward)))
-        browser->statusbar_contents = gtk_widget_get_parent (forward);
-    else
-    {
-        browser->statusbar_contents = gtk_hbox_new (FALSE, 4);
-        gtk_widget_show (browser->statusbar_contents);
-        g_object_ref (GTK_STATUSBAR (browser->statusbar)->label);
-        gtk_container_remove (
-            GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), forward);
-        gtk_box_pack_start (GTK_BOX (browser->statusbar_contents),
-            forward, TRUE, TRUE, 0);
-        g_object_unref (forward);
-        gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame),
-                           browser->statusbar_contents);
-    }
-    #endif
     gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0);
 
     g_signal_connect (browser->statusbar, "button-press-event",
@@ -6426,6 +6342,7 @@ midori_browser_dispose (GObject* object)
                                           midori_browser_settings_notify,
                                           browser);
     midori_browser_set_bookmarks (browser, NULL);
+    midori_browser_set_history (browser, NULL);
 
     G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object);
 }
@@ -6441,8 +6358,11 @@ midori_browser_finalize (GObject* object)
     katze_object_assign (browser->trash, NULL);
     katze_object_assign (browser->search_engines, NULL);
     katze_object_assign (browser->history, NULL);
+    katze_object_assign (browser->history_database, NULL);
     katze_object_assign (browser->dial, NULL);
 
+    g_idle_remove_by_data (browser);
+
     G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object);
 }
 
@@ -6483,6 +6403,7 @@ _midori_browser_set_toolbar_style (MidoriBrowser*     browser,
                                     gtk_toolbar_style);
 }
 
+#ifndef HAVE_WEBKIT2
 static void
 midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item,
                                                       MidoriBrowser* browser)
@@ -6491,6 +6412,7 @@ midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item,
     MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
     midori_view_go_back_or_forward (view, steps);
 }
+#endif
 
 static void
 midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser,
@@ -6563,6 +6485,12 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget*      toolitem,
 {
     if (MIDORI_EVENT_NEW_TAB (event))
     {
+        /* check if the middle-click was performed over reload button */
+        if (g_object_get_data (G_OBJECT (toolitem), "reload-middle-click"))
+        {
+            gtk_action_activate (_action_by_name (browser, "TabDuplicate"));
+        }
+
         GtkWidget* parent = gtk_widget_get_parent (toolitem);
         GtkAction* action = gtk_activatable_get_related_action (
             GTK_ACTIVATABLE (parent));
@@ -6686,11 +6614,9 @@ _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);
 
@@ -6702,6 +6628,9 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser,
                 else if (g_str_has_suffix (*name, "Forward"))
                     g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
                         "history-forward", (void*) 0xdeadbeef);
+                else if (g_strcmp0 (*name, "Reload"))
+                    g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
+                        "reload-middle-click", (void*) 0xdeadbeef);
 
                 g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
                     "button-press-event",
@@ -6757,8 +6686,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     gboolean show_panel;
     MidoriToolbarStyle toolbar_style;
     gchar* toolbar_items;
-    gboolean close_buttons_on_tabs;
-    KatzeItem* item;
+    gboolean close_buttons_left, close_buttons_on_tabs;
 
     g_object_get (browser->settings,
                   "remember-last-window-size", &remember_last_window_size,
@@ -6778,19 +6706,19 @@ _midori_browser_update_settings (MidoriBrowser* browser)
                   "show-statusbar", &browser->show_statusbar,
                   "toolbar-style", &toolbar_style,
                   "toolbar-items", &toolbar_items,
+                  "close-buttons-left", &close_buttons_left,
                   "close-buttons-on-tabs", &close_buttons_on_tabs,
                   "maximum-history-age", &browser->maximum_history_age,
                   NULL);
 
-    #ifdef HAVE_GRANITE
-    granite_widgets_dynamic_notebook_set_tabs_closable (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), close_buttons_on_tabs);
-    #endif
+    midori_notebook_set_close_buttons_visible (
+        MIDORI_NOTEBOOK (browser->notebook), close_buttons_on_tabs);
+    midori_notebook_set_close_buttons_left (
+        MIDORI_NOTEBOOK (browser->notebook), close_buttons_left);
     midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
-        katze_object_get_boolean (browser->settings, "close-buttons-left"));
+        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"));
+        midori_speed_dial_set_close_buttons_left (browser->dial, close_buttons_left);
 
     midori_browser_set_inactivity_reset (browser, inactivity_reset);
 
@@ -6825,13 +6753,15 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     {
         const gchar* default_search = midori_settings_get_location_entry_search (
             MIDORI_SETTINGS (browser->settings));
-        item = katze_array_get_nth_item (browser->search_engines,
-                                         browser->last_web_search);
-        if (item)
+        KatzeItem* item;
+
+        if ((item = katze_array_get_nth_item (browser->search_engines,
+                                              browser->last_web_search)))
             midori_search_action_set_current_item (MIDORI_SEARCH_ACTION (
                 _action_by_name (browser, "Search")), item);
 
-        if ((item = katze_array_find_uri (browser->search_engines, default_search)))
+        if (default_search != NULL
+         && (item = katze_array_find_uri (browser->search_engines, default_search)))
             midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
                 _action_by_name (browser, "Search")), item);
     }
@@ -6909,17 +6839,17 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
     }
     else if (name == g_intern_string ("maximum-history-age"))
         browser->maximum_history_age = g_value_get_int (&value);
-    #ifdef HAVE_GRANITE
     else if (name == g_intern_string ("close-buttons-on-tabs"))
-        granite_widgets_dynamic_notebook_set_tabs_closable (
-            GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
-    #endif
+        midori_notebook_set_close_buttons_visible (
+            MIDORI_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
     else if (name == g_intern_string ("close-buttons-left"))
     {
         midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
                                               g_value_get_boolean (&value));
         midori_speed_dial_set_close_buttons_left (browser->dial,
-            katze_object_get_boolean (browser->settings, "close-buttons-left"));
+            g_value_get_boolean (&value));
+        midori_notebook_set_close_buttons_left (
+            MIDORI_NOTEBOOK (browser->notebook), g_value_get_boolean (&value));
     }
     else if (name == g_intern_string ("inactivity-reset"))
         midori_browser_set_inactivity_reset (browser, g_value_get_uint (&value));
@@ -6929,54 +6859,45 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
     g_value_unset (&value);
 }
 
-static gboolean
-midori_bookmarkbar_item_button_press_event_cb (GtkWidget*      toolitem,
-                                               GdkEventButton* event,
-                                               MidoriBrowser*  browser)
-{
-    KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
-    if (MIDORI_EVENT_NEW_TAB (event))
-    {
-        if (KATZE_ITEM_IS_BOOKMARK (item))
-        {
-            GtkWidget* view = midori_browser_add_uri (browser, katze_item_get_uri (item));
-            midori_browser_set_current_tab_smartly (browser, view);
-            return TRUE;
-        }
-    }
-    else if (MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        midori_browser_bookmark_popup (toolitem, NULL, item, browser);
-        return TRUE;
-    }
-    return FALSE;
-}
-
 static void
 midori_bookmarkbar_insert_item (GtkWidget* toolbar,
                                 KatzeItem* item)
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
-    GtkAction* action = _action_by_name (browser, "Tools");
+    GtkAction* action = _action_by_name (browser, "Bookmarks");
     GtkToolItem* toolitem = katze_array_action_create_tool_item_for (
         KATZE_ARRAY_ACTION (action), item);
     g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
 
-    if (KATZE_IS_ITEM (item))
-    {
-        GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
-        g_object_set_data (G_OBJECT (child), "KatzeItem", item);
-        g_signal_connect (child, "button-press-event",
-            G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb),
-            browser);
-    }
-    else /* Separator */
+    if (!KATZE_IS_ITEM (item)) /* Separator */
         gtk_tool_item_set_use_drag_window (toolitem, TRUE);
 
     gtk_widget_show (GTK_WIDGET (toolitem));
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
 }
 
+static void
+midori_bookmarkbar_add_item_cb (KatzeArray*    bookmarks,
+                                KatzeItem*     item,
+                                MidoriBrowser* browser)
+{
+    if (gtk_widget_get_visible (browser->bookmarkbar))
+        midori_bookmarkbar_populate (browser);
+    else if (katze_item_get_meta_boolean (item, "toolbar"))
+        _action_set_active (browser, "Bookmarkbar", TRUE);
+    midori_browser_update_history (item, "bookmark", "created");
+}
+
+static void
+midori_bookmarkbar_update_item_cb (KatzeArray*    bookmarks,
+                                   KatzeItem*     item,
+                                   MidoriBrowser* browser)
+{
+    if (gtk_widget_get_visible (browser->bookmarkbar))
+        midori_bookmarkbar_populate (browser);
+    midori_browser_update_history (item, "bookmark", "modify");
+}
+
 static void
 midori_bookmarkbar_remove_item_cb (KatzeArray*    bookmarks,
                                    KatzeItem*     item,
@@ -6989,6 +6910,16 @@ midori_bookmarkbar_remove_item_cb (KatzeArray*    bookmarks,
 
 static void
 midori_bookmarkbar_populate (MidoriBrowser* browser)
+{
+    if (browser->bookmarkbar_populate)
+        return;
+
+    g_idle_add (midori_browser_idle, browser);
+    browser->bookmarkbar_populate = TRUE;
+}
+
+static void
+midori_bookmarkbar_populate_idle (MidoriBrowser* browser)
 {
     KatzeArray* array;
     KatzeItem* item;
@@ -6999,8 +6930,8 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
     gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar),
                         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);
+    array = midori_bookmarks_db_query_recursive (browser->bookmarks,
+        "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "toolbar = 1", NULL, FALSE);
     if (!array)
     {
         _action_set_sensitive (browser, "BookmarkAdd", FALSE);
@@ -7010,21 +6941,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser)
 
     KATZE_ARRAY_FOREACH_ITEM (item, array)
     {
-        if (KATZE_ITEM_IS_BOOKMARK (item))
-            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);
-
-                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));
-            g_free (parentid);
-        }
+        midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
     }
     _action_set_sensitive (browser, "BookmarkAdd", TRUE);
     _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE);
@@ -7054,13 +6971,24 @@ midori_browser_show_bookmarkbar_notify_value_cb (MidoriWebSettings* settings,
 
 static void
 midori_browser_set_bookmarks (MidoriBrowser* browser,
-                              KatzeArray*    bookmarks)
+                              MidoriBookmarksDb*    bookmarks)
 {
     MidoriWebSettings* settings;
 
     if (browser->bookmarks != NULL)
+    {
+        g_signal_handlers_disconnect_by_func (browser->bookmarks,
+            midori_bookmarkbar_add_item_cb, browser);
+        g_signal_handlers_disconnect_by_func (browser->bookmarks,
+            midori_bookmarkbar_update_item_cb, browser);
         g_signal_handlers_disconnect_by_func (browser->bookmarks,
             midori_bookmarkbar_remove_item_cb, browser);
+    }
+
+    g_object_set (G_OBJECT (_action_by_name (browser, "Bookmarks")),
+        "array", KATZE_ARRAY (bookmarks),
+        NULL);
+
     settings = midori_browser_get_settings (browser);
     g_signal_handlers_disconnect_by_func (settings,
         midori_browser_show_bookmarkbar_notify_value_cb, browser);
@@ -7089,6 +7017,10 @@ midori_browser_set_bookmarks (MidoriBrowser* browser,
     g_signal_connect (settings, "notify::show-bookmarkbar",
         G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser);
     g_object_notify (G_OBJECT (settings), "show-bookmarkbar");
+    g_signal_connect_after (bookmarks, "add-item",
+        G_CALLBACK (midori_bookmarkbar_add_item_cb), browser);
+    g_signal_connect_after (bookmarks, "update-item",
+        G_CALLBACK (midori_bookmarkbar_update_item_cb), browser);
     g_signal_connect_after (bookmarks, "remove-item",
         G_CALLBACK (midori_bookmarkbar_remove_item_cb), browser);
 }
@@ -7144,7 +7076,7 @@ midori_browser_set_property (GObject*      object,
         _action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
         if (browser->trash != NULL)
         {
-            g_signal_connect (browser->trash, "clear",
+            g_signal_connect_after (browser->trash, "clear",
                 G_CALLBACK (midori_browser_trash_clear_cb), browser);
             midori_browser_trash_clear_cb (browser->trash, browser);
         }
@@ -7213,7 +7145,7 @@ midori_browser_get_property (GObject*    object,
         g_value_set_object (value, browser->navigationbar);
         break;
     case PROP_NOTEBOOK:
-        g_value_set_object (value, browser->notebook);
+        g_value_set_object (value, MIDORI_NOTEBOOK (browser->notebook)->notebook);
         break;
     case PROP_PANEL:
         g_value_set_object (value, browser->panel);
@@ -7334,13 +7266,7 @@ midori_browser_page_num (MidoriBrowser* browser,
     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
+    return midori_notebook_get_tab_index (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
 }
 
 
@@ -7359,7 +7285,6 @@ midori_browser_close_tab (MidoriBrowser* browser,
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
     g_return_if_fail (GTK_IS_WIDGET (view));
 
-    midori_browser_add_tab_to_trash (browser, MIDORI_VIEW (view));
     g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
 }
 
@@ -7585,22 +7510,7 @@ midori_browser_set_current_page (MidoriBrowser* browser,
     view = midori_browser_get_nth_tab (browser, 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");
-    else
-        gtk_widget_grab_focus (view);
-
-    g_object_freeze_notify (G_OBJECT (browser));
-    g_object_notify (G_OBJECT (browser), "uri");
-    g_object_notify (G_OBJECT (browser), "tab");
-    g_object_thaw_notify (G_OBJECT (browser));
+    midori_browser_set_tab (browser, view);
 }
 
 /**
@@ -7618,14 +7528,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
+    return midori_notebook_get_index (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 /**
@@ -7671,19 +7574,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
+    return (GtkWidget*)midori_notebook_get_nth_tab (MIDORI_NOTEBOOK (browser->notebook), page);
 }
 
 /**
@@ -7701,13 +7594,16 @@ void
 midori_browser_set_current_tab (MidoriBrowser* browser,
                                 GtkWidget*     view)
 {
-    gint n;
-
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
     g_return_if_fail (GTK_IS_WIDGET (view));
 
-    n = midori_browser_page_num (browser, view);
-    midori_browser_set_current_page (browser, n);
+    midori_notebook_set_tab (MIDORI_NOTEBOOK (browser->notebook), MIDORI_TAB (view));
+    if (midori_tab_is_blank (MIDORI_TAB (view)))
+        midori_browser_activate_action (browser, "Location");
+    else
+        gtk_widget_grab_focus (view);
+
+    midori_browser_notify_tab_cb (browser->notebook, NULL, browser);
 }
 
 /**
@@ -7727,22 +7623,9 @@ 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
+    return (GtkWidget*)midori_notebook_get_tab (MIDORI_NOTEBOOK (browser->notebook));
 }
 
 /**
@@ -7760,12 +7643,7 @@ midori_browser_get_tabs (MidoriBrowser* browser)
 {
     g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
 
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite doesn't correctly implemented gtk.container */
-    return granite_widgets_dynamic_notebook_get_children (GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
-    #else
     return gtk_container_get_children (GTK_CONTAINER (browser->notebook));
-    #endif
 }
 
 /**
@@ -7810,7 +7688,28 @@ midori_browser_get_for_widget (GtkWidget* widget)
 
         browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
         if (!MIDORI_IS_BROWSER (browser))
+        {
+            /* For some reason, when called on the widget of the
+             * application menubar we get here.
+             */
+
+            GList* top_levels = gtk_window_list_toplevels ();
+            GList *iter;
+
+            for (iter = top_levels; iter; iter = g_list_next (iter))
+            {
+                browser = iter->data;
+
+                if (MIDORI_IS_BROWSER (browser) && gtk_widget_is_ancestor( GTK_WIDGET (browser), widget))
+                {
+                    g_list_free (top_levels);
+                    return MIDORI_BROWSER (browser);
+                }
+            }
+
+            g_list_free (top_levels);
             return NULL;
+        }
     }
 
     return MIDORI_BROWSER (browser);
index 02b74c6e0ddd4ff24d13e691dcdb9e4a42e68e96..0935a84db8a4c1014618619fcce7886276c880fa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -17,12 +17,13 @@ namespace Midori {
         public string? background { get; set; }
         public GLib.Icon? icon {  get; set; }
         public bool action { get; set; default = false; }
+        public int priority {get; set; default = 0; }
 
         public Suggestion (string? uri, string? markup, bool use_markup=false,
-            string? background=null, GLib.Icon? icon=null) {
+            string? background=null, GLib.Icon? icon=null, int? priority=0) {
 
             GLib.Object (uri: uri, markup: markup, use_markup: use_markup,
-                         background: background, icon: icon);
+                         background: background, icon: icon, priority: priority);
         }
     }
 
@@ -52,6 +53,8 @@ namespace Midori {
             MARKUP,
             BACKGROUND,
             YALIGN,
+            SIZE,
+            PRIORITY,
             N
         }
 
@@ -60,8 +63,8 @@ namespace Midori {
             completions = new List<Completion> ();
             next_position = 0;
             model = new Gtk.ListStore (Columns.N,
-                typeof (Gdk.Pixbuf), typeof (string), typeof (string),
-                typeof (string), typeof (float));
+                typeof (GLib.Icon), typeof (string), typeof (string),
+                typeof (string), typeof (float), typeof (uint), typeof (int));
         }
 
         public void add (Completion completion) {
@@ -78,25 +81,49 @@ namespace Midori {
             return false;
         }
 
+        private GLib.Icon? scale_if_needed (GLib.Icon? icon) {
+            if (icon is Gdk.Pixbuf) {
+                var pixbuf = icon as Gdk.Pixbuf;
+                int icon_width = 16, icon_height = 16;
+                Gtk.icon_size_lookup (Gtk.IconSize.MENU, out icon_width, out icon_height);
+                if (pixbuf.width > icon_width || pixbuf.height > icon_height)
+                    return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
+            }
+            return icon;
+        }
+
         private void fill_model (Midori.Completion completion, List<Midori.Suggestion>? suggestions) {
             if (need_to_clear) {
                 model.clear ();
                 need_to_clear = false;
                 current_count = 0;
             }
-
-#if HAVE_GRANITE
+            int start = 0;
+            // find the first index with priority greater than the current one
+            Gtk.TreeModelForeachFunc find_index = (model, path, iter) => {
+                GLib.Value priority;
+
+                model.get_value (iter,Columns.PRIORITY, out priority);
+                if ((int)priority < completion.position) {
+                    start++;
+                    return false;
+                }
+                return true;
+            };
+            model.foreach(find_index);
+            int count = 0;
             if (completion.description != null) {
-                model.insert_with_values (null, completion.position,
+                model.insert_with_values (null, start,
                     Columns.URI, "about:completion-description",
                     Columns.MARKUP, "<b>%s</b>\n".printf (Markup.escape_text (completion.description)),
                     Columns.ICON, null,
+                    Columns.SIZE, Gtk.IconSize.MENU,
                     Columns.BACKGROUND, null,
-                    Columns.YALIGN, 0.25);
+                    Columns.YALIGN, 0.25,
+                    Columns.PRIORITY, completion.position);
+                count++;
             }
-#endif
 
-            int count = 1;
             foreach (var suggestion in suggestions) {
                 if (suggestion.uri == null) {
                     warning ("suggestion.uri != null");
@@ -106,13 +133,15 @@ namespace Midori {
                     warning ("suggestion.markup != null");
                     continue;
                 }
-                model.insert_with_values (null, completion.position + count,
+                model.insert_with_values (null, start + count,
                     Columns.URI, suggestion.uri,
                     Columns.MARKUP, suggestion.use_markup
                     ? suggestion.markup : Markup.escape_text (suggestion.markup),
-                    Columns.ICON, suggestion.icon,
+                    Columns.ICON, scale_if_needed (suggestion.icon),
+                    Columns.SIZE, Gtk.IconSize.MENU,
                     Columns.BACKGROUND, suggestion.background,
-                    Columns.YALIGN, 0.25);
+                    Columns.YALIGN, 0.25,
+                    Columns.PRIORITY, completion.position);
 
                 count++;
                 if (count > completion.max_items)
@@ -139,7 +168,7 @@ namespace Midori {
 
             foreach (var completion in completions) {
                 if (completion.can_complete (text))
-                    complete_wrapped.begin (completion, text, null, cancellable);
+                    yield complete_wrapped (completion, text, null, cancellable);
             }
         }
 
diff --git a/midori/midori-contextaction.vala b/midori/midori-contextaction.vala
new file mode 100644 (file)
index 0000000..ea5a578
--- /dev/null
@@ -0,0 +1,134 @@
+/*
+ Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+ 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 {
+    /* A context action represents an item that can be shown in a menu
+       or toolbar. Context actions can be nested as needed.
+       Since: 0.5.5 */
+    public class ContextAction : Gtk.Action {
+        List<Gtk.ActionGroup> action_groups;
+        List<Gtk.Action> children;
+        public ContextAction (string name, string? label, string? tooltip, string? stock_id) {
+            GLib.Object (name: name, label: label, tooltip: tooltip, stock_id: stock_id);
+            action_groups = new List<Gtk.ActionGroup> ();
+            children = new List<ContextAction> ();
+        }
+
+        /*
+           The action label will be escaped for mnemonics so for example
+           "a_fairy_tale" will not get accel keys on "f" or "t".
+
+           Since: 0.5.8
+         */
+        public ContextAction.escaped (string name, string label, string? tooltip, string? stock_id) {
+            string? escaped_label = label.replace ("_", "__");
+            GLib.Object (name: name, label: escaped_label, tooltip: tooltip, stock_id: stock_id);
+            action_groups = new List<Gtk.ActionGroup> ();
+            children = new List<ContextAction> ();
+        }
+
+        public delegate void ActionActivateCallback (Gtk.Action action);
+        public void add_simple (string name, string? label, string? tooltip, string? stock_id, ActionActivateCallback callback) {
+            var action = new ContextAction (name, label, tooltip, stock_id);
+            action.activate.connect (() => { callback (action); });
+            add (action);
+        }
+
+        public void add (Gtk.Action? action) {
+            if (action == null) {
+                add (new SeparatorContextAction ());
+                return;
+            }
+
+            children.append (action);
+            if (action is ContextAction) {
+                foreach (var action_group in action_groups)
+                    (action as ContextAction).add_action_group (action_group);
+            }
+        }
+
+        public void add_action_group (Gtk.ActionGroup action_group) {
+            action_groups.append (action_group);
+        }
+
+        public void add_by_name (string name) {
+            foreach (var action_group in action_groups) {
+                var action = action_group.get_action (name);
+                if (action != null) {
+                    add (action);
+                    return;
+                }
+            }
+            warning ("Action %s not known to ContextAction", name);
+        }
+
+#if HAVE_WEBKIT2
+        public WebKit.ContextMenu create_webkit_context_menu (WebKit.ContextMenu? default_menu) {
+            var menu = default_menu ?? new WebKit.ContextMenu ();
+            foreach (var action in children) {
+                WebKit.ContextMenuItem menuitem;
+                if (action is SeparatorContextAction)
+                    menuitem = new WebKit.ContextMenuItem.separator ();
+                else if (action is ContextAction
+                 && (action as ContextAction).children.nth_data (0) != null) {
+                    menuitem = new WebKit.ContextMenuItem (action);
+                    menuitem.set_submenu ((action as ContextAction).create_webkit_context_menu (null));
+                }
+                else
+                    menuitem = new WebKit.ContextMenuItem (action);
+                // Visibility of the action is ignored, so we skip hidden items
+                if (action.visible)
+                    menu.append (menuitem);
+            }
+            return menu;
+        }
+#endif
+
+        public new Gtk.Menu create_menu (Gtk.Menu? default_menu, bool accels) {
+            var menu = default_menu ?? new Gtk.Menu ();
+            foreach (var action in children) {
+                Gtk.MenuItem menuitem;
+                if (action is SeparatorContextAction) {
+                    menuitem = new Gtk.SeparatorMenuItem ();
+                    menuitem.show ();
+                }
+                else if (action is ContextAction
+                 && (action as ContextAction).children.nth_data (0) != null) {
+                    menuitem = action.create_menu_item () as Gtk.MenuItem;
+                    menuitem.submenu = (action as ContextAction).create_menu (null, accels);
+                }
+                else
+                    menuitem = action.create_menu_item () as Gtk.MenuItem;
+                /* Disable accels from the action in context menus */
+                if (!accels) {
+                    var accel_label = menuitem.get_child () as Gtk.AccelLabel;
+                    if (accel_label != null)
+                        accel_label.accel_closure = null;
+                }
+                menu.append (menuitem);
+            }
+            return menu;
+        }
+
+        public Gtk.Action? get_by_name (string name) {
+            foreach (var action in children)
+                if (action.name == name)
+                    return action;
+            return null;
+        }
+    }
+
+    public class SeparatorContextAction : ContextAction {
+        public SeparatorContextAction () {
+            GLib.Object (name: "SeparatorContextAction", label: null, tooltip: null, stock_id: null);
+        }
+    }
+}
diff --git a/midori/midori-database.vala b/midori/midori-database.vala
new file mode 100644 (file)
index 0000000..73fffcb
--- /dev/null
@@ -0,0 +1,326 @@
+/*
+ Copyright (C) 2013 Christian Dywan <christian@twotoats.de>
+
+ 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 {
+    /*
+     * Since: 0.5.6
+     */
+    public errordomain DatabaseError {
+        OPEN,
+        NAMING,
+        FILENAME,
+        EXECUTE,
+        COMPILE,
+        TYPE,
+    }
+
+    /*
+     * Since: 0.5.8
+     */
+    public delegate bool DatabaseCallback () throws DatabaseError;
+
+    /*
+     * Since: 0.5.7
+     */
+    public class DatabaseStatement : GLib.Object, GLib.Initable {
+        public Sqlite.Statement? stmt { get { return _stmt; } }
+        protected Sqlite.Statement _stmt = null;
+        public Database? database { get; set construct; }
+        public string? query { get; set construct; }
+        private int64 last_row_id = -1;
+
+        public DatabaseStatement (Database database, string query) throws DatabaseError {
+            Object (database: database, query: query);
+            init ();
+        }
+
+        public virtual bool init (GLib.Cancellable? cancellable = null) throws DatabaseError {
+            int result = database.db.prepare_v2 (query, -1, out _stmt, null);
+            if (result != Sqlite.OK)
+                throw new DatabaseError.COMPILE ("Failed to compile statement: %s".printf (database.db.errmsg ()));
+            return true;
+        }
+
+        /*
+         * Bind values to named parameters.
+         * SQL: "SELECT foo FROM bar WHERE id = :session_id"
+         * Vala: statement.bind(":session_id", typeof (int64), 12345);
+         * Supported types: string, int64, double
+         */
+        public void bind (string pname, ...) throws DatabaseError {
+            int pindex = stmt.bind_parameter_index (pname);
+            if (pindex <= 0)
+                throw new DatabaseError.TYPE ("No such parameter '%s' in statement: %s".printf (pname, query));
+            var args = va_list ();
+            Type ptype = args.arg ();
+            if (ptype == typeof (string)) {
+                string text = args.arg ();
+                stmt.bind_text (pindex, text);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, text);
+            } else if (ptype == typeof (int64)) {
+                int64 integer = args.arg ();
+                stmt.bind_int64 (pindex, integer);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, integer.to_string ());
+            } else if (ptype == typeof (double)) {
+                double stuntman = args.arg ();
+                stmt.bind_double (pindex, stuntman);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, stuntman.to_string ());
+            } else
+                throw new DatabaseError.TYPE ("Invalid type '%s' for '%s' in statement: %s".printf (ptype.name (), pname, query));
+        }
+
+        /*
+         * Execute the statement, it's an error if there are more rows.
+         */
+        public bool exec () throws DatabaseError {
+            if (step ())
+                throw new DatabaseError.EXECUTE ("More rows available - use step instead of exec");
+            return true;
+        }
+
+        /*
+         * Proceed to the next row, returns false when the end is nigh.
+         */
+        public bool step () throws DatabaseError {
+            int result = stmt.step ();
+            if (result != Sqlite.DONE && result != Sqlite.ROW)
+                throw new DatabaseError.EXECUTE (database.db.errmsg ());
+            last_row_id = database.db.last_insert_rowid ();
+            return result == Sqlite.ROW;
+        }
+
+        /*
+         * Returns the id of the last inserted row.
+         * It is an error to ask for an id without having inserted a row.
+         * Since: 0.5.8
+         */
+        public int64 row_id () throws DatabaseError {
+            if (last_row_id == -1)
+                throw new DatabaseError.EXECUTE ("No row id");
+            return last_row_id;
+        }
+
+        private int column_index (string name) throws DatabaseError {
+            for (int i = 0; i < stmt.column_count (); i++) {
+                if (name == stmt.column_name (i))
+                    return i;
+            }
+            throw new DatabaseError.TYPE ("No such column '%s' in row: %s".printf (name, query));
+        }
+
+        /*
+         * Get a string value by its named parameter, for example ":uri".
+         */
+        public string? get_string (string name) throws DatabaseError {
+            int index = column_index (name);
+            int type = stmt.column_type (index);
+            if (stmt.column_type (index) != Sqlite.TEXT && type != Sqlite.NULL)
+                throw new DatabaseError.TYPE ("Getting '%s' with wrong type in row: %s".printf (name, query));
+            return stmt.column_text (index);
+        }
+
+        /*
+         * Get an integer value by its named parameter, for example ":day".
+         */
+        public int64 get_int64 (string name) throws DatabaseError {
+            int index = column_index (name);
+            int type = stmt.column_type (index);
+            if (type != Sqlite.INTEGER && type != Sqlite.NULL)
+                throw new DatabaseError.TYPE ("Getting '%s' with value '%s' of wrong type %d in row: %s".printf (
+                                              name, stmt.column_text (index), type, query));
+            return stmt.column_int64 (index);
+        }
+
+        /*
+         * Get a double value by its named parameter, for example ":session_id".
+         */
+        public double get_double (string name) throws DatabaseError {
+            int index = column_index (name);
+            if (stmt.column_type (index) != Sqlite.FLOAT)
+                throw new DatabaseError.TYPE ("Getting '%s' with wrong type in row: %s".printf (name, query));
+            return stmt.column_double (index);
+        }
+    }
+
+    /*
+     * Since: 0.5.6
+     */
+    public class Database : GLib.Object, GLib.Initable {
+        internal bool trace = false;
+        public Sqlite.Database? db { get { return _db; } }
+        protected Sqlite.Database? _db = null;
+        public string path { get; protected set; default = ":memory:"; }
+
+        /*
+         * A new database successfully opened for the first time.
+         * Old or additional data should be opened if this is true.
+         */
+        public bool first_use { get; protected set; default = false; }
+
+        /*
+         * If a filename is passed it's assumed to be in the config folder.
+         * Otherwise the database is in memory only (useful for private browsing).
+         */
+        public Database (string path=":memory:") throws DatabaseError {
+            Object (path: path);
+            init ();
+        }
+
+        string resolve_path (string path) {
+            if (path.has_prefix (":memory:"))
+                return ":memory:";
+            else if (!Path.is_absolute (path))
+                return Midori.Paths.get_config_filename_for_writing (path);
+            return path;
+        }
+
+        public virtual bool init (GLib.Cancellable? cancellable = null) throws DatabaseError {
+            string real_path = resolve_path (path);
+            bool exists = exists(real_path);
+
+            if (Sqlite.Database.open_v2 (real_path, out _db) != Sqlite.OK)
+                throw new DatabaseError.OPEN ("Failed to open database %s".printf (real_path));
+
+            string token = Environment.get_variable ("MIDORI_DEBUG") ?? "";
+            string basename = Path.get_basename (path);
+            string[] parts = basename.split (".");
+            trace = ("db:" + parts[0]) in token;
+            if (trace) {
+                stdout.printf ("§§ Tracing %s\n", path);
+                db.profile ((sql, nanoseconds) => {
+                    /* sqlite as of this writing isn't more precise than ms */
+                    string milliseconds = (nanoseconds / 1000000).to_string ();
+                    stdout.printf ("§§ %s: %s (%sms)\n", path, sql, milliseconds);
+                });
+            }
+
+            if (db.exec ("PRAGMA journal_mode = WAL; PRAGMA cache_size = 32100;") != Sqlite.OK)
+                db.exec ("PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;");
+            db.exec ("PRAGMA count_changes = OFF;");
+
+            if (real_path == ":memory:")
+                return true;
+
+            int64 user_version;
+            Sqlite.Statement stmt;
+            if (db.prepare_v2 ("PRAGMA user_version;", -1, out stmt, null) != Sqlite.OK)
+                throw new DatabaseError.EXECUTE ("Failed to compile statement %s".printf (db.errmsg ()));
+            if (stmt.step () != Sqlite.ROW)
+                throw new DatabaseError.EXECUTE ("Failed to get row %s".printf (db.errmsg ()));
+            user_version = stmt.column_int64 (0);
+
+            if (user_version == 0) {
+                exec_script ("Create");
+                user_version = 1;
+                exec ("PRAGMA user_version = " + user_version.to_string ());
+            }
+
+            while (true) {
+                try {
+                    exec_script ("Update" + user_version.to_string ());
+                } catch (DatabaseError error) {
+                    if (error is DatabaseError.FILENAME)
+                        break;
+                    throw error;
+                }
+                user_version = user_version + 1;
+                exec ("PRAGMA user_version = " + user_version.to_string ());
+            }
+
+            first_use = !exists;
+            return true;
+        }
+
+       public bool exists (string path) {
+             bool exists;
+#if !HAVE_WIN32        
+            exists = Posix.access (path, Posix.F_OK) == 0;
+#else
+            var folder = File.new_for_path (path);
+            exists = folder.query_exists();
+#endif
+            return exists;
+       }
+
+
+        /*
+         * Since: 0.5.8
+         */
+
+        public bool attach (string path, string alias) throws DatabaseError {
+            string real_path = resolve_path (path);
+            if (!exists (real_path))
+                throw new DatabaseError.OPEN ("Failed to attach database %s".printf (path));
+            return exec ("ATTACH DATABASE '%s' AS '%s';".printf (real_path, alias));
+        }
+
+        public bool exec_script (string filename) throws DatabaseError {
+            string basename = Path.get_basename (path);
+            string[] parts = basename.split (".");
+            if (!(parts != null && parts[0] != null && parts[1] != null))
+                throw new DatabaseError.NAMING ("Failed to deduce schema filename from %s".printf (path));
+            string schema_filename = Midori.Paths.get_res_filename (parts[0] + "/" + filename + ".sql");
+            string schema;
+            try {
+                FileUtils.get_contents (schema_filename, out schema, null);
+            } catch (Error error) {
+                throw new DatabaseError.FILENAME ("Failed to open schema: %s".printf (schema_filename));
+            }
+            transaction (()=> { return exec (schema); });
+            return true;
+        }
+
+        public bool transaction (DatabaseCallback callback) throws DatabaseError {
+            exec ("BEGIN TRANSACTION;");
+            callback ();
+            exec ("COMMIT;");
+            return true;
+        }
+
+        public bool exec (string query) throws DatabaseError {
+            if (db.exec (query) != Sqlite.OK)
+                throw new DatabaseError.EXECUTE (db.errmsg ());
+            return true;
+        }
+
+        /*
+         * Prepare a statement with optionally binding parameters by name.
+         * See also DatabaseStatement.bind().
+         * Since: 0.5.7
+         */
+        public DatabaseStatement prepare (string query, ...) throws DatabaseError {
+            var statement = new DatabaseStatement (this, query);
+            var args = va_list ();
+            unowned string? pname = args.arg ();
+            while (pname != null) {
+                Type ptype = args.arg ();
+                if (ptype == typeof (string)) {
+                    string pvalue = args.arg ();
+                    statement.bind (pname, ptype, pvalue);
+                } else if (ptype == typeof (int64)) {
+                    int64 pvalue = args.arg ();
+                    statement.bind (pname, ptype, pvalue);
+                } else if (ptype == typeof (double)) {
+                    double pvalue = args.arg ();
+                    statement.bind (pname, ptype, pvalue);
+                } else
+                    throw new DatabaseError.TYPE ("Invalid type '%s' in statement: %s".printf (ptype.name (), query));
+                pname = args.arg ();
+            }
+            if (trace)
+                stdout.printf ("\n");
+            return statement;
+        }
+    }
+}
index 507f4e6fe2cd19c3ade8db8cd40a282c604df037..64736c10430e7a391ca3fd4eb0c335c10c9885c1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2011-2012 Christian Dywan <christian@twotoats.de>
+ Copyright (C) 2011-2013 Christian Dywan <christian@twotoats.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -24,13 +24,24 @@ namespace Midori {
     }
 
     namespace Test {
+        public void init ([CCode (array_length_pos = 0.9)] ref unowned string[] args) {
+            GLib.Test.init (ref args);
+
+            /* Always log to stderr */
+            Log.set_handler (null,
+                LogLevelFlags.LEVEL_MASK | LogLevelFlags.FLAG_FATAL | LogLevelFlags.FLAG_RECURSION,
+                (domain, log_levels, message) => {
+                stderr.printf ("** %s\n", message);
+            });
+        }
+
         internal static uint test_max_timeout = 0;
         internal static string? test_first_try = null;
         public void grab_max_timeout () {
             int seconds = (Environment.get_variable ("MIDORI_TIMEOUT") ?? "42").to_int ();
             test_first_try = "once";
             test_max_timeout = GLib.Timeout.add_seconds (seconds > 0 ? seconds / 2 : 0, ()=>{
-                stdout.printf ("Timed out %s%s\n", test_first_try,
+                stderr.printf ("Timed out %s%s\n", test_first_try,
                     MainContext.default ().pending () ? " (loop)" : "");
                 if (test_first_try == "twice")
                     Process.exit (0);
@@ -50,6 +61,26 @@ namespace Midori {
             test_idle_timeouts = true;
         }
 
+        public abstract class Job : GLib.Object {
+            bool done;
+            public abstract async void run (Cancellable cancellable) throws GLib.Error;
+            async void run_wrapped (Cancellable cancellable) {
+                try {
+                    yield run (cancellable);
+                } catch (Error error) {
+                    GLib.error (error.message);
+                }
+                done = true;
+            }
+            public void run_sync () {
+                var loop = MainContext.default ();
+                var cancellable = new Cancellable ();
+                done = false;
+                run_wrapped.begin (cancellable);
+                do { loop.iteration (true); } while (!done);
+            }
+        }
+
         public void log_set_fatal_handler_for_icons () {
             GLib.Test.log_set_fatal_handler ((domain, log_levels, message)=> {
                 return !message.contains ("Error loading theme icon")
@@ -72,8 +103,22 @@ namespace Midori {
         }
     }
 
+    public static void show_message_dialog (Gtk.MessageType type, string short, string detailed, bool modal) {
+        var dialog = new Gtk.MessageDialog (null, 0, type, Gtk.ButtonsType.OK, "%s", short);
+        dialog.format_secondary_text ("%s", detailed);
+        if (modal) {
+            dialog.run ();
+            dialog.destroy ();
+        } else {
+            dialog.response.connect ((response) => {
+                dialog.destroy ();
+            });
+            dialog.show ();
+        }
+    }
+
     public class FileChooserDialog : Gtk.FileChooserDialog {
-        public FileChooserDialog (string title, Gtk.Window window, Gtk.FileChooserAction action) {
+        public FileChooserDialog (string title, Gtk.Window? window, Gtk.FileChooserAction action) {
             /* Creates a new file chooser dialog to Open or Save and Cancel.
                The positive response is %Gtk.ResponseType.OK. */
             unowned string stock_id = Gtk.Stock.OPEN;
index 51274e92d4e1b0a8ea3bb3027dad0e0eb6b9669c..21da77d6a9f404af288b797aea7a1bd263b38950 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -10,7 +10,6 @@
 */
 
 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);
 }
 
@@ -27,6 +26,8 @@ namespace Midori {
                     return false;
             }
 #else
+            if (download.estimated_progress == 1)
+                return true;
             return false;
 #endif
         }
@@ -39,6 +40,14 @@ namespace Midori {
             download.set_data<int> ("midori-download-type", type);
         }
 
+#if HAVE_WEBKIT2
+        public static string get_filename (WebKit.Download download) {
+            return download.get_data<string> ("midori-download-filename");
+        }
+        public static void set_filename (WebKit.Download download, string name) {
+            download.set_data<string> ("midori-download-filename", name);
+        }
+#endif
         public static double get_progress (WebKit.Download download) {
 #if !HAVE_WEBKIT2
             /* Avoid a bug in WebKit */
@@ -46,19 +55,13 @@ namespace Midori {
                 return 0.0;
             return download.progress;
 #else
-            return 0.0;
+            return download.estimated_progress;
 #endif
         }
 
-#if !HAVE_GLIB_2_30
-        private static string format_size (uint64 size) {
-            return format_size_for_display ((int64)size);
-        }
-#endif
-
-        public static string get_tooltip (WebKit.Download download) {
+        public static string calculate_tooltip (WebKit.Download download) {
 #if !HAVE_WEBKIT2
-            string filename = Path.get_basename (download.destination_uri);
+            string filename = Midori.Download.get_basename_for_display (download.destination_uri);
             /* i18n: Download tooltip (size): 4KB of 43MB */
             string size = _("%s of %s").printf (
                 format_size (download.current_size),
@@ -99,8 +102,14 @@ namespace Midori {
             string speed = "";
             uint64? last_size = download.get_data<uint64?> ("last-size");
             if (last_size != null && elapsed != last_time) {
-                speed = format_size ((uint64)(
-                    (current_size - last_size) / (elapsed - last_time)));
+                if (current_size != last_size) {
+                    speed = format_size ((uint64)(
+                        (current_size - last_size) / (elapsed - last_time)));
+                    download.set_data ("last-speed", speed.dup ());
+                }
+                else {
+                    speed = download.get_data ("last-speed");
+                }
             }
             else
                 /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
@@ -115,39 +124,57 @@ namespace Midori {
 
             return "%s\n%s %s%s".printf (filename, size, speed, eta);
 #else
-            return "";
+            string filename = Midori.Download.get_basename_for_display (download.destination);
+
+            string size = "%s".printf (format_size (download.get_received_data_length ()));
+            string speed = "";
+            speed = format_size ((uint64)((download.get_received_data_length () * 1.0) / download.elapsed_time));
+            speed = _(" (%s/s)").printf (speed);
+            string progress = "%d%%".printf( (int) (download.get_estimated_progress ()*100));
+            if (is_finished (download))
+                return "%s\n %s".printf (filename, size);
+            return "%s\n %s - %s".printf (filename, speed, progress);
 #endif
         }
 
         public static string get_content_type (WebKit.Download download, string? mime_type) {
-#if !HAVE_WEBKIT2
+#if HAVE_WEBKIT2
+            string? content_type = ContentType.guess (download.response.suggested_filename == null ?
+                          download.destination : download.response.suggested_filename,
+                          null, null);
+#else
             string? content_type = ContentType.guess (download.suggested_filename, null, null);
+#endif
             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;
-#else
-            return ContentType.from_mime_type ("application/octet-stream");
-#endif
         }
 
         public static bool has_wrong_checksum (WebKit.Download download) {
-#if !HAVE_WEBKIT2
             int status = download.get_data<int> ("checksum-status");
             if (status == 0) {
                 /* Link Fingerprint */
+                #if HAVE_WEBKIT2
+                string? original_uri = download.request.uri;
+                #else
                 string? original_uri = download.network_request.get_data<string> ("midori-original-uri");
                 if (original_uri == null)
                     original_uri = download.get_uri ();
+                #endif
                 string? fingerprint;
                 ChecksumType checksum_type = URI.get_fingerprint (original_uri, out fingerprint, null);
                 /* By default, no wrong checksum */
                 status = 2;
                 if (fingerprint != null) {
                     try {
+                        #if HAVE_WEBKIT2
+                        string filename = Filename.from_uri (download.destination);
+                        #else
                         string filename = Filename.from_uri (download.destination_uri);
+                        #endif
                         string contents;
                         size_t length;
                         bool y = FileUtils.get_contents (filename, out contents, out length);
@@ -163,9 +190,7 @@ namespace Midori {
                 download.set_data<int> ("checksum-status", status);
             }
             return status == 1;
-#else
-            return false;
-#endif
+
         }
 
         public static bool action_clear (WebKit.Download download, Gtk.Widget widget) throws Error {
@@ -186,6 +211,14 @@ namespace Midori {
                     warn_if_reached ();
                     break;
             }
+            #else
+
+            if (download.estimated_progress < 1) {
+                download.cancel ();
+            } else {
+                if (open (download, widget))
+                    return true;
+            }
 #endif
             return false;
         }
@@ -210,21 +243,34 @@ namespace Midori {
                     return Gtk.Stock.MISSING_IMAGE;
             }
 #else
-            return Gtk.Stock.MISSING_IMAGE;
+            if (download.estimated_progress == 1)
+                if (has_wrong_checksum (download))
+                    return Gtk.Stock.DIALOG_WARNING;
+                else
+                    return Gtk.Stock.OPEN;
+            return Gtk.Stock.CANCEL;
 #endif
         }
 
+        /* returns whether an application was successfully launched to handle the file */
         public static bool open (WebKit.Download download, Gtk.Widget widget) throws Error {
-#if !HAVE_WEBKIT2
-            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);
-#endif
+            if (has_wrong_checksum (download)) {
+                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 true;
+            } else {
+                var browser = widget.get_toplevel ();
+                Tab? tab = null;
+                browser.get ("tab", &tab);
+                if (tab != null)
+                #if HAVE_WEBKIT2
+                    return tab.open_uri (download.destination);
+                #else
+                    return tab.open_uri (download.destination_uri);
+                #endif
+            }
             return false;
         }
 
@@ -244,9 +290,9 @@ namespace Midori {
 
         public string clean_filename (string filename) {
             #if HAVE_WIN32
-            return filename.delimit ("/\\<>:\"|?*", '_');
+            return filename.delimit ("/\\<>:\"|?* ", '_');
             #else
-            return filename.delimit ("/", '_');
+            return filename.delimit ("/ ", '_');
             #endif
         }
 
@@ -256,10 +302,17 @@ namespace Midori {
                https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */
             return clean_filename (download.get_suggested_filename ());
 #else
-            return "";
+            string name = get_filename (download);
+            if (name == null)
+                return "";
+            return name;
 #endif
         }
 
+        /**
+         * Returns a filename of the form "name.ext" to use as a suggested name for
+         * a download of the given uri
+         */
         public string get_filename_suggestion_for_uri (string mime_type, string uri) {
             return_val_if_fail (Midori.URI.is_location (uri), uri);
             string filename = File.new_for_uri (uri).get_basename ();
@@ -269,8 +322,7 @@ namespace Midori {
         }
 
         public static string? get_extension_for_uri (string uri, out string basename = null) {
-            if (&basename != null)
-                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? */
@@ -283,8 +335,7 @@ namespace Midori {
             int query = uri.last_index_of_char ('?', period);
             /* The extension, or "." if it ended with a period */
             string extension = uri.substring (period, query - period);
-            if (&basename != null)
-                basename = uri.substring (0, period);
+            basename = uri.substring (0, period);
             return extension;
 
         }
@@ -303,9 +354,28 @@ namespace Midori {
             return filename;
         }
 
+        /**
+         * Returns a string showing a file:// URI's intended filename on
+         * disk, suited for displaying to a user.
+         * 
+         * The string returned is the basename (final path segment) of the
+         * filename of the uri. If the uri is invalid, not file://, or has no
+         * basename, the uri itself is returned.
+         * 
+         * Since: 0.5.7
+         **/
+        public static string get_basename_for_display (string uri) {
+            try {
+                string filename = Filename.from_uri (uri);
+                if(filename != null && filename != "")
+                    return Path.get_basename (filename);
+            } catch (Error error) { }
+            return uri;
+        }
+
         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 basename = Path.get_basename (suggested_filename);
             string download_dir;
             if (folder == null) {
                 download_dir = Paths.get_tmp_dir ();
@@ -322,9 +392,13 @@ namespace Midori {
             }
         }
 
-        public static bool has_enough_space (WebKit.Download download, string uri) {
+        /**
+         * Returns whether it seems possible to save @download to the path specified by
+         * @destination_uri, considering space on disk and permissions
+         */
+        public static bool has_enough_space (WebKit.Download download, string destination_uri, bool quiet=false) {
 #if !HAVE_WEBKIT2
-            var folder = File.new_for_uri (uri).get_parent ();
+            var folder = File.new_for_uri (destination_uri).get_parent ();
             bool can_write;
             uint64 free_space;
             try {
@@ -343,18 +417,19 @@ namespace Midori {
                 string detailed_message;
                 if (!can_write) {
                     message = _("The file \"%s\" can't be saved in this folder.").printf (
-                        Path.get_basename (uri));
+                        Midori.Download.get_basename_for_display (destination_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));
+                        Midori.Download.get_basename_for_display (destination_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);
+                if (!quiet)
+                    Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
                 return false;
             }
 #endif
index c84ee377991ee2454f791ac858015354f99938a5..87f01259192dba3486fd482b6652acc08f7b63f4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
  Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
 
  This library is free software; you can redistribute it and/or
@@ -554,13 +554,19 @@ midori_extension_load_from_folder (MidoriApp* app,
 
     if (activate)
     {
+        /* FIXME need proper stock extension mechanism */
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libapps." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libdelayed-load." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libabout." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libtabby." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libopen-with." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libflummi." G_MODULE_SUFFIX, activate));
+
         gint i = 0;
         const gchar* filename;
         while (keys && (filename = keys[i++]))
             midori_extension_activate_gracefully (app, extension_path, filename, activate);
-        /* FIXME need proper stock extension mechanism */
-        GObject* extension = midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate);
-        g_assert (extension != NULL);
     }
     else
     {
@@ -672,10 +678,15 @@ midori_extension_add_to_list (MidoriApp*       app,
     if (katze_array_get_item_index (extensions, extension) >= 0)
         return;
     /* FIXME need proper stock extension mechanism */
-    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX))
-        return;
+    if (strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
+     && strcmp (filename, "libapps." G_MODULE_SUFFIX)
+     && strcmp (filename, "libdelayed-load." G_MODULE_SUFFIX)
+     && strcmp (filename, "libabout." G_MODULE_SUFFIX)
+     && strcmp (filename, "libtabby." G_MODULE_SUFFIX)
+     && strcmp (filename, "libopen-with." G_MODULE_SUFFIX)
+     && strcmp (filename, "libflummi." G_MODULE_SUFFIX))
+        katze_array_add_item (extensions, extension);
 
-    katze_array_add_item (extensions, extension);
     g_object_unref (extensions);
 
     if (midori_paths_is_readonly ())
@@ -684,7 +695,9 @@ midori_extension_add_to_list (MidoriApp*       app,
     /* Signal that we want the extension to load and save */
     if (midori_extension_is_prepared (extension))
     {
+        /* This is a sensible check but makes unit testing hard
         g_warn_if_fail (extension->priv->config_dir == NULL);
+         */
         extension->priv->config_dir = midori_paths_get_extension_config_dir (filename);
     }
 }
index 5cf666b462a24a9e34f5dc009467e36f5f5c4195..dcb2649eaedf7ff920c6a575f0b4ae1431d3445e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
index d021307d9d7d3baad5b93c0dea07e5e3b2bfe600..89bbdd420a3d390419e2161a2f22c56bfd334347 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -10,7 +10,7 @@
 */
 
 #include "midori-array.h"
-#include "midori-bookmarks.h"
+#include "midori-bookmarks-db.h"
 #include "midori-history.h"
 #include "midori-preferences.h"
 #include "midori-privatedata.h"
@@ -36,39 +36,57 @@ midori_frontend_browser_new_window_cb (MidoriBrowser* browser,
     return new_browser;
 }
 
+static void
+midori_browser_privacy_preferences_cb (MidoriBrowser*    browser,
+                                       KatzePreferences* preferences,
+                                       gpointer          user_data)
+{
+    MidoriWebSettings* settings = midori_browser_get_settings (browser);
+    midori_preferences_add_privacy_category (preferences, settings);
+}
+
 MidoriBrowser*
-midori_web_app_new (const gchar* config,
-                    const gchar* webapp,
+midori_web_app_new (const gchar* webapp,
                     gchar**      open_uris,
                     gchar**      execute_commands,
                     gint         inactivity_reset,
                     const gchar* block_uris)
 {
     guint i;
+    g_return_val_if_fail (webapp != NULL, NULL);
+
+    midori_paths_init (MIDORI_RUNTIME_MODE_APP, webapp);
+    /*
+       Set sanitized URI as class name which .desktop files use as StartupWMClass
+       So dock type launchers can distinguish different apps with the same executable
+     */
+    gchar* wm_class = g_strdelimit (g_strdup (webapp), ":.\\/", '_');
+    gdk_set_program_class (wm_class);
+    g_free (wm_class);
 
-    midori_paths_init (MIDORI_RUNTIME_MODE_APP, config);
-#ifndef HAVE_WEBKIT2
-    g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1);
-#endif
     MidoriBrowser* browser = midori_browser_new ();
     g_signal_connect (browser, "new-window",
         G_CALLBACK (midori_frontend_browser_new_window_cb), NULL);
+    g_signal_connect (browser, "show-preferences",
+        G_CALLBACK (midori_browser_privacy_preferences_cb), NULL);
 
     midori_browser_set_action_visible (browser, "Menubar", FALSE);
     midori_browser_set_action_visible (browser, "CompactMenu", FALSE);
+    midori_browser_set_action_visible (browser, "AddSpeedDial", FALSE);
+    midori_browser_set_action_visible (browser, "Navigationbar", FALSE);
 
-    MidoriWebSettings* settings = midori_browser_get_settings (browser);
+    MidoriWebSettings* settings = midori_settings_new_full (NULL);
     g_object_set (settings,
                   "show-menubar", FALSE,
                   "show-navigationbar", FALSE,
-                  "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage",
+                  "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage,Preferences",
                   "show-statusbar", FALSE,
                   "show-panel", FALSE,
                   "last-window-state", MIDORI_WINDOW_NORMAL,
                   "inactivity-reset", inactivity_reset,
                   "block-uris", block_uris,
                   NULL);
-    midori_load_soup_session (settings);
+    midori_load_soup_session_full (settings);
 
     KatzeArray* search_engines = midori_search_engines_new_from_folder (NULL);
     g_object_set (browser,
@@ -101,6 +119,7 @@ midori_web_app_new (const gchar* config,
         midori_browser_assert_action (browser, execute_commands[i]);
         midori_browser_activate_action (browser, execute_commands[i]);
     }
+    midori_session_persistent_settings (settings, NULL);
     return browser;
 }
 
@@ -172,9 +191,7 @@ midori_private_app_new (const gchar* config,
                   "enable-offline-web-application-cache", FALSE,
     /* Arguably DNS prefetching is or isn't a privacy concern. For the
      * lack of more fine-grained control we'll go the safe route. */
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
                   "enable-dns-prefetching", FALSE,
-    #endif
                   "strip-referer", TRUE,
                   "show-panel", FALSE,
                   "last-window-state", MIDORI_WINDOW_NORMAL,
@@ -200,7 +217,7 @@ midori_private_app_new (const gchar* config,
 
     midori_browser_set_action_visible (browser, "Tools", FALSE);
     midori_browser_set_action_visible (browser, "ClearPrivateData", FALSE);
-    midori_browser_set_action_visible (browser, "Panel", FALSE);
+    midori_browser_set_action_visible (browser, "AddSpeedDial", FALSE);
     #if GTK_CHECK_VERSION (3, 0, 0)
     g_object_set (gtk_widget_get_settings (GTK_WIDGET (browser)),
                   "gtk-application-prefer-dark-theme", TRUE,
@@ -233,6 +250,8 @@ midori_private_app_new (const gchar* config,
 
     /* FIXME need proper stock extension mechanism */
     midori_browser_activate_action (browser, "libtransfers." G_MODULE_SUFFIX "=true");
+    midori_browser_activate_action (browser, "libabout." G_MODULE_SUFFIX "=true");
+    midori_browser_activate_action (browser, "libopen-with." G_MODULE_SUFFIX "=true");
     g_assert (g_module_error () == NULL);
 
     return browser;
@@ -246,15 +265,6 @@ midori_browser_show_preferences_cb (MidoriBrowser*    browser,
     midori_preferences_add_extension_category (preferences, app);
 }
 
-static void
-midori_browser_privacy_preferences_cb (MidoriBrowser*    browser,
-                                       KatzePreferences* preferences,
-                                       MidoriApp*        app)
-{
-    MidoriWebSettings* settings = midori_browser_get_settings (browser);
-    midori_preferences_add_privacy_category (preferences, settings);
-}
-
 static void
 midori_app_add_browser_cb (MidoriApp*     app,
                            MidoriBrowser* browser,
@@ -273,7 +283,7 @@ midori_app_add_browser_cb (MidoriApp*     app,
 
     /* Extensions */
     g_signal_connect (browser, "show-preferences",
-        G_CALLBACK (midori_browser_privacy_preferences_cb), app);
+        G_CALLBACK (midori_browser_privacy_preferences_cb), NULL);
     g_signal_connect (browser, "show-preferences",
         G_CALLBACK (midori_browser_show_preferences_cb), app);
 
@@ -304,7 +314,7 @@ midori_frontend_crash_log_cb (GtkWidget* button,
                               gchar*     crash_log)
 {
     GError* error = NULL;
-    if (!sokoke_show_uri (gtk_widget_get_screen (button), crash_log, 0, &error))
+    if (!gtk_show_uri (gtk_widget_get_screen (button), crash_log, 0, &error))
     {
         sokoke_message_dialog (GTK_MESSAGE_ERROR,
                                _("Could not run external program."),
@@ -320,7 +330,7 @@ midori_frontend_debugger_cb (GtkWidget* button,
     gtk_dialog_response (dialog, GTK_RESPONSE_HELP);
 }
 
-static MidoriStartup
+static gint
 midori_frontend_diagnostic_dialog (MidoriApp*         app,
                                    MidoriWebSettings* settings,
                                    KatzeArray*        session)
@@ -341,7 +351,7 @@ midori_frontend_diagnostic_dialog (MidoriApp*         app,
     gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ());
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
     align = gtk_alignment_new (0.5, 0.5, 0.5, 0.5);
-    gtk_container_add (GTK_CONTAINER (content_area), align);
+    gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
     box = gtk_hbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (align), box);
     button = gtk_button_new_with_mnemonic (_("Modify _preferences"));
@@ -359,7 +369,7 @@ midori_frontend_diagnostic_dialog (MidoriApp*         app,
     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_box_pack_start (GTK_BOX (content_area), button, FALSE, TRUE, 0);
     gtk_container_set_focus_child (GTK_CONTAINER (dialog), gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
     gtk_dialog_add_buttons (GTK_DIALOG (dialog),
         _("Discard old tabs"), MIDORI_STARTUP_BLANK_PAGE,
@@ -370,12 +380,12 @@ midori_frontend_diagnostic_dialog (MidoriApp*         app,
     gchar* crash_log = g_build_filename (midori_paths_get_runtime_dir (), "gdb.bt", NULL);
     if (g_access (crash_log, F_OK) == 0)
     {
-        GtkWidget* button = gtk_button_new_with_mnemonic (_("Show last crash _log"));
-        g_signal_connect_data (button, "clicked",
+        GtkWidget* log_button = gtk_button_new_with_mnemonic (_("Show last crash _log"));
+        g_signal_connect_data (log_button, "clicked",
             G_CALLBACK (midori_frontend_crash_log_cb), crash_log,
             (GClosureNotify)g_free, 0);
-        gtk_widget_show (button);
-        gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4);
+        gtk_widget_show (log_button);
+        gtk_box_pack_start (GTK_BOX (box), log_button, FALSE, FALSE, 4);
     }
     else
         g_free (crash_log);
@@ -383,11 +393,11 @@ midori_frontend_diagnostic_dialog (MidoriApp*         app,
     gchar* gdb = g_find_program_in_path ("gdb");
     if (gdb != NULL)
     {
-        GtkWidget* button = gtk_button_new_with_mnemonic (_("Run in _debugger"));
+        GtkWidget* gdb_button = gtk_button_new_with_mnemonic (_("Run in _debugger"));
         g_signal_connect (button, "clicked",
             G_CALLBACK (midori_frontend_debugger_cb), dialog);
-        gtk_widget_show (button);
-        gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4);
+        gtk_widget_show (gdb_button);
+        gtk_box_pack_start (GTK_BOX (box), gdb_button, FALSE, FALSE, 4);
     }
     gtk_dialog_set_default_response (GTK_DIALOG (dialog),
         load_on_startup == MIDORI_STARTUP_HOMEPAGE
@@ -426,7 +436,6 @@ MidoriApp*
 midori_normal_app_new (const gchar* config,
                        gchar*       nickname,
                        gboolean     diagnostic_dialog,
-                       const gchar* webapp,
                        gchar**      open_uris,
                        gchar**      execute_commands,
                        gint         inactivity_reset,
@@ -442,17 +451,21 @@ midori_normal_app_new (const gchar* config,
     MidoriApp* app = midori_app_new (nickname);
     if (midori_app_instance_is_running (app))
     {
+        /* midori_debug makes no sense on a running instance */
+        if (g_getenv ("MIDORI_DEBUG"))
+            g_warning ("MIDORI_DEBUG only works for a new instance");
+
         /* It makes no sense to show a crash dialog while running */
         if (!diagnostic_dialog)
         {
-            gboolean success = FALSE;
-            if (execute_commands != NULL && midori_app_send_command (app, execute_commands))
-                success = TRUE;
-            if (open_uris != NULL && midori_app_instance_send_uris (app, open_uris))
-                success = TRUE;
-            if (!execute_commands && !open_uris && midori_app_instance_send_new_browser (app))
-                success = TRUE;
-            if (success)
+            if (execute_commands != NULL)
+                midori_app_send_command (app, execute_commands);
+            if (open_uris != NULL)
+                midori_app_instance_send_uris (app, open_uris);
+            if (!execute_commands && !open_uris)
+                midori_app_instance_send_new_browser (app);
+
+            if (g_application_get_is_registered (G_APPLICATION (app)))
                 return NULL;
         }
 
@@ -468,7 +481,11 @@ midori_normal_app_new (const gchar* config,
     gchar** extensions;
     MidoriWebSettings* settings = midori_settings_new_full (&extensions);
     g_object_set (settings,
+#ifdef G_OS_WIN32
+                  "enable-developer-extras", FALSE,
+#else
                   "enable-developer-extras", TRUE,
+#endif
                   "enable-html5-database", TRUE,
                   "block-uris", block_uris,
                   NULL);
@@ -486,9 +503,9 @@ midori_normal_app_new (const gchar* config,
     }
     g_free (uri);
 
-    KatzeArray* bookmarks;
+    MidoriBookmarksDb* bookmarks;
     gchar* errmsg = NULL;
-    if (!(bookmarks = midori_bookmarks_new (&errmsg)))
+    if (!(bookmarks = midori_bookmarks_db_new (&errmsg)))
     {
         g_string_append_printf (error_messages,
             _("Bookmarks couldn't be loaded: %s\n"), errmsg);
@@ -567,10 +584,13 @@ midori_normal_app_new (const gchar* config,
      && open_uris && !execute_commands)
      || diagnostic_dialog)
     {
-        load_on_startup = midori_frontend_diagnostic_dialog (app, settings, session);
-        if (load_on_startup == G_MAXINT)
+        gint response = midori_frontend_diagnostic_dialog (app, settings, session);
+        if (response == G_MAXINT)
             return NULL;
+        load_on_startup = response;
     }
+    katze_item_set_parent (KATZE_ITEM (session), NULL);
+    g_object_unref (session);
     g_object_set_data (G_OBJECT (settings), "load-on-startup", GINT_TO_POINTER (load_on_startup));
 
     g_object_set (app, "settings", settings,
@@ -583,9 +603,10 @@ midori_normal_app_new (const gchar* config,
     g_signal_connect (app, "add-browser",
         G_CALLBACK (midori_app_add_browser_cb), NULL);
 
+    midori_session_persistent_settings (settings, app);
+
     g_idle_add (midori_load_soup_session_full, settings);
     g_idle_add (midori_load_extensions, app);
-    g_idle_add (midori_load_session, session);
     return app;
 }
 
@@ -593,18 +614,13 @@ void
 midori_normal_app_on_quit (MidoriApp* app)
 {
     MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-    KatzeArray* bookmarks = katze_object_get_object (app, "bookmarks");
+    MidoriBookmarksDb* bookmarks = katze_object_get_object (app, "bookmarks");
     KatzeArray* history = katze_object_get_object (app, "history");
 
     g_object_notify (G_OBJECT (settings), "load-on-startup");
-    midori_bookmarks_on_quit (bookmarks);
+    midori_bookmarks_db_on_quit (bookmarks);
     midori_history_on_quit (history, settings);
     midori_private_data_on_quit (settings);
-    /* Removing KatzeHttpCookies makes it save outstanding changes */
-#ifndef HAVE_WEBKIT2
-    soup_session_remove_feature_by_type (webkit_get_default_session (),
-                                         KATZE_TYPE_HTTP_COOKIES);
-#endif
 
     MidoriStartup load_on_startup = katze_object_get_int (settings, "load-on-startup");
     if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES)
index 05c90bd2053b7b295531dc85dd57fd8b8c8eff9d..510535779ab9c6488458ec6c2419e57ba0601436 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,7 @@
 #include "midori/midori-app.h"
 
 MidoriBrowser*
-midori_web_app_new (const gchar* config,
-                    const gchar* webapp,
+midori_web_app_new (const gchar* webapp,
                     gchar**      open_uris,
                     gchar**      execute_commands,
                     gint         inactivity_reset,
@@ -34,7 +33,6 @@ MidoriApp*
 midori_normal_app_new (const gchar* config,
                        gchar*       nickname,
                        gboolean     diagnostic_dialog,
-                       const gchar* webapp,
                        gchar**      open_uris,
                        gchar**      execute_commands,
                        gint         inactivity_reset,
index 56599d952da279a6c0d3d87794348d4f8e782b53..bb717747fc595f45737b4e4ae8de076050f4a2c0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -18,86 +18,39 @@ static void
 midori_history_clear_cb (KatzeArray* array,
                          sqlite3*    db)
 {
-    char* errmsg = NULL;
-    if (sqlite3_exec (db, "DELETE FROM history; DELETE FROM search",
-                      NULL, NULL, &errmsg) != SQLITE_OK)
+    GError* error = NULL;
+    MidoriHistoryDatabase* database = midori_history_database_new (NULL, &error);
+    if (error == NULL)
+        midori_history_database_clear (database, 0, &error);
+    if (error != NULL)
     {
-        g_printerr (_("Failed to clear history: %s\n"), errmsg);
-        sqlite3_free (errmsg);
+        g_printerr (_("Failed to clear history: %s\n"), error->message);
+        g_error_free (error);
     }
+    g_object_unref (database);
 }
 
 KatzeArray*
 midori_history_new (char** errmsg)
 {
-    gchar* filename;
+    MidoriHistoryDatabase* database;
+    GError* error = NULL;
     sqlite3* db;
-    gboolean has_day = FALSE;
-    sqlite3_stmt* stmt;
-    gint result;
-    gchar* sql;
-    gchar* bookmarks_filename;
     KatzeArray* array;
 
     g_return_val_if_fail (errmsg != NULL, NULL);
 
-    filename = midori_paths_get_config_filename_for_writing ("history.db");
-    if (sqlite3_open (filename, &db) != SQLITE_OK)
+    database = midori_history_database_new (NULL, &error);
+    if (error != NULL)
     {
-        *errmsg = g_strdup_printf (_("Failed to open database: %s\n"),
-            db ? sqlite3_errmsg (db) : "(db = NULL)");
-        g_free (filename);
-        sqlite3_close (db);
+        *errmsg = g_strdup (error->message);
+        g_error_free (error);
         return NULL;
     }
-    g_free (filename);
 
-    if (sqlite3_exec (db,
-        "PRAGMA journal_mode = WAL; PRAGMA cache_size = 32100;",
-        NULL, NULL, errmsg) != SQLITE_OK)
-        sqlite3_exec (db, "PRAGMA journal_mode = TRUNCATE;", NULL, NULL, errmsg);
-    sqlite3_exec (db,
-        "PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;",
-        NULL, NULL, errmsg);
-    if (*errmsg)
-    {
-        g_warning ("Failed to set journal mode: %s", *errmsg);
-        sqlite3_free (*errmsg);
-    }
-    if (sqlite3_exec (db,
-                      "CREATE TABLE IF NOT EXISTS "
-                      "history (uri text, title text, date integer, day integer);"
-                      "CREATE TABLE IF NOT EXISTS "
-                      "search (keywords text, uri text, day integer);",
-                      NULL, NULL, errmsg) != SQLITE_OK)
-        return NULL;
-
-    sqlite3_prepare_v2 (db, "SELECT day FROM history LIMIT 1", -1, &stmt, NULL);
-    result = sqlite3_step (stmt);
-    if (result == SQLITE_ROW)
-        has_day = TRUE;
-    sqlite3_finalize (stmt);
-
-    if (!has_day)
-        sqlite3_exec (db,
-                      "BEGIN TRANSACTION;"
-                      "CREATE TEMPORARY TABLE backup (uri text, title text, date integer);"
-                      "INSERT INTO backup SELECT uri,title,date FROM history;"
-                      "DROP TABLE history;"
-                      "CREATE TABLE history (uri text, title text, date integer, day integer);"
-                      "INSERT INTO history SELECT uri,title,date,"
-                      "julianday(date(date,'unixepoch','start of day','+1 day'))"
-                      " - julianday('0001-01-01','start of day')"
-                      "FROM backup;"
-                      "DROP TABLE backup;"
-                      "COMMIT;",
-                      NULL, NULL, errmsg);
+    db = midori_database_get_db (MIDORI_DATABASE (database));
+    g_return_val_if_fail (db != NULL, NULL);
 
-    bookmarks_filename = midori_paths_get_config_filename_for_writing ("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);
     array = katze_array_new (KATZE_TYPE_ARRAY);
     g_object_set_data (G_OBJECT (array), "db", db);
     g_signal_connect (array, "clear",
@@ -110,19 +63,16 @@ midori_history_on_quit (KatzeArray*        array,
                         MidoriWebSettings* settings)
 {
     gint max_history_age = katze_object_get_int (settings, "maximum-history-age");
-    sqlite3* db = g_object_get_data (G_OBJECT (array), "db");
-    char* errmsg = NULL;
-    gchar* sqlcmd = g_strdup_printf (
-        "DELETE FROM history WHERE "
-        "(julianday(date('now')) - julianday(date(date,'unixepoch')))"
-        " >= %d", max_history_age);
-    if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
+    GError* error = NULL;
+    MidoriHistoryDatabase* database = midori_history_database_new (NULL, &error);
+    if (error == NULL)
+        midori_history_database_clear (database, max_history_age, &error);
+    if (error != NULL)
     {
         /* i18n: Couldn't remove items that are older than n days */
-        g_printerr (_("Failed to remove old history items: %s\n"), errmsg);
-        sqlite3_free (errmsg);
+        g_printerr (_("Failed to remove old history items: %s\n"), error->message);
+        g_error_free (error);
     }
-    g_free (sqlcmd);
-    sqlite3_close (db);
+    g_object_unref (database);
 }
 
index 9098accf065a83574336e2c981af09cd811bd797..ee5b1721431986ea3dbd4230bdad23031637e246 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
index a00c535b11336aab300c04063fd1527fd36a8a68..27926b03b30c619f6b59606b81540ae1046ff135 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
 
 namespace Midori {
     public class HistoryCompletion : Completion {
-        unowned Sqlite.Database db;
+        public HistoryDatabase? database = null;
 
         public HistoryCompletion () {
-            GLib.Object (description: _("History"));
+            GLib.Object (description: _("Bookmarks and History"));
         }
 
         public override void prepare (GLib.Object app) {
-            GLib.Object history;
-            app.get ("history", out history);
-            return_if_fail (history != null);
-            db = history.get_data<Sqlite.Database?> ("db");
-            return_if_fail (db != null);
+            try {
+                database = new HistoryDatabase (app);
+            }
+            catch (Error error) {
+                warning (error.message);
+            }
         }
 
         public override bool can_complete (string text) {
-            return db != null;
+            return database != null;
         }
 
         public override bool can_action (string action) {
@@ -34,71 +35,26 @@ namespace Midori {
         }
 
         public override async List<Suggestion>? complete (string text, string? action, Cancellable cancellable) {
-            return_val_if_fail (db != null, null);
-
-            Sqlite.Statement stmt;
-            unowned string sqlcmd = """
-                SELECT type, uri, title FROM (
-                SELECT 1 AS type, uri, title, count() AS ct FROM history
-                WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri
-                UNION ALL
-                SELECT 2 AS type, replace(uri, '%s', keywords) AS uri,
-                       keywords AS title, count() AS ct FROM search
-                WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri
-                UNION ALL
-                SELECT 1 AS type, uri, title, 50 AS ct FROM bookmarks
-                WHERE title LIKE ?1 OR uri LIKE ?1 AND uri !=''
-                ) GROUP BY uri ORDER BY ct DESC LIMIT ?2
-                """;
-            if (db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK) {
-                critical (_("Failed to initialize history: %s"), db.errmsg ());
-                return null;
-            }
-
-            string query = "%" + text.replace (" ", "%") + "%";
-            stmt.bind_text (1, query);
-            stmt.bind_int64 (2, max_items);
+            return_val_if_fail (database != null, null);
 
-            int result = stmt.step ();
-            if (result != Sqlite.ROW) {
-                if (result == Sqlite.ERROR)
-                    critical (_("Failed to select from history: %s"), db.errmsg ());
+            List<HistoryItem> items = yield database.list_by_count_with_bookmarks (text, max_items, cancellable);
+            if (items == null)
                 return null;
-            }
 
             var suggestions = new List<Suggestion> ();
-            while (result == Sqlite.ROW) {
-                int64 type = stmt.column_int64 (0);
-                unowned string uri = stmt.column_text (1);
-                unowned string title = stmt.column_text (2);
-                Gdk.Pixbuf? icon = Midori.Paths.get_icon (uri, null);
-                Suggestion suggestion;
-
-                switch (type) {
-                    case 1: /* history_view */
-                        suggestion = new Suggestion (uri, title, false, null, icon);
-                        suggestions.append (suggestion);
-                        break;
-                    case 2: /* search_view */
-                        string desc = _("Search for %s").printf (title) + "\n" + uri;
-                        /* FIXME: Theming? Win32? */
-                        string background = "gray";
-                        suggestion = new Suggestion (uri, desc, false, background, icon);
-                        suggestions.append (suggestion);
-                        break;
-                    default:
-                        warn_if_reached ();
-                        break;
+            foreach (var item in items) {
+                if (item is Midori.HistoryWebsite) {
+                    var website = item as Midori.HistoryWebsite;
+                    suggestions.append (new Suggestion (website.uri, website.title,
+                        true, null, yield Midori.URI.get_icon_fallback (website.uri, null, cancellable), this.position));
                 }
-
-                uint src = Idle.add (complete.callback);
-                yield;
-                Source.remove (src);
-
-                if (cancellable.is_cancelled ())
-                    return null;
-
-                result = stmt.step ();
+                else if (item is Midori.HistorySearch) {
+                    var search = item as Midori.HistorySearch;
+                    suggestions.append (new Suggestion (search.uri, search.title + "\n" + search.uri,
+                        false, "gray", yield Midori.URI.get_icon_fallback (search.uri, null, cancellable), this.position));
+                }
+                else
+                    warn_if_reached ();
             }
 
             if (cancellable.is_cancelled ())
diff --git a/midori/midori-historydatabase.vala b/midori/midori-historydatabase.vala
new file mode 100644 (file)
index 0000000..94b9f0e
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ Copyright (C) 2013 Christian Dywan <christian@twotoats.de>
+
+ 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 HistoryWebsite : HistoryItem {
+        public string uri { get; set; }
+        public HistoryWebsite (string uri, string? title, int64 date) {
+            GLib.Object (uri: uri,
+                         title: title,
+                         date: date);
+        }
+    }
+
+    public class HistorySearch : HistoryItem {
+        public string uri { get; set; }
+        public string keywords { get; set; }
+        public HistorySearch (string uri, string keywords, int64 date) {
+            GLib.Object (uri: uri,
+                         keywords: keywords,
+                         title: _("Search for %s").printf (keywords),
+                         date: date);
+        }
+    }
+
+    public class HistoryItem : GLib.Object {
+        public string? title { get; set; }
+        public int64 date { get; set; }
+    }
+
+    public class HistoryDatabase : Midori.Database {
+        public HistoryDatabase (GLib.Object? app) throws DatabaseError {
+            Object (path: "history.db");
+            init ();
+            Midori.BookmarksDatabase bookmarks_database = new Midori.BookmarksDatabase ();
+            attach (bookmarks_database.path, "bookmarks");
+
+            try {
+                exec ("SELECT day FROM history LIMIT 1");
+            } catch (Error error) {
+                exec_script ("Day");
+            }
+        }
+
+        public async List<HistoryItem>? query (string sqlcmd, string? filter, int64 day, int64 max_items, Cancellable cancellable) {
+            return_val_if_fail (db != null, null);
+
+            Midori.DatabaseStatement statement;
+
+            try {
+                string real_filter = "%" + filter.replace (" ", "%") + "%";
+                statement = prepare (sqlcmd,
+                    ":filter", typeof (string), real_filter,
+                    ":limit", typeof (int64), max_items);
+            } catch (Error error) {
+                critical (_("Failed to select from history: %s"), error.message);
+                return null;
+            }
+
+            var items = new List<HistoryItem> ();
+            try {
+                while (statement.step ()) {
+                    int64 type = statement.get_int64 ("type");
+                    int64 date = statement.get_int64 ("date");
+                    switch (type) {
+                        case 1:
+                            string uri = statement.get_string ("uri");
+                            string title = statement.get_string ("title");
+                            items.append (new HistoryWebsite (uri, title, date));
+                            break;
+                        case 2:
+                            string uri = statement.get_string ("uri");
+                            string title = statement.get_string ("title");
+                            items.append (new HistorySearch (uri, title, date));
+                            break;
+                        default:
+                            warn_if_reached ();
+                            break;
+                    }
+
+                    uint src = Idle.add (query.callback);
+                    yield;
+                    Source.remove (src);
+
+                    if (cancellable.is_cancelled ())
+                        return null;
+                }
+            } catch (Error error) {
+                critical (_("Failed to select from history: %s"), error.message);
+            }
+
+            if (cancellable.is_cancelled ())
+                return null;
+            return items;
+        }
+
+        public async List<HistoryItem>? list_by_count_with_bookmarks (string? filter, int max_items, Cancellable cancellable) {
+            unowned string sqlcmd = """
+                SELECT type, date, uri, title FROM (
+                SELECT 1 AS type, date, uri, title, count() AS ct FROM history
+                WHERE uri LIKE :filter OR title LIKE :filter GROUP BY uri
+                UNION ALL
+                SELECT 2 AS type, day AS date, replace(uri, '%s', keywords) AS uri,
+                       keywords AS title, count() AS ct FROM search
+                WHERE uri LIKE :filter OR title LIKE :filter GROUP BY uri
+                UNION ALL
+                SELECT 1 AS type, last_visit AS date, uri, title, 50 AS ct FROM bookmarks
+                WHERE title LIKE :filter OR uri LIKE :filter AND uri !='' AND uri NOT LIKE 'javascript:%'
+                ) GROUP BY uri ORDER BY ct DESC LIMIT :limit
+                """;
+            return yield query (sqlcmd, filter, 0, max_items, cancellable);
+        }
+
+        public bool insert (string uri, string title, int64 date, int64 day) throws DatabaseError {
+            unowned string sqlcmd = "INSERT INTO history (uri, title, date, day) VALUES (:uri, :title, :date, :day)";
+            var statement = prepare (sqlcmd,
+                ":uri", typeof (string), uri,
+                ":title", typeof (string), title,
+                ":date", typeof (int64), date,
+                ":day", typeof (int64), day);
+            return statement.exec ();
+        }
+
+        public bool clear (int64 maximum_age=0) throws DatabaseError {
+            unowned string sqlcmd = """
+                DELETE FROM history WHERE
+                (julianday(date('now')) - julianday(date(date,'unixepoch')))
+                >= :maximum_age;
+                DELETE FROM search WHERE
+                (julianday(date('now')) - julianday(date(date,'unixepoch')))
+                >= :maximum_age;
+                """;
+            var statement = prepare (sqlcmd,
+                ":maximum_age", typeof (int64), maximum_age);
+            return statement.exec ();
+        }
+   }
+}
index 01bda95ae5ec3043b6e2b7195ada857c1819d1a5..bc635f1059648468c5d30f01320f9250aa132a11 100644 (file)
@@ -30,10 +30,13 @@ struct _MidoriLocationAction
 {
     GtkAction parent_instance;
 
+    GIcon* icon;
     gchar* text;
     KatzeArray* search_engines;
     gdouble progress;
     gchar* secondary_icon;
+    gchar* tooltip;
+    gchar* placeholder;
 
     gchar* key;
     MidoriAutocompleter* autocompleter;
@@ -58,7 +61,8 @@ enum
 
     PROP_PROGRESS,
     PROP_SECONDARY_ICON,
-    PROP_HISTORY
+    PROP_HISTORY,
+    PROP_PLACEHOLDER_TEXT
 };
 
 enum
@@ -69,6 +73,7 @@ enum
     SECONDARY_ICON_RELEASED,
     RESET_URI,
     SUBMIT_URI,
+    KEY_PRESS_EVENT,
     LAST_SIGNAL
 };
 
@@ -106,6 +111,11 @@ midori_location_action_disconnect_proxy (GtkAction* action,
 static void
 midori_location_action_popdown_completion (MidoriLocationAction* location_action);
 
+extern GtkMenu* 
+midori_search_action_get_menu (GtkWidget* entry,
+                               MidoriSearchAction *search_action,
+                               void (*change_cb)(GtkWidget*, MidoriSearchAction*));
+
 static void
 midori_location_action_class_init (MidoriLocationActionClass* class)
 {
@@ -176,6 +186,23 @@ midori_location_action_class_init (MidoriLocationActionClass* class)
                                         G_TYPE_STRING,
                                         G_TYPE_BOOLEAN);
 
+    /**
+     * MidoriLocationAction:key-press-event:
+     *
+     * A key (combination) was pressed in an entry of the action.
+     *
+     * Since 0.5.8
+     */
+    signals[KEY_PRESS_EVENT] = g_signal_new ("key-press-event",
+                                             G_TYPE_FROM_CLASS (class),
+                                             (GSignalFlags) (G_SIGNAL_RUN_LAST),
+                                             0,
+                                             0,
+                                             NULL,
+                                             midori_cclosure_marshal_BOOLEAN__POINTER,
+                                             G_TYPE_BOOLEAN, 1,
+                                             GDK_TYPE_EVENT);
+
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = midori_location_action_finalize;
     gobject_class->set_property = midori_location_action_set_property;
@@ -222,6 +249,20 @@ midori_location_action_class_init (MidoriLocationActionClass* class)
                                      "The list of history items",
                                      KATZE_TYPE_ARRAY,
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /**
+     * MidoriLocationAction:placeholder-text:
+     *
+     * Hint displayed if entry text is empty.
+     */
+    g_object_class_install_property (gobject_class,
+                                     PROP_PLACEHOLDER_TEXT,
+                                     g_param_spec_string (
+                                     "placeholder-text",
+                                     "Placeholder Text",
+                                     "Hint displayed if entry text is empty",
+                                     NULL,
+                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 gchar*
@@ -342,7 +383,6 @@ midori_location_action_render_title (gchar**      keys,
     return desc_title;
 }
 
-#ifdef HAVE_GRANITE
 static void
 midori_location_entry_render_title_cb (GtkCellLayout*   layout,
                                        GtkCellRenderer* renderer,
@@ -352,12 +392,10 @@ midori_location_entry_render_title_cb (GtkCellLayout*   layout,
 {
     MidoriLocationAction* action = data;
     gchar* title;
-    gchar* background;
     gchar* desc;
 
     gtk_tree_model_get (model, iter,
         MIDORI_AUTOCOMPLETER_COLUMNS_MARKUP, &title,
-        MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, &background,
         -1);
 
     if (strchr (title, '\n')) /* A search engine or action suggestion */
@@ -365,7 +403,6 @@ midori_location_entry_render_title_cb (GtkCellLayout*   layout,
         gchar** parts = g_strsplit (title, "\n", 2);
         desc = g_strdup (parts[0]);
         g_strfreev (parts);
-        g_free (background);
     }
     else
     {
@@ -392,13 +429,11 @@ midori_location_entry_render_uri_cb (GtkCellLayout*   layout,
     MidoriLocationAction* action = data;
     gchar* title;
     gchar* uri_escaped;
-    gchar* background;
     gchar* desc;
 
     gtk_tree_model_get (model, iter,
         MIDORI_AUTOCOMPLETER_COLUMNS_MARKUP, &title,
         MIDORI_AUTOCOMPLETER_COLUMNS_URI, &uri_escaped,
-        MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, &background,
         -1);
 
     if (strchr (title, '\n')) /* A search engine or action suggestion */
@@ -406,7 +441,6 @@ midori_location_entry_render_uri_cb (GtkCellLayout*   layout,
         gchar** parts = g_strsplit (title, "\n", 2);
         desc = g_strdup (parts[1]);
         g_strfreev (parts);
-        g_free (background);
     }
     else
     {
@@ -423,53 +457,6 @@ midori_location_entry_render_uri_cb (GtkCellLayout*   layout,
     g_free (desc);
     g_free (title);
 }
-#else
-static void
-midori_location_entry_render_text_cb (GtkCellLayout*   layout,
-                                      GtkCellRenderer* renderer,
-                                      GtkTreeModel*    model,
-                                      GtkTreeIter*     iter,
-                                      gpointer         data)
-{
-    MidoriLocationAction* action = data;
-    gchar* uri_escaped;
-    gchar* title;
-    gchar* background;
-    gchar* desc;
-
-    gtk_tree_model_get (model, iter,
-        MIDORI_AUTOCOMPLETER_COLUMNS_URI, &uri_escaped,
-        MIDORI_AUTOCOMPLETER_COLUMNS_MARKUP, &title,
-        MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, &background,
-        -1);
-
-    if (strchr (title, '\n')) /* A search engine or action suggestion */
-    {
-        desc = title;
-        g_free (uri_escaped);
-        g_free (background);
-    }
-    else
-    {
-        gchar* key = g_utf8_strdown (action->key ? action->key : "", -1);
-        gchar** keys = g_strsplit_set (key, " %", -1);
-        g_free (key);
-        gchar* desc_uri = midori_location_action_render_uri (keys, uri_escaped);
-        gchar* desc_title = midori_location_action_render_title (keys, title);
-        desc = g_strdup_printf ("%s\n<span color='gray45'>%s</span>", desc_title, desc_uri);
-        g_free (uri_escaped);
-        g_free (title);
-        g_strfreev (keys);
-        g_free (desc_uri);
-        g_free (desc_title);
-    }
-
-    g_object_set (renderer, "markup", desc,
-        "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-    g_free (desc);
-}
-#endif
-
 
 static void
 midori_location_action_popup_position (MidoriLocationAction* action,
@@ -670,8 +657,10 @@ midori_location_action_popup_timeout_cb (gpointer data)
         g_object_unref (app);
         midori_autocompleter_add (action->autocompleter,
             MIDORI_COMPLETION (midori_view_completion_new ()));
-        midori_autocompleter_add (action->autocompleter,
-            MIDORI_COMPLETION (midori_history_completion_new ()));
+        /* FIXME: Currently HistoryCompletion doesn't work in memory */
+        if (action->history != NULL)
+            midori_autocompleter_add (action->autocompleter,
+                MIDORI_COMPLETION (midori_history_completion_new ()));
         midori_autocompleter_add (action->autocompleter,
             MIDORI_COMPLETION (midori_search_completion_new ()));
     }
@@ -723,20 +712,16 @@ midori_location_action_popup_timeout_cb (gpointer data)
         renderer = gtk_cell_renderer_pixbuf_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, FALSE);
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer,
-            "pixbuf", MIDORI_AUTOCOMPLETER_COLUMNS_ICON,
+            "gicon", MIDORI_AUTOCOMPLETER_COLUMNS_ICON,
+            "stock-size", MIDORI_AUTOCOMPLETER_COLUMNS_SIZE,
             "yalign", MIDORI_AUTOCOMPLETER_COLUMNS_YALIGN,
             "cell-background", MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND,
             NULL);
         renderer = gtk_cell_renderer_text_new ();
-        #ifdef HAVE_GRANITE
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, FALSE);
-        #else
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, TRUE);
-        #endif
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer,
             "cell-background", MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND,
             NULL);
-        #ifdef HAVE_GRANITE
         gtk_tree_view_column_set_expand (column, TRUE);
         gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer,
             midori_location_entry_render_title_cb, action, NULL);
@@ -747,14 +732,6 @@ midori_location_action_popup_timeout_cb (gpointer data)
             "cell-background", MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, NULL);
         gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer,
             midori_location_entry_render_uri_cb, action, NULL);
-        #else
-        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_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer,
-                                            midori_location_entry_render_text_cb,
-                                            action, NULL);
-        #endif
         gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
 
         action->popup = popup;
@@ -826,7 +803,11 @@ midori_location_action_finalize (GObject* object)
 {
     MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object);
 
+    katze_object_assign (location_action->icon, NULL);
     katze_assign (location_action->text, NULL);
+    katze_assign (location_action->secondary_icon, NULL);
+    katze_assign (location_action->tooltip, NULL);
+    katze_assign (location_action->placeholder, NULL);
     katze_object_assign (location_action->search_engines, NULL);
     katze_assign (location_action->autocompleter, NULL);
 
@@ -864,6 +845,9 @@ midori_location_action_set_property (GObject*      object,
         katze_assign (location_action->history, g_value_dup_object (value));
         break;
     }
+    case PROP_PLACEHOLDER_TEXT:
+        katze_assign (location_action->placeholder, g_strdup(g_value_get_string (value)));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -889,6 +873,9 @@ midori_location_action_get_property (GObject*    object,
     case PROP_HISTORY:
         g_value_set_object (value, location_action->history);
         break;
+    case PROP_PLACEHOLDER_TEXT:
+        g_value_set_string (value, location_action->placeholder);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -934,9 +921,21 @@ midori_location_action_entry_drag_data_get_cb (GtkWidget*        entry,
     }
 }
 
+static void
+midori_location_action_entry_set_secondary_icon (GtkEntry*    entry,
+                                                 const gchar* stock_id)
+{
+    GtkStockItem stock_item;
+    if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
+        gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, stock_id);
+    else
+        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, stock_id);
+}
+
 static GtkWidget*
 midori_location_action_create_tool_item (GtkAction* action)
 {
+    MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
     GtkWidget* toolitem;
     GtkWidget* alignment;
     GtkWidget* entry;
@@ -954,10 +953,17 @@ midori_location_action_create_tool_item (GtkAction* action)
     #if GTK_CHECK_VERSION (3, 6, 0)
     gtk_entry_set_input_purpose (GTK_ENTRY (entry), GTK_INPUT_PURPOSE_URL);
     #endif
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-         GTK_ICON_ENTRY_PRIMARY, TRUE);
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-         GTK_ICON_ENTRY_SECONDARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+         GTK_ENTRY_ICON_PRIMARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+         GTK_ENTRY_ICON_SECONDARY, TRUE);
+
+    if (location_action->text != NULL)
+        gtk_entry_set_text (GTK_ENTRY (entry), location_action->text);
+    midori_location_action_entry_set_secondary_icon (GTK_ENTRY (entry), location_action->secondary_icon);
+    gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, location_action->icon);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, location_action->tooltip);
+    gtk_entry_set_placeholder_text(GTK_ENTRY (entry), location_action->placeholder);
 
     targetlist = gtk_target_list_new (NULL, 0);
     gtk_target_list_add_uri_targets (targetlist, 0);
@@ -1031,6 +1037,11 @@ midori_location_action_key_press_event_cb (GtkEntry*    entry,
                                            GdkEventKey* event,
                                            GtkAction*   action)
 {
+    gboolean handled = FALSE;
+    g_signal_emit (action, signals[KEY_PRESS_EVENT], 0, event, &handled);
+    if (handled)
+        return TRUE;
+
     GtkWidget* widget = GTK_WIDGET (entry);
     MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
     const gchar* text;
@@ -1074,8 +1085,10 @@ midori_location_action_key_press_event_cb (GtkEntry*    entry,
         }
 
         if (is_enter && (text = gtk_entry_get_text (entry)) && *text)
+        {
             g_signal_emit (action, signals[SUBMIT_URI], 0, text,
                            MIDORI_MOD_NEW_TAB (event->state));
+        }
         break;
     case GDK_KEY_Escape:
     {
@@ -1244,7 +1257,6 @@ midori_location_action_key_press_event_cb (GtkEntry*    entry,
     return FALSE;
 }
 
-#if GTK_CHECK_VERSION (2, 19, 3)
 static void
 midori_location_action_preedit_changed_cb (GtkWidget*   entry,
                                            const gchar* preedit,
@@ -1254,7 +1266,6 @@ midori_location_action_preedit_changed_cb (GtkWidget*   entry,
     gchar* key = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
     midori_location_action_popup_completion (location_action, entry, key);
 }
-#endif
 
 static gboolean
 midori_location_action_focus_in_event_cb (GtkWidget*   widget,
@@ -1307,6 +1318,7 @@ midori_map_get_message (SoupMessage* message)
     return message;
 }
 #endif
+#endif
 
 #ifdef HAVE_GCR
 typedef enum {
@@ -1330,22 +1342,22 @@ midori_location_action_cert_response_cb (GtkWidget*      dialog,
     {
         /* FIXME: Would be nice if GcrCertificateExporter became public */
         gchar* filename = g_strconcat (peer, ".crt", NULL);
-        GtkWidget* dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Export certificate"),
+        GtkWidget* export_dialog = (GtkWidget*)midori_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);
+        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (export_dialog), TRUE);
+        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (export_dialog), filename);
         g_free (filename);
 
-        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+        if (gtk_dialog_run (GTK_DIALOG (export_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));
+            filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (export_dialog));
             g_file_set_contents (filename, data, n_data, NULL);
             g_free (filename);
         }
-        gtk_widget_destroy (dialog);
+        gtk_widget_destroy (export_dialog);
     }
     if (error != NULL)
     {
@@ -1353,7 +1365,62 @@ midori_location_action_cert_response_cb (GtkWidget*      dialog,
                    "granting" : "revoking", error->message);
         g_error_free (error);
     }
-    gtk_widget_destroy (dialog);
+    gtk_widget_hide (dialog);
+}
+
+#if GTK_CHECK_VERSION (3, 12, 0)
+static void
+midori_location_action_button_cb (GtkWidget* button,
+                                  GtkWidget* dialog)
+{
+    GcrCertificate* gcr_cert = g_object_get_data (G_OBJECT (dialog), "gcr-cert");
+    const gchar* label = gtk_button_get_label (GTK_BUTTON (button));
+    gint response;
+    if (!strcmp (label, _("_Don't trust this website")))
+        response = MIDORI_CERT_REVOKE;
+    else if (!strcmp (label, _("_Trust this website")))
+        response = MIDORI_CERT_TRUST;
+    else if (!strcmp (label, _("_Export certificate")))
+        response = MIDORI_CERT_EXPORT;
+    else
+        g_assert_not_reached ();
+    midori_location_action_cert_response_cb (dialog, response, gcr_cert);
+}
+#endif
+#endif
+
+#if GTK_CHECK_VERSION (3, 12, 0)
+static gboolean
+midori_location_action_popover_button_press_event_cb (GtkWidget*      widget,
+                                                      GdkEventButton* event,
+                                                      gpointer        user_data)
+{
+    return GDK_EVENT_STOP;
+}
+
+static gboolean
+midori_location_action_popover_button_release_event_cb (GtkWidget*      widget,
+                                                        GdkEventButton* event,
+                                                        gpointer        user_data)
+{
+    /* The default GtkPopOver button-press doesn't work with
+       GcrCertificateDetailsWidget and fails with an assertion:
+       gtk_widget_is_ancestor: assertion 'GTK_IS_WIDGET (widget)' */
+    GtkWidget* child = gtk_bin_get_child (GTK_BIN (widget));
+    GtkWidget* event_widget = gtk_get_event_widget ((GdkEvent*)event);
+    if (child && event->window == gtk_widget_get_window (widget))
+    {
+        GtkAllocation child_alloc;
+        gtk_widget_get_allocation (child, &child_alloc);
+        if (event->x < child_alloc.x ||
+         event->x > child_alloc.x + child_alloc.width ||
+         event->y < child_alloc.y ||
+         event->y > child_alloc.y + child_alloc.height)
+        gtk_widget_hide (widget);
+    }
+    else if (event_widget && !gtk_widget_is_ancestor (event_widget, widget))
+        gtk_widget_hide (widget);
+    return GDK_EVENT_STOP;
 }
 #endif
 
@@ -1408,15 +1475,40 @@ midori_location_action_show_page_info (GtkWidget* widget,
     #ifdef HAVE_GCR
     GByteArray* der_cert;
     GcrCertificate* gcr_cert;
-    GtkWidget* details;
 
     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 GTK_CHECK_VERSION (3, 0, 0)
+    GtkWidget* details;
     details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert);
     gtk_widget_show (details);
     gtk_container_add (GTK_CONTAINER (box), details);
+    #endif
+
+    #if GTK_CHECK_VERSION (3, 12, 0)
+    GtkWidget* button;
+    GtkWidget* actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_box_pack_start (GTK_BOX (box), actions, FALSE, FALSE, 0);
+    if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
+    {
+        button = gtk_button_new_with_mnemonic (_("_Don't trust this website"));
+        gtk_box_pack_start (GTK_BOX (actions), button, FALSE, FALSE, 0);
+        g_signal_connect (button, "clicked", G_CALLBACK (midori_location_action_button_cb), dialog);
+    }
+    else if (tls_flags > 0)
+    {
+        button = gtk_button_new_with_mnemonic (_("_Trust this website"));
+        gtk_box_pack_start (GTK_BOX (actions), button, FALSE, FALSE, 0);
+        g_signal_connect (button, "clicked", G_CALLBACK (midori_location_action_button_cb), dialog);
+    }
+    button = gtk_button_new_with_mnemonic (_("_Export certificate"));
+    g_signal_connect (button, "clicked", G_CALLBACK (midori_location_action_button_cb), dialog);
+    gtk_box_pack_end (GTK_BOX (actions), button, FALSE, FALSE, 0);
+    gtk_widget_show_all (actions);
+    #else
     if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
         gtk_dialog_add_buttons (GTK_DIALOG (dialog),
             ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL);
@@ -1426,16 +1518,18 @@ midori_location_action_show_page_info (GtkWidget* widget,
     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_signal_connect (dialog, "response",
+        G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
+    #endif
 
     g_object_set_data_full (G_OBJECT (gcr_cert), "peer", hostname, (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);
+    #endif
+
     /* 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
     if (!g_tls_certificate_get_issuer (tls_cert))
         gtk_box_pack_start (box, gtk_label_new (_("Self-signed")), FALSE, FALSE, 0);
 
@@ -1444,73 +1538,89 @@ midori_location_action_show_page_info (GtkWidget* widget,
         const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_flags);
         gtk_box_pack_start (box, gtk_label_new (tls_error), FALSE, FALSE, 0);
     }
-    #endif
 
     g_object_unref (tls_cert);
 }
-#endif
 
 static void
+midori_location_action_engine_activate_cb (GtkWidget*          menuitem,
+                                           MidoriSearchAction* search_action)
+{
+    KatzeItem* item;
+
+    item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "engine");
+    midori_search_action_set_default_item (search_action, item);
+}
+
+void
 midori_location_action_icon_released_cb (GtkWidget*           widget,
                                          GtkEntryIconPosition 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 */
+    /* The dialog should "toggle" like a menu, as far as users go */
+    MidoriBrowser* browser = midori_browser_get_for_widget (widget);
+    GtkActionGroup* actions = midori_browser_get_action_group (browser);
+    MidoriSearchAction *search_action = MIDORI_SEARCH_ACTION (
+        gtk_action_group_get_action (actions, "Search") 
+    );
+
     static GtkWidget* dialog = NULL;
-    if (icon_pos == GTK_ICON_ENTRY_PRIMARY && dialog != NULL)
+    if (icon_pos == GTK_ENTRY_ICON_PRIMARY && dialog != NULL)
+    {
         gtk_widget_destroy (dialog);
+        return; // Previously code was running on and the widget was being rebuilt
+    }
 
-    if (icon_pos == GTK_ICON_ENTRY_PRIMARY)
+    if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
     {
         /* No "security" window for blank pages */
         if (midori_uri_is_blank (MIDORI_LOCATION_ACTION (action)->text))
+        {
+            GtkMenu* menu = midori_search_action_get_menu (widget,
+                                                           search_action, 
+                                                           midori_location_action_engine_activate_cb );
+            katze_widget_popup (widget, menu, NULL, KATZE_MENU_POSITION_LEFT);
             return;
+        }
 
-        const gchar* title = _("Security details");
         GtkWidget* content_area;
         GtkWidget* hbox;
-        #ifdef HAVE_GRANITE
-        gint wx, wy;
-        GtkAllocation allocation;
-        GdkRectangle icon_rect;
 
-        /* FIXME: granite: should return GtkWidget* like GTK+ */
-        dialog = (GtkWidget*)granite_widgets_pop_over_new ();
-        gchar* markup = g_strdup_printf ("<b>%s</b>", 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);
+        #if GTK_CHECK_VERSION (3, 12, 0)
+        dialog = gtk_popover_new (widget);
+        content_area = gtk_vbox_new (FALSE, 6);
+        gtk_container_add (GTK_CONTAINER (dialog), content_area);
+        g_signal_connect (dialog, "button-press-event",
+            G_CALLBACK (midori_location_action_popover_button_press_event_cb), NULL);
+        g_signal_connect (dialog, "button-release-event",
+            G_CALLBACK (midori_location_action_popover_button_release_event_cb), NULL);
 
-        gtk_widget_get_allocation (widget, &allocation);
-        gdk_window_get_origin (gtk_widget_get_window (widget), &wx, &wy);
-        wx += allocation.x;
+        GdkRectangle icon_rect;
         gtk_entry_get_icon_area (GTK_ENTRY (widget), icon_pos, &icon_rect);
-        wx += (icon_rect.x + icon_rect.width / 2);
-        wy += (icon_rect.y + icon_rect.height);
-        granite_widgets_pop_over_move_to_coords (GRANITE_WIDGETS_POP_OVER (dialog),
-            wx, wy, TRUE);
+        gtk_popover_set_relative_to (GTK_POPOVER (dialog), widget);
+        gtk_popover_set_pointing_to (GTK_POPOVER (dialog), &icon_rect);
+        g_signal_connect (dialog, "closed", G_CALLBACK (gtk_widget_destroyed), &dialog);
         #else
+        const gchar* title = _("Security details");
         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);
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+        g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
         #endif
-        hbox = gtk_hbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+        hbox = gtk_hbox_new (FALSE, 6);
         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_entry_get_icon_tooltip_text (GTK_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)
+        #ifdef 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)
+    if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
     {
         gboolean result;
         g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0,
@@ -1518,21 +1628,6 @@ midori_location_action_icon_released_cb (GtkWidget*           widget,
     }
 }
 
-static void
-midori_location_action_paste_proceed_cb (GtkWidget* menuitem,
-                                         GtkWidget* location_action)
-{
-    GtkClipboard* clipboard = gtk_clipboard_get_for_display (
-        gtk_widget_get_display (GTK_WIDGET (menuitem)),GDK_SELECTION_CLIPBOARD);
-    gchar* uri;
-
-    if ((uri = gtk_clipboard_wait_for_text (clipboard)))
-    {
-        g_signal_emit (location_action, signals[SUBMIT_URI], 0, uri, FALSE);
-        g_free (uri);
-    }
-}
-
 static void
 midori_location_action_populate_popup_cb (GtkWidget*            entry,
                                           GtkMenuShell*         menu,
@@ -1547,16 +1642,19 @@ midori_location_action_populate_popup_cb (GtkWidget*            entry,
     menuitem = gtk_separator_menu_item_new ();
     gtk_widget_show (menuitem);
     gtk_menu_shell_append (menu, menuitem);
-    menuitem = sokoke_action_create_popup_menu_item (
+    menuitem = gtk_action_create_menu_item (
         gtk_action_group_get_action (actions, "ManageSearchEngines"));
+    GtkWidget* accel_label = gtk_bin_get_child (GTK_BIN (menuitem));
+    if (accel_label != NULL)
+        gtk_accel_label_set_accel_closure (GTK_ACCEL_LABEL (accel_label), NULL);
     gtk_menu_shell_append (menu, menuitem);
-    /* i18n: Right-click on Location, Open an URL from the clipboard */
-    menuitem = gtk_menu_item_new_with_mnemonic (_("Paste and p_roceed"));
-    gtk_widget_show (menuitem);
+    menuitem = gtk_action_create_menu_item (
+        gtk_action_group_get_action (actions, "PasteProceed"));
+    accel_label = gtk_bin_get_child (GTK_BIN (menuitem));
+    if (accel_label != NULL)
+        gtk_accel_label_set_accel_closure (GTK_ACCEL_LABEL (accel_label), NULL);
     /* Insert menu item after default Paste menu item */
     gtk_menu_shell_insert (menu, menuitem, 3);
-    g_signal_connect (menuitem, "activate",
-        G_CALLBACK (midori_location_action_paste_proceed_cb), location_action);
     if (!gtk_clipboard_wait_is_text_available (clipboard))
         gtk_widget_set_sensitive (menuitem, FALSE);
 }
@@ -1587,10 +1685,8 @@ midori_location_action_connect_proxy (GtkAction* action,
                       midori_location_action_button_press_event_cb, action,
                       "signal::key-press-event",
                       midori_location_action_key_press_event_cb, action,
-                      #if GTK_CHECK_VERSION (2, 19, 3)
                       "signal-after::preedit-changed",
                       midori_location_action_preedit_changed_cb, action,
-                      #endif
                       "signal::focus-in-event",
                       midori_location_action_focus_in_event_cb, action,
                       "signal::focus-out-event",
@@ -1718,7 +1814,7 @@ midori_location_action_set_progress (MidoriLocationAction* location_action,
 }
 
 /**
- * midori_location_action_set_security_hint:
+ * midori_location_action_set_secondary_icon:
  * @location_action: a #MidoriLocationAction
  * @icon: a stock ID, or an icon name
  *
@@ -1731,7 +1827,6 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action
                                            const gchar*          stock_id)
 {
     GSList* proxies;
-    GtkStockItem stock_item;
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
 
@@ -1743,17 +1838,12 @@ 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);
+        midori_location_action_entry_set_secondary_icon (GTK_ENTRY (entry), stock_id);
     }
 }
 
 /**
- * midori_location_action_primary_icon:
+ * midori_location_set_action_primary_icon:
  * @location_action: a #MidoriLocationAction
  * @icon: a list of icon names, preferred icon first
  * @tooltip: The tooltip to show
@@ -1770,6 +1860,11 @@ midori_location_action_set_primary_icon (MidoriLocationAction* location_action,
     GSList* proxies;
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
+    g_return_if_fail (G_IS_ICON (icon));
+    g_return_if_fail (tooltip != NULL);
+
+    katze_object_assign (location_action->icon, g_object_ref (icon));
+    katze_assign (location_action->tooltip, g_strdup (tooltip));
 
     proxies = gtk_action_get_proxies (GTK_ACTION (location_action));
 
@@ -1777,8 +1872,8 @@ midori_location_action_set_primary_icon (MidoriLocationAction* location_action,
     if (GTK_IS_TOOL_ITEM (proxies->data))
     {
         GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
-        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon);
-        gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, tooltip);
+        gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, icon);
+        gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, tooltip);
     }
 }
 
diff --git a/midori/midori-notebook.vala b/midori/midori-notebook.vala
new file mode 100644 (file)
index 0000000..5aede48
--- /dev/null
@@ -0,0 +1,556 @@
+/*
+ Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+ 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 {
+    protected class Tally : Gtk.EventBox {
+        public Midori.Tab tab { get; set; }
+        Gtk.Spinner spinner;
+        public Gtk.Label label;
+        Gtk.HBox box;
+        public Gtk.Image icon;
+        Gtk.Alignment align;
+        Gtk.Button close;
+
+        public bool close_button_left { get; set; default = false; }
+        public bool close_button_visible { get; set; default = false; }
+
+        protected Tally (Midori.Tab tab) {
+            this.tab = tab;
+            box = new Gtk.HBox (false, 1);
+            add (box);
+
+            spinner = new Gtk.Spinner ();
+            spinner.active = true;
+            /* Ensure the spinner is the size of the icon */
+            int icon_size = 16;
+            Gtk.icon_size_lookup_for_settings (get_settings (),
+                Gtk.IconSize.MENU, out icon_size, null);
+            spinner.set_size_request (icon_size, icon_size);
+            box.pack_start (spinner, false, false, 0);
+            label = new Gtk.Label (null);
+            label.set_alignment (0.5f, 0.5f);
+            label.set_padding (0, 0);
+            box.pack_start (label, true, true, 0);
+            close = new Gtk.Button ();
+            close.relief = Gtk.ReliefStyle.NONE;
+            close.focus_on_click = false;
+#if !HAVE_GTK3
+            close.name = "midori-close-button";
+            close.style_set.connect (close_style_set);
+#endif
+            icon = new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("window-close-symbolic"), Gtk.IconSize.MENU);
+            close.add (icon);
+            align = new Gtk.Alignment (1.0f, 0.5f, 0.0f, 0.0f);
+            align.add (close);
+            box.pack_start (align, false, false, 0);
+            close.clicked.connect (close_clicked);
+            icon = new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("text-html-symbolic"), Gtk.IconSize.MENU);
+            box.pack_start (icon, false, false, 0);
+            box.show_all ();
+
+            tab.notify["uri"].connect (uri_changed);
+            tab.notify["title"].connect (title_changed);
+            tab.notify["icon"].connect (icon_changed);
+            tab.notify["minimized"].connect (minimized_changed);
+            tab.notify["progress"].connect (progress_changed);
+            tab.colors_changed.connect (colors_changed);
+            update_label ();
+            label.visible = !tab.minimized;
+            spinner.visible = tab.progress > 0.0;
+            icon.visible = !spinner.visible;
+            update_color ();
+
+            notify["close-button-left"].connect (close_button_left_changed);
+            notify_property ("close-button-left");
+            notify["close-button-visible"].connect (close_button_visible_changed);
+            notify_property ("close-button-visible");
+        }
+
+#if !HAVE_GTK3
+        void close_style_set (Gtk.Style? previous_style) {
+            Gtk.Requisition size;
+            close.child.size_request (out size);
+            close.set_size_request (size.width, size.height);
+        }
+#endif
+
+        void close_clicked () {
+            tab.destroy ();
+        }
+
+        void uri_changed (GLib.ParamSpec pspec) {
+            label.label = tab.uri;
+        }
+
+        void title_changed (GLib.ParamSpec pspec) {
+            update_label ();
+        }
+
+        void update_label () {
+            string? title;
+            tab.get ("title", out title);
+            label.label = Midori.Tab.get_display_title (title, tab.uri);
+            /* Use computed label below! */
+            label.ellipsize = Midori.Tab.get_display_ellipsize (label.label, tab.uri);
+            tooltip_text = label.label;
+        }
+
+        void icon_changed (GLib.ParamSpec pspec) {
+            Icon? icon;
+            tab.get ("icon", out icon);
+            this.icon.set_from_gicon (icon, Gtk.IconSize.MENU);
+        }
+
+        void colors_changed () {
+            update_color ();
+        }
+
+        void update_color () {
+            visible_window = tab.fg_color != null || tab.bg_color != null;
+            label.modify_fg (Gtk.StateType.NORMAL, tab.fg_color);
+            label.modify_fg (Gtk.StateType.ACTIVE, tab.fg_color);
+            modify_bg (Gtk.StateType.NORMAL, tab.bg_color);
+            modify_bg (Gtk.StateType.ACTIVE, tab.bg_color);
+        }
+
+        void close_button_left_changed (GLib.ParamSpec pspec) {
+            if (close_button_left) {
+                box.reorder_child (align, 0);
+                box.reorder_child (label, 1);
+                box.reorder_child (icon, 2);
+                box.reorder_child (spinner, 3);
+            } else {
+                box.reorder_child (spinner, 0);
+                box.reorder_child (icon, 1);
+                box.reorder_child (label, 2);
+                box.reorder_child (align, 3);
+            }
+        }
+
+        void close_button_visible_changed (GLib.ParamSpec pspec) {
+            align.visible = !tab.minimized && close_button_visible;
+        }
+
+        void minimized_changed (GLib.ParamSpec pspec) {
+            label.visible = !tab.minimized;
+            notify_property ("close-button-visible");
+        }
+
+        void progress_changed (GLib.ParamSpec pspec) {
+            spinner.visible = tab.progress > 0.0;
+            icon.visible = !spinner.visible;
+        }
+    }
+
+    public class Notebook : Gtk.EventBox {
+        public Gtk.Notebook notebook;
+        int last_tab_size = 0;
+
+#if !HAVE_GTK3
+        static const string style_fixup = """
+            style "midori-close-button-style"
+            {
+            GtkWidget::focus-padding = 0
+            GtkWidget::focus-line-width = 0
+            xthickness = 0
+            ythickness = 0
+            }
+            widget "*.midori-close-button" style "midori-close-button-style"
+            """;
+#endif
+
+        /* Since: 0.5.7 */
+        public uint count { get; private set; default = 0; }
+        /* Since: 0.5.7 */
+        public int index { get; set; default = -1; }
+        /* Since: 0.5.7 */
+        public Midori.Tab? tab {  get; set; default = null; }
+        /* Since: 0.5.7 */
+        private Midori.Tab? previous {  get; set; default = null; }
+
+        /* Since: 0.5.7 */
+        public bool close_buttons_left { get; set; default = true; }
+        /* Since: 0.5.7 */
+        public bool close_buttons_visible { get; set; default = true; }
+        /* Since: 0.5.7 */
+        public bool labels_visible { get; set; default = true; }
+
+        /* Since: 0.5.7 */
+        public signal void tab_context_menu (Midori.Tab tab, ContextAction menu);
+        /* Since: 0.5.7 */
+        public signal void context_menu (ContextAction menu);
+        /* The current tab is about to switch, but the old tab still has focus.
+           Since: 0.5.7 */
+        public signal void tab_switched (Midori.Tab? old, Midori.Tab @new);
+        /* A tab is about to move to a new position.
+           Since: 0.5.7 */
+        public signal void tab_moved (Midori.Tab tab, uint new_index);
+        /* A tab is being dragging out of the window.
+           Since: 0.5.7 */
+        public signal void tab_detached (Midori.Tab tab, int x, int y);
+        /* Since: 0.5.7 */
+        public signal void new_tab ();
+
+        [CCode (type = "GtkWidget*")]
+        public Notebook () {
+            visible_window = false;
+            notebook = new Gtk.Notebook ();
+            notebook.visible = notebook.scrollable = true;
+            notebook.show_border = false;
+            notebook.set ("group-name", PACKAGE_NAME);
+            add (notebook);
+
+#if HAVE_GTK3
+            get_style_context ().add_class ("dynamic-notebook");
+#else
+            /* Remove the inner border between scrollbars and window border */
+            Gtk.RcStyle rcstyle = new Gtk.RcStyle ();
+            rcstyle.xthickness = 0;
+            notebook.modify_style (rcstyle);
+            Gtk.rc_parse_string (style_fixup);
+#endif
+            notify["index"].connect (index_changed);
+            notify["tab"].connect (tab_changed);
+            notify["labels-visible"].connect (labels_visible_changed);
+            notify["close-buttons-visible"].connect (close_buttons_visible_changed);
+            notify["close-buttons-left"].connect (close_buttons_left_changed);
+
+            notebook.size_allocate.connect (size_allocated);
+            notebook.switch_page.connect (page_switched);
+            notebook.page_reordered.connect (page_moved);
+            notebook.create_window.connect (window_created);
+
+            var add = new Gtk.Button ();
+            add.tooltip_text = _("Open a new tab");
+            add.relief = Gtk.ReliefStyle.NONE;
+            add.add (new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("tab-new-symbolic"), Gtk.IconSize.MENU));
+            add.show_all ();
+            notebook.set_action_widget (add, Gtk.PackType.START);
+            add.clicked.connect (()=>{
+                new_tab ();
+            });
+            take_incoming_uris (add);
+
+            button_press_event.connect (button_pressed);
+        }
+
+        void take_incoming_uris (Gtk.Widget widget) {
+            Gtk.drag_dest_set (widget, Gtk.DestDefaults.ALL, (Gtk.TargetEntry[])null, Gdk.DragAction.COPY);
+            Gtk.drag_dest_add_text_targets (widget);
+            Gtk.drag_dest_add_uri_targets (widget);
+            widget.drag_drop.connect (uri_dropped);
+            widget.drag_data_received.connect (uri_received);
+        }
+
+        bool uri_dropped (Gtk.Widget widget, Gdk.DragContext context, int x, int y, uint timestamp) {
+            Gtk.drag_finish (context, false, false, timestamp);
+            return true;
+        }
+
+        void uri_received (Gtk.Widget widget, Gdk.DragContext context, int x, int y, Gtk.SelectionData data, uint ttype, uint timestamp) {
+            string[] uri = data.get_uris ();
+            string drag_uri = uri != null ? uri[0] : data.get_text ();
+            Midori.Tab drag_tab;
+            if (widget is Tally)
+                drag_tab = (widget as Tally).tab;
+            else {
+                new_tab ();
+                // Browser will have focussed the new tab
+                drag_tab = tab;
+            }
+            drag_tab.web_view.load_uri (drag_uri);
+        }
+
+
+        ~Notebook () {
+            notebook.size_allocate.disconnect (size_allocated);
+            notebook.switch_page.disconnect (page_switched);
+            notebook.page_reordered.disconnect (page_moved);
+            notebook.create_window.disconnect (window_created);
+        }
+
+        /* Since: 0.5.8 */
+        public ContextAction get_context_action () {
+            var menu = new Midori.ContextAction ("NotebookContextMenu", null, null, null);
+            uint counter = 0;
+            foreach (var child in notebook.get_children ()) {
+                var tab = child as Midori.Tab;
+                var tally = notebook.get_tab_label (tab) as Tally;
+                var action = new Midori.ContextAction.escaped ("Tab%u".printf (counter), tally.label.label, null, null);
+                action.gicon = tally.icon.gicon;
+                action.activate.connect (()=>{
+                    notebook.set_current_page (notebook.page_num (tab));
+                });
+                menu.add (action);
+                counter++;
+            }
+            context_menu (menu);
+            return menu;
+        }
+
+        bool button_pressed (Gdk.EventButton event) {
+            /* Propagate events in logical label area */
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (tab) as Tally;
+                Gtk.Allocation size;
+                tally.get_allocation (out size);
+                if (tally.get_mapped ()
+                 && event.x_root >= size.x
+                 && event.x_root <= (size.x + size.width)) {
+                    tally.button_press_event (event);
+                    return true;
+                }
+            }
+
+            if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == 1
+             || event.button == 2) {
+                new_tab ();
+                return true;
+            }
+            else if (event.button == 3) {
+                var menu = get_context_action ();
+                var popup = menu.create_menu (null, false);
+                popup.show ();
+                popup.attach_to_widget (this, null);
+                popup.popup (null, null, null, event.button, event.time);
+                return true;
+            }
+            return false;
+        }
+
+        public void insert (Midori.Tab tab, int index) {
+            var tally = new Tally (tab);
+            tally.close_button_left = close_buttons_left;
+            tally.close_button_visible = close_buttons_visible;
+            tally.button_press_event.connect (tab_button_pressed);
+            tally.show ();
+            tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+            take_incoming_uris (tally);
+
+            /* Minimum requirements for any tab */
+            tab.can_focus = tab.visible = true;
+            notebook.insert_page (tab, tally, index);
+            notebook.set_tab_reorderable (tab, true);
+            notebook.set_tab_detachable (tab, true);
+            tab.destroy.connect (tab_removed);
+            tab.notify["minimized"].connect (tab_minimized);
+            count++;
+            tab.ref ();
+            relayout ();
+        }
+
+        void tab_removed () {
+            count--;
+            if (count > 0)
+                relayout ();
+        }
+
+        void relayout () {
+            Gtk.Allocation size;
+            notebook.get_allocation (out size);
+            resize (size.width);
+        }
+
+        /* Since: 0.5.8 */
+        public ContextAction get_tab_context_action (Midori.Tab tab) {
+            var menu = new Midori.ContextAction ("TabContextMenu", null, null, null);
+            tab_context_menu (tab, menu);
+            var action_window = new Midori.ContextAction ("TabWindowNew", _("Open in New _Window"), null, "window-new");
+            action_window.activate.connect (()=>{
+                tab_detached (tab, 128, 128);
+            });
+            menu.add (action_window);
+            var action_minimize = new Midori.ContextAction ("TabMinimize", tab.minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), null, null);
+            action_minimize.activate.connect (()=>{
+                tab.minimized = !tab.minimized;
+            });
+            menu.add (action_minimize);
+            var action_right = new Midori.ContextAction ("TabCloseRight", ngettext ("Close Tab to the R_ight", "Close Tabs to the R_ight", count - 1), null, null);
+            action_right.sensitive = count > 1;
+            action_right.activate.connect (()=>{
+                bool found_tab = false;
+                foreach (var child in notebook.get_children ()) {
+                    if (found_tab)
+                        child.destroy ();
+                    else
+                        found_tab = child == tab;
+                }
+            });
+            menu.add (action_right);
+            var action_other = new Midori.ContextAction ("TabCloseOther", ngettext ("Close Ot_her Tab", "Close Ot_her Tabs", count - 1), null, null);
+            action_other.sensitive = count > 1;
+            action_other.activate.connect (()=>{
+                foreach (var child in notebook.get_children ())
+                    if (child != tab)
+                        child.destroy ();
+            });
+            menu.add (action_other);
+            var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
+            action_close.activate.connect (()=>{
+                tab.destroy ();
+            });
+            menu.add (action_close);
+            return menu;
+         }
+
+        bool tab_button_pressed (Gtk.Widget label, Gdk.EventButton event) {
+            Tally tally = label as Tally;
+            if (event.button == 1) {
+                /* Leave switching and dragging up to the notebook */
+                return false;
+            } else if (event.button == 2)
+                tally.tab.destroy ();
+            else if (event.button == 3) {
+                var menu = get_tab_context_action (tally.tab);
+                var popup = menu.create_menu (null, false);
+                popup.show ();
+                popup.attach_to_widget (this, null);
+                popup.popup (null, null, null, event.button, event.time);
+            }
+            return true;
+        }
+
+        public void move (Midori.Tab tab, int index) {
+            notebook.reorder_child (tab, index);
+        }
+
+        /* Chain up drawing manually to circumvent parent checks */
+#if HAVE_GTK3
+        public override bool draw (Cairo.Context cr) {
+            notebook.draw (cr);
+            return true;
+        }
+#else
+        public override bool expose_event (Gdk.EventExpose event) {
+            notebook.expose_event (event);
+            return true;
+        }
+#endif
+
+        public override void forall_internal (bool include_internal, Gtk.Callback callback) {
+            if (include_internal)
+                callback (notebook);
+            foreach (var child in notebook.get_children ())
+                callback (child);
+        }
+
+        /* Can't override Gtk.Container.remove because it checks the parent */
+        public new void remove (Midori.Tab tab) {
+            return_if_fail (notebook.get_children ().find (tab) != null);
+
+            notebook.remove (tab);
+            tab.destroy.disconnect (tab_removed);
+            tab.notify["minimized"].disconnect (tab_minimized);
+            tab_removed ();
+            tab.unref ();
+        }
+
+        void tab_minimized (GLib.ParamSpec pspec) {
+            var tally = notebook.get_tab_label (tab) as Tally;
+            tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+        }
+
+        public Midori.Tab get_nth_tab (int index) {
+            return notebook.get_nth_page (index) as Midori.Tab;
+        }
+
+        public int get_tab_index (Midori.Tab tab) {
+            return notebook.page_num (tab);
+        }
+
+        void index_changed (GLib.ParamSpec pspec) {
+            notebook.set_current_page (index);
+        }
+
+        void tab_changed (GLib.ParamSpec pspec) {
+            notebook.set_current_page (notebook.page_num (tab));
+        }
+
+        void labels_visible_changed (GLib.ParamSpec pspec) {
+            notebook.show_tabs = labels_visible;
+        }
+
+        void close_buttons_visible_changed (GLib.ParamSpec pspec) {
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.close_button_visible = close_buttons_visible;
+            }
+        }
+
+        void close_buttons_left_changed (GLib.ParamSpec pspec) {
+            foreach (var child in notebook.get_children ()) {
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.close_button_left = close_buttons_left;
+            }
+        }
+
+#if HAVE_GTK3
+        void size_allocated (Gtk.Allocation allocation) {
+#else
+        void size_allocated (Gdk.Rectangle allocation) {
+#endif
+            if (labels_visible && count > 0)
+                resize (allocation.width);
+        }
+
+#if HAVE_GTK3
+        void page_switched (Gtk.Widget new_tab, uint new_index) {
+#else
+        void page_switched (Gtk.NotebookPage new_tab, uint new_index) {
+#endif
+            tab_switched (previous, new_tab as Tab);
+            previous = (Midori.Tab)new_tab;
+
+            notify["index"].disconnect (index_changed);
+            notify["tab"].disconnect (tab_changed);
+            index = (int)new_index;
+            tab = (Midori.Tab)new_tab;
+            notify["index"].connect (index_changed);
+            notify["tab"].connect (tab_changed);
+        }
+
+        void page_moved (Gtk.Widget moving_tab, uint new_index) {
+            tab_moved (moving_tab as Midori.Tab, new_index);
+            /* Indices change, current tab is not in the same position */
+            notify["index"].disconnect (index_changed);
+            index = (int)get_tab_index (tab);
+            notify["index"].connect (index_changed);
+        }
+
+        unowned Gtk.Notebook window_created (Gtk.Widget tab, int x, int y) {
+            tab_detached (tab as Tab, x, y);
+            /* The API allows now, the cast is due to bindings not having ? */
+            return (Gtk.Notebook)null;
+        }
+
+        void resize (int new_size) {
+            int n = int.max (1, (int)count);
+            new_size /= n;
+            int icon_size = 16;
+            Gtk.icon_size_lookup_for_settings (get_settings (),
+                Gtk.IconSize.MENU, out icon_size, null);
+            int max_size = 150;
+            int min_size = icon_size;
+            if (close_buttons_visible)
+                min_size += icon_size;
+            new_size = new_size.clamp (min_size, max_size);
+            if ((new_size - last_tab_size).abs () < 3)
+                return;
+
+            last_tab_size = new_size;
+            foreach (var child in notebook.get_children ()) {
+                var tab = child as Midori.Tab;
+                var tally = notebook.get_tab_label (child) as Tally;
+                tally.set_size_request (tab.minimized ? -1 : last_tab_size, -1);
+            }
+        }
+    }
+}
index dd7ecde31711b8b1fc948ff546d465a1cb259e29..161be02582398195027b276e42da53639c9537cf 100644 (file)
@@ -17,7 +17,7 @@ namespace Midori {
         Child child2 = new Child();
 
         private struct Child {
-            protected Gtk.Widget widget;
+            public Gtk.Widget widget;
             string name;
             bool resize;
             bool shrink;
index 0296161768df94dfc8d655b6375af97484e08b5d..10e3b20ae4daa80459aa3f155be1120830afa794 100644 (file)
@@ -485,25 +485,6 @@ midori_panel_set_right_aligned (MidoriPanel* panel,
     g_object_notify (G_OBJECT (panel), "right-aligned");
 }
 
-/* Private function, used by MidoriBrowser */
-/* static */ GtkWidget*
-midori_panel_construct_menu_item (MidoriPanel*    panel,
-                                  MidoriViewable* viewable,
-                                  gboolean        popup)
-{
-    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);
-    g_object_set_data (G_OBJECT (menuitem), "page", viewable);
-
-    if (gtk_widget_get_visible (GTK_WIDGET (viewable)))
-        gtk_widget_show (menuitem);
-    return menuitem;
-}
-
 static void
 midori_panel_viewable_destroy_cb (GtkWidget*   viewable,
                                   MidoriPanel* panel)
@@ -555,6 +536,10 @@ static void
 midori_panel_action_activate_cb (GtkRadioAction* action,
                                  MidoriPanel*    panel)
 {
+    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (panel));
+    GtkActionGroup* actions = midori_browser_get_action_group (browser);
+    GtkAction* panel_action = gtk_action_group_get_action (actions, "Panel");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (panel_action), TRUE);
     GtkWidget* viewable = g_object_get_data (G_OBJECT (action), "viewable");
     gint n = midori_panel_page_num (panel, viewable);
 
@@ -637,6 +622,9 @@ midori_panel_append_page (MidoriPanel*    panel,
     gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled);
 
     toolbar = midori_viewable_get_toolbar (viewable);
+    gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+    gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
+    gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
     gtk_widget_show (toolbar);
     gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);
     g_signal_connect (viewable, "destroy",
index cff300d91b908ab5eff1d5ec9231ee5e00be2fd2..a535a51b731075a80c037ee40d550e986f181782 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2010-2011 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,6 @@
 
 #include "midori/midori-stock.h"
 #include "katze/gtk3-compat.h"
-#include "midori/gtkiconentry.h"
 #include "midori/sokoke.h"
 
 /* Common behavior modifiers */
index 0e308356641f2ec72340b2bdd1f61b156df0ab35..6af801eadfbd494f567b02b715a3c0692851649c 100644 (file)
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
 #include <config.h>
-#if HAVE_LIBNOTIFY
-    #include <libnotify/notify.h>
-#endif
 
 struct _MidoriPreferences
 {
@@ -203,24 +198,6 @@ midori_preferences_toolbutton_clicked_cb (GtkWidget* toolbutton,
 }
 #endif
 
-static inline void
-midori_preferences_add_toolbutton (GtkWidget*   toolbar,
-                                   GtkWidget**  toolbutton,
-                                   const gchar* icon,
-                                   const gchar* label,
-                                   GtkWidget*   page)
-{
-#if HAVE_OSX
-    *toolbutton = GTK_WIDGET (*toolbutton ? gtk_radio_tool_button_new_from_widget (
-        GTK_RADIO_TOOL_BUTTON (*toolbutton)) : gtk_radio_tool_button_new (NULL));
-    gtk_tool_button_set_label (GTK_TOOL_BUTTON (*toolbutton), label);
-    gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (*toolbutton), icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (*toolbutton), -1);
-    g_signal_connect (*toolbutton, "clicked",
-        G_CALLBACK (midori_preferences_toolbutton_clicked_cb), page);
-#endif
-}
-
 #if 0
 static void
 midori_preferences_list_dicts_cb (const gchar* lang_tag,
@@ -243,6 +220,17 @@ midori_preferences_get_spell_languages (void)
 }
 #endif
 
+#ifdef G_OS_WIN32
+static void
+midori_preferences_theme_changed_cb (GtkWidget* button,
+                                     gpointer   user_data)
+{
+    MidoriSettings* settings = user_data;
+    midori_settings_set_theme_name (settings,
+        gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (button)));
+}
+#endif
+
 /**
  * midori_preferences_set_settings:
  * @settings: the settings
@@ -381,7 +369,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     button = katze_property_proxy (settings, "enable-javascript", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
     INDENTED_ADD (button);
-    #if WEBKIT_CHECK_VERSION (1, 3, 8)
     button = katze_property_proxy (settings, "enable-webgl", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support"));
     #ifndef HAVE_WEBKIT2
@@ -394,15 +381,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         gchar* supports_web_gl = sokoke_js_script_eval (js_context,
             "!!window.WebGLRenderingContext", NULL);
         if (g_strcmp0 (supports_web_gl, "true"))
-            gtk_widget_set_sensitive (button, FALSE);
+            gtk_widget_hide (button);
         g_free (supports_web_gl);
     }
     #endif
-    #else
-    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 ());
-    #endif
     SPANNED_ADD (button);
     button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Zoom Text and Images"));
@@ -411,6 +393,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
     gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically"));
     SPANNED_ADD (button);
+    label = gtk_label_new (_("Default Zoom Level"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    INDENTED_ADD (label);
+    button = katze_property_proxy (settings, "zoom-level", NULL);
+    gtk_widget_set_tooltip_text (button, _("Initial factor to enlarge newly opened tabs by"));
+    SPANNED_ADD (button);
 
     FRAME_NEW (NULL);
     button = gtk_label_new (_("Preferred languages"));
@@ -428,6 +416,39 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     /* Page "Interface" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
         FRAME_NEW (NULL);
+    #ifdef G_OS_WIN32
+    INDENTED_ADD (gtk_label_new (_("Theme:")));
+    button = gtk_combo_box_text_new ();
+    SPANNED_ADD (button);
+    guint i = 0;
+    /* On Windows the default theme may be a built-in specific to the
+       running system. So we always add the default and skip it later.
+     */
+    const gchar* default_theme = midori_settings_get_default_theme_name (MIDORI_SETTINGS (settings));
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), default_theme);
+    gtk_combo_box_set_active (GTK_COMBO_BOX (button), i++);
+
+    const gchar* current_theme = midori_settings_get_theme_name (MIDORI_SETTINGS (settings));
+    gchar* theme_path = midori_paths_get_data_filename ("themes", FALSE);
+    GDir* dir;
+    if ((dir = g_dir_open (theme_path, 0, NULL)))
+    {
+        const gchar* name;
+        while ((name = g_dir_read_name (dir)))
+        {
+            if (!g_strcmp0 (name, default_theme))
+                continue;
+            gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), name);
+            if (!g_strcmp0 (name, current_theme))
+                gtk_combo_box_set_active (GTK_COMBO_BOX (button), i);
+            i++;
+        }
+        g_dir_close (dir);
+        g_signal_connect (button, "changed",
+                          G_CALLBACK (midori_preferences_theme_changed_cb), settings);
+    }
+    g_free (theme_path);
+    #endif
         INDENTED_ADD (gtk_label_new (_("Toolbar Style:")));
         button = katze_property_proxy (settings, "toolbar-style", NULL);
         SPANNED_ADD (button);
@@ -443,11 +464,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     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
-    button = katze_property_proxy (settings, "always-show-tabbar", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Always Show Tabbar"));
-    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"));
@@ -456,18 +472,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     gtk_button_set_label (GTK_BUTTON (button), _("Open tabs in the background"));
     SPANNED_ADD (button);
 
-    INDENTED_ADD (gtk_label_new (NULL));
-    label = gtk_label_new (_("Text Editor"));
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    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);
-    INDENTED_ADD (label);
-    entry = katze_property_proxy (settings, "news-aggregator", "application-News");
-    SPANNED_ADD (entry);
-
     /* Page "Network" */
     PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));
     FRAME_NEW (NULL);
@@ -476,23 +480,22 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     INDENTED_ADD (label);
     button = katze_property_proxy (settings, "proxy-type", NULL);
     SPANNED_ADD (button);
-    label = gtk_label_new (_("Hostname"));
+    label = gtk_label_new (_("URI"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     INDENTED_ADD (label);
     entry = katze_property_proxy (settings, "http-proxy", "address");
     SPANNED_ADD (entry);
-    g_signal_connect (settings, "notify::proxy-type",
-        G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
+    g_signal_connect_object (settings, "notify::proxy-type",
+        G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry, 0);
     midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
     label = gtk_label_new (_("Port"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     INDENTED_ADD (label);
     entry = katze_property_proxy (settings, "http-proxy-port", NULL);
     SPANNED_ADD (entry);
-    g_signal_connect (settings, "notify::proxy-type",
-        G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
+    g_signal_connect_object (settings, "notify::proxy-type",
+        G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry, 0);
     midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
-    #if GLIB_CHECK_VERSION (2, 26, 0)
     INDENTED_ADD (gtk_event_box_new ());
     label = gtk_label_new (NULL);
     GString* proxy_types = g_string_new (NULL);
@@ -509,11 +512,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     gtk_label_set_markup (GTK_LABEL (label), proxy_types->str);
     g_string_free (proxy_types, TRUE);
     SPANNED_ADD (label);
-    g_signal_connect (settings, "notify::proxy-type",
-        G_CALLBACK (midori_preferences_notify_proxy_type_cb), label);
+    g_signal_connect_object (settings, "notify::proxy-type",
+        G_CALLBACK (midori_preferences_notify_proxy_type_cb), label, 0);
     midori_preferences_notify_proxy_type_cb (settings, NULL, label);
-    #endif
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
 #ifndef HAVE_WEBKIT2
     if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE))
     {
@@ -521,6 +522,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         gtk_widget_set_tooltip_text (label, _("The maximum size of cached pages on disk"));
         INDENTED_ADD (label);
         button = katze_property_proxy (settings, "maximum-cache-size", NULL);
+        gtk_spin_button_set_range (GTK_SPIN_BUTTON (button), 0, G_MAXINT);
         gtk_widget_set_tooltip_text (button, _("The maximum size of cached pages on disk"));
         SPANNED_ADD (button);
         label = gtk_label_new (_("MB"));
@@ -528,7 +530,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         SPANNED_ADD (label);
     }
 #endif
-    #endif
     /* i18n: This refers to an application, not the 'user agent' string */
     label = gtk_label_new (_("Identify as"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -545,6 +546,9 @@ midori_preferences_add_privacy_category (KatzePreferences*  preferences,
     GtkWidget* label;
     gchar* markup;
 
+    g_return_if_fail (KATZE_IS_PREFERENCES (preferences));
+    g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings));
+
     katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX);
     katze_preferences_add_group (preferences, NULL);
     button = gtk_label_new (_("Delete old Cookies after:"));
@@ -595,7 +599,6 @@ midori_preferences_add_extension_category (KatzePreferences*  preferences,
                                            MidoriApp*         app)
 {
     KatzeArray* array;
-    gchar* extension_path;
     GtkWidget* scrolled;
     GtkWidget* addon;
     GList* children;
index 89cd37d9c841d2f5edea8d0650801acb4efe2160..eef1eeb91c07990f373529d7d7f36e21f9260832 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
 #include <gdk/gdkkeysyms.h>
 #include <sqlite3.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
 static void
-#ifdef HAVE_GRANITE
-midori_private_data_dialog_response_cb (GtkWidget*    button,
-#else
 midori_private_data_dialog_response_cb (GtkWidget*     dialog,
                                         gint           response_id,
-#endif
                                         MidoriBrowser* browser)
 {
-    #ifdef HAVE_GRANITE
-    GtkWidget* dialog = gtk_widget_get_toplevel (button);
-    gint response_id = GTK_RESPONSE_ACCEPT;
-    #endif
     if (response_id == GTK_RESPONSE_ACCEPT)
     {
         GtkToggleButton* button;
@@ -105,6 +95,64 @@ midori_private_data_clear_on_quit_toggled_cb (GtkToggleButton*   button,
     g_object_set (settings, "clear-private-data", clear_prefs, NULL);
 }
 
+/**
+ * The dialog is "empty" when none of the relevant checkboxes are activated.
+ * This function returns true if the dialog is empty.
+ **/
+static bool
+midori_private_data_dialog_is_empty (GtkDialog* dialog)
+{
+    GtkToggleButton* button;
+    gint count = 0; // Counts the total number of checked boxes
+    GList* data_items = midori_private_data_register_item (NULL, NULL, NULL);
+
+    // Count these first two special ones
+    button = g_object_get_data (G_OBJECT (dialog), "session");
+    if (gtk_toggle_button_get_active (button))
+        count++;
+    button = g_object_get_data (G_OBJECT (dialog), "history");
+    if (gtk_toggle_button_get_active (button))
+        count++;
+
+    // Count each other one
+    for (; data_items != NULL; data_items = g_list_next (data_items))
+    {
+        MidoriPrivateDataItem* privacy = data_items->data;
+        button = g_object_get_data (G_OBJECT (dialog), privacy->name);
+        g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button));
+        if (gtk_toggle_button_get_active (button))
+            count++;
+    }
+
+    // No checked boxes means the dialog is empty
+    if (count == 0)
+        return true;
+    return false;
+}
+
+/**
+ * When called, sets the sensitivity of the clear private data button depending
+ * on whether the dialog is empty (see: midori_private_data_dialog_is_empty)
+ **/
+static void
+midori_private_data_clear_button_check_sensitive (GtkDialog* dialog)
+{
+    GtkWidget* clear_button;
+    clear_button = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_ACCEPT);
+    if (midori_private_data_dialog_is_empty (dialog))
+        gtk_widget_set_sensitive (clear_button, FALSE);
+    else
+        gtk_widget_set_sensitive (clear_button, TRUE);
+}
+
+static void
+midori_private_data_checkbox_toggled_cb (GtkToggleButton*   button,
+                                              GtkWidget* dialog)
+{
+    // This is a separate function so I can invoke it on start too
+    midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog));
+}
+
 GtkWidget*
 midori_private_data_get_dialog (MidoriBrowser* browser)
 {
@@ -124,18 +172,6 @@ midori_private_data_get_dialog (MidoriBrowser* browser)
     gint clear_prefs = MIDORI_CLEAR_NONE;
     g_object_get (settings, "clear-private-data", &clear_prefs, NULL);
 
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    dialog = (GtkWidget*)granite_widgets_light_window_new (_("Clear Private Data"));
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    content_area = (GtkWidget*)granite_widgets_decorated_window_get_box (GRANITE_WIDGETS_DECORATED_WINDOW (dialog));
-    hbox = gtk_hbox_new (FALSE, 4);
-    gtk_box_pack_end (GTK_BOX (content_area), hbox, FALSE, FALSE, 4);
-    button = gtk_button_new_with_mnemonic (_("_Clear private data"));
-    gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (midori_private_data_dialog_response_cb), browser);
-    #else
     /* i18n: Dialog: Clear Private Data, in the Tools menu */
     dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
         GTK_WINDOW (browser),
@@ -148,14 +184,13 @@ midori_private_data_get_dialog (MidoriBrowser* browser)
     g_signal_connect (dialog, "response",
         G_CALLBACK (midori_private_data_dialog_response_cb), browser);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    #endif
-    katze_widget_add_class (button, "noundo");
+    katze_widget_add_class (button, "destructive-action");
     screen = gtk_widget_get_screen (GTK_WIDGET (browser));
     if (screen)
         gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR);
     sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     hbox = gtk_hbox_new (FALSE, 4);
-    icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_DIALOG);
+    icon = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_DIALOG);
     gtk_size_group_add_widget (sizegroup, icon);
     gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
     label = gtk_label_new (_("Clear the following data:"));
@@ -173,12 +208,16 @@ midori_private_data_get_dialog (MidoriBrowser* browser)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
     g_object_set_data (G_OBJECT (dialog), "session", button);
     gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+    g_signal_connect (button, "toggled",
+            G_CALLBACK (midori_private_data_checkbox_toggled_cb), dialog);
     /* i18n: Browsing history, visited web pages, closed tabs */
     button = gtk_check_button_new_with_mnemonic (_("_History"));
     if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
     g_object_set_data (G_OBJECT (dialog), "history", button);
     gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+    g_signal_connect (button, "toggled",
+            G_CALLBACK (midori_private_data_checkbox_toggled_cb), dialog);
 
     data_items = midori_private_data_register_item (NULL, NULL, NULL);
     for (; data_items != NULL; data_items = g_list_next (data_items))
@@ -189,7 +228,10 @@ midori_private_data_get_dialog (MidoriBrowser* browser)
         g_object_set_data (G_OBJECT (dialog), privacy->name, button);
         if (clear_data && strstr (clear_data, privacy->name))
             gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+        g_signal_connect (button, "toggled",
+            G_CALLBACK (midori_private_data_checkbox_toggled_cb), dialog);
     }
+    midori_private_data_clear_button_check_sensitive (GTK_DIALOG (dialog));
     g_free (clear_data);
     gtk_container_add (GTK_CONTAINER (alignment), vbox);
     gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 4);
@@ -223,13 +265,16 @@ midori_remove_config_file (gint         clear_prefs,
 static void
 midori_clear_web_cookies_cb (void)
 {
-#ifndef HAVE_WEBKIT2
+#ifdef HAVE_WEBKIT2
+    WebKitWebContext* context = webkit_web_context_get_default ();
+    WebKitCookieManager* cookie_manager = webkit_web_context_get_cookie_manager (context);
+    webkit_cookie_manager_delete_all_cookies (cookie_manager);
+    /* FIXME: site data policy */
+#else
     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))
@@ -241,18 +286,12 @@ midori_clear_web_cookies_cb (void)
         soup_cookie_jar_delete_cookie ((SoupCookieJar*)jar, cookies->data);
     }
     soup_cookies_free (cookies);
-    /* Removing KatzeHttpCookies makes it save outstanding changes */
-    if ((feature = soup_session_get_feature (session, KATZE_TYPE_HTTP_COOKIES)))
-    {
-        g_object_ref (feature);
-        soup_session_remove_feature (session, feature);
-        soup_session_add_feature (session, feature);
-        g_object_unref (feature);
-    }
+#endif
 
     /* Local shared objects/ Flash cookies */
     if (midori_web_settings_has_plugin_support ())
     {
+    gchar* cache;
     #ifdef GDK_WINDOWING_X11
     cache = g_build_filename (g_get_home_dir (), ".macromedia", "Flash_Player", NULL);
     midori_paths_remove_path (cache);
@@ -269,15 +308,16 @@ midori_clear_web_cookies_cb (void)
     #endif
     }
 
+#ifdef HAVE_WEBKIT2
+    /* TODO: clear databases and offline app caches */
+#else
     /* 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
 }
 
@@ -299,7 +339,6 @@ midori_clear_saved_logins_cb (void)
     g_free (filename);
 }
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
 static void
 midori_clear_web_cache_cb (void)
 {
@@ -315,7 +354,6 @@ midori_clear_web_cache_cb (void)
     g_free (cache);
 #endif
 }
-#endif
 
 void
 midori_private_data_register_built_ins ()
@@ -325,11 +363,9 @@ midori_private_data_register_built_ins ()
         G_CALLBACK (midori_clear_saved_logins_cb));
     midori_private_data_register_item ("web-cookies", _("Cookies and Website data"),
         G_CALLBACK (midori_clear_web_cookies_cb));
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
     /* TODO: Preserve page icons of search engines and merge privacy items */
     midori_private_data_register_item ("web-cache", _("Web Cache"),
         G_CALLBACK (midori_clear_web_cache_cb));
-    #endif
     midori_private_data_register_item ("page-icons", _("Website icons"),
         G_CALLBACK (midori_paths_clear_icons));
 }
@@ -412,4 +448,3 @@ midori_private_data_register_item (const gchar* name,
     items = g_list_append (items, item);
     return NULL;
 }
-
index 25eddf3b28029e27afcd082800408bc717fefb76..30f7dc76e5750fa7e6ef58c57c849e738331ca4a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
index fd0ff4cbd4ce84af167a6038dc37f24f732b918e..ce4aa20edd4551ef8e86f282bb354ef22fdfbc0a 100644 (file)
@@ -312,8 +312,8 @@ midori_search_action_create_tool_item (GtkAction* action)
 
     toolitem = GTK_WIDGET (gtk_tool_item_new ());
     entry = sokoke_search_entry_new (NULL);
-    gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
-                                       GTK_ICON_ENTRY_PRIMARY, TRUE);
+    gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
+                                       GTK_ENTRY_ICON_PRIMARY, TRUE);
     alignment = gtk_alignment_new (0, 0.5, 1, 0.1);
     gtk_container_add (GTK_CONTAINER (alignment), entry);
     gtk_widget_show (entry);
@@ -400,11 +400,10 @@ midori_search_action_manage_activate_cb (GtkWidget*          menuitem,
         gtk_widget_show (dialog);
 }
 
-static void
-midori_search_action_icon_released_cb (GtkWidget*           entry,
-                                       GtkIconEntryPosition icon_pos,
-                                       gint                 button,
-                                       GtkAction*           action)
+GtkMenu* 
+midori_search_action_get_menu (GtkWidget* entry,
+                               MidoriSearchAction *search_action,
+                               void       (*change_cb)(GtkWidget*, MidoriSearchAction*))
 {
     KatzeArray* search_engines;
     GtkWidget* menu;
@@ -413,17 +412,12 @@ midori_search_action_icon_released_cb (GtkWidget*           entry,
     GdkPixbuf* icon;
     GtkWidget* image;
 
-    if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
-        return;
-
-    search_engines = MIDORI_SEARCH_ACTION (action)->search_engines;
+    search_engines = search_action->search_engines;
     menu = gtk_menu_new ();
     if (!katze_array_is_empty (search_engines))
     {
         KATZE_ARRAY_FOREACH_ITEM (item, search_engines)
         {
-            const gchar* icon_name;
-
             menuitem = gtk_image_menu_item_new_with_label (
                 katze_item_get_name (item));
             image = gtk_image_new ();
@@ -441,7 +435,7 @@ midori_search_action_icon_released_cb (GtkWidget*           entry,
             gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
             g_object_set_data (G_OBJECT (menuitem), "engine", item);
             g_signal_connect (menuitem, "activate",
-                G_CALLBACK (midori_search_action_engine_activate_cb), action);
+                G_CALLBACK (change_cb), search_action);
             gtk_widget_show (menuitem);
         }
     }
@@ -461,9 +455,25 @@ midori_search_action_icon_released_cb (GtkWidget*           entry,
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     g_signal_connect (menuitem, "activate",
-        G_CALLBACK (midori_search_action_manage_activate_cb), action);
+        G_CALLBACK (midori_search_action_manage_activate_cb), search_action);
     gtk_widget_show (menuitem);
-    katze_widget_popup (entry, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT);
+    return GTK_MENU (menu);
+}
+
+static void
+midori_search_action_icon_released_cb (GtkWidget*           entry,
+                                       GtkEntryIconPosition icon_pos,
+                                       gint                 button,
+                                       GtkAction*           action)
+{
+    /* Only display the search engines when the engine icon, not clear button, is clicked */
+    if (icon_pos != GTK_ENTRY_ICON_PRIMARY)
+        return;
+
+    GtkMenu* menu = midori_search_action_get_menu (entry,
+                                                   MIDORI_SEARCH_ACTION (action),
+                                                   midori_search_action_engine_activate_cb);
+    katze_widget_popup (entry, menu, NULL, KATZE_MENU_POSITION_LEFT);
 }
 
 static gboolean
@@ -502,16 +512,16 @@ midori_search_action_set_entry_icon (MidoriSearchAction* search_action,
                 icon_name = "edit-find-option";
             else
                 icon_name = STOCK_EDIT_FIND;
-            gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
-                GTK_ICON_ENTRY_PRIMARY, icon_name);
+            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                GTK_ENTRY_ICON_PRIMARY, icon_name);
         }
         gtk_entry_set_placeholder_text (GTK_ENTRY (entry),
             katze_item_get_name (search_action->current_item));
     }
     else
     {
-        gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
-                                            GTK_ICON_ENTRY_PRIMARY,
+        gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                            GTK_ENTRY_ICON_PRIMARY,
                                             GTK_STOCK_FIND);
         gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "");
     }
@@ -844,6 +854,9 @@ midori_search_action_editor_name_changed_cb (GtkWidget* entry,
         GTK_RESPONSE_ACCEPT, text && *text);
 }
 
+/* generates a search token for a uri by disemvoweling its hostname
+this token is just used as a suggestion in the UI, so if no sane token
+can be found the empty string is returned */
 gchar*
 midori_search_action_token_for_uri (const gchar* uri)
 {
@@ -851,31 +864,44 @@ midori_search_action_token_for_uri (const gchar* uri)
     gchar** parts;
     gchar* hostname = NULL, *path = NULL;
 
+    /* find the most meaningful component of the qualified hostname */
     path = midori_uri_parse_hostname (uri, NULL);
+    
+    /* if we can't find a hostname, return an empty string */
+    if(!path)
+        return g_strdup("");
+
     parts = g_strsplit (path, ".", -1);
     g_free (path);
 
     len = g_strv_length (parts);
     if (len > 2)
     {
-        for (i = len; i == 0; i--)
+       /* work backward from TLD to subdomains */
+        for (i = len; i > 0; i--)
         {
             if (parts[i] && *parts[i])
+            {
+                /* skip short components */
                 if (strlen (parts[i]) > 3)
                 {
                     hostname = g_strdup (parts[i]);
                     break;
                 }
+            }
         }
     }
-    else
+    else if(parts[0])
+    {
         hostname = g_strdup (parts[0]);
-
-    if (!hostname)
-        hostname = g_strdup (parts[1]);
+    }
+    /* no hostname at all */
+    if(!hostname)
+        hostname = g_strdup ("");
 
     g_strfreev (parts);
 
+    /* disemvowel it */
     if (strlen (hostname) > 4)
     {
         GString* str = g_string_new (NULL);
@@ -905,7 +931,7 @@ midori_search_action_get_engine_for_form (WebKitWebView*     web_view,
                                           PangoEllipsizeMode ellipsize)
 {
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 5, 0)
+    WebKitWebFrame* focused_frame;
     WebKitDOMDocument* doc;
     WebKitDOMHTMLFormElement* active_form;
     WebKitDOMHTMLCollection* form_nodes;
@@ -919,10 +945,13 @@ midori_search_action_get_engine_for_form (WebKitWebView*     web_view,
     KatzeItem* item;
     gchar** parts;
 
+    focused_frame = webkit_web_view_get_focused_frame (web_view);
+    if (focused_frame == NULL)
+        return NULL;
     #if WEBKIT_CHECK_VERSION (1, 9, 5)
-    doc = webkit_web_frame_get_dom_document (webkit_web_view_get_focused_frame (web_view));
+    doc = webkit_web_frame_get_dom_document (focused_frame);
     #else
-    if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
+    if (focused_frame != webkit_web_view_get_main_frame (web_view))
         return NULL;
     doc = webkit_web_view_get_dom_document (web_view);
     #endif
@@ -1020,9 +1049,6 @@ midori_search_action_get_engine_for_form (WebKitWebView*     web_view,
     #else
     return NULL;
     #endif
-#else
-    return NULL;
-#endif
 }
 
 void
@@ -1044,7 +1070,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
     GtkWidget* entry_uri;
     GtkWidget* entry_token;
 
-    toplevel = gtk_widget_get_toplevel (search_action->treeview);
+    toplevel = search_action->treeview ? gtk_widget_get_toplevel (search_action->treeview) : NULL;
     dialog = gtk_dialog_new_with_buttons (
         new_engine ? _("Add search engine") : _("Edit search engine"),
         toplevel ? GTK_WINDOW (toplevel) : NULL,
@@ -1084,7 +1110,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
     gtk_entry_set_text (GTK_ENTRY (entry_name),
         katze_str_non_null (katze_item_get_name (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1097,7 +1123,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
     gtk_entry_set_text (GTK_ENTRY (entry_description)
          , katze_str_non_null (katze_item_get_text (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1106,17 +1132,13 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
     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));
-    #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)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1129,7 +1151,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
     gtk_entry_set_text (GTK_ENTRY (entry_token)
          , katze_str_non_null (katze_item_get_token (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
index 5bb9581c0cb4120eddde0b5aed950fa54177e92c..1dc95e279864d27a892f52fd9b14738e56514ee0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@ namespace Midori {
         }
 
         public override bool can_action (string action) {
-            return action == "about:search";
+            return action == "complete:more/search";
         }
 
         public override async List<Suggestion>? complete (string text, string? action, Cancellable cancellable) {
@@ -39,26 +39,24 @@ namespace Midori {
             var suggestions = new List<Suggestion> ();
             uint n = 0;
             foreach (var item in items) {
-                string icon, uri, title, desc;
-                item.get ("icon", out icon);
+                string uri, title, desc;
                 item.get ("uri", out uri);
                 item.get ("name", out title);
                 item.get ("text", out desc);
                 string search_uri = URI.for_search (uri, text);
                 string search_title = _("Search with %s").printf (title);
-                Gdk.Pixbuf? pixbuf = Midori.Paths.get_icon (icon, null);
-                if (pixbuf == null)
-                    pixbuf = Midori.Paths.get_icon (uri, null);
+                Icon? icon = yield Midori.URI.get_icon_fallback (uri, null, cancellable);
                 string search_desc = search_title + "\n" + desc ?? uri;
                 /* FIXME: Theming? Win32? */
                 string background = "gray";
-                var suggestion = new Suggestion (search_uri, search_desc, false, background, pixbuf);
+                var suggestion = new Suggestion (search_uri, search_desc, false, background, icon);
                 suggestions.append (suggestion);
 
                 n++;
                 if (n == 3 && action == null) {
-                    suggestion = new Suggestion ("about:search", _("Search with…"), false, background);
+                    suggestion = new Suggestion ("complete:more/search", _("Search with…"), false, background);
                     suggestion.action = true;
+                    suggestion.priority = this.position;
                     suggestions.append (suggestion);
                     break;
                 }
index d21b0f9626669742f2d0a0d674a3c656e6faf0b1..0c5c6abd88e2a4550c170a092ff2a7822e163fac 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
 #include "midori/midori-session.h"
 
 #include <midori/midori-core.h>
-#include "midori-app.h"
 #include "midori-array.h"
-#include "midori-websettings.h"
 #include "midori-extension.h"
 #include "sokoke.h"
 
 #include <glib/gi18n-lib.h>
+#include <libsoup/soup-cookie-jar-sqlite.h>
+#include <libsoup/soup-gnome-features.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
+#ifndef HAVE_WEBKIT2
 static void
 midori_soup_session_set_proxy_uri (SoupSession* session,
                                    const gchar* uri)
@@ -56,27 +55,22 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings,
                                             GParamSpec*        pspec,
                                             SoupSession*       session)
 {
+    gboolean uses_proxy = TRUE;
     MidoriProxy proxy_type = katze_object_get_enum (settings, "proxy-type");
     if (proxy_type == MIDORI_PROXY_AUTOMATIC)
     {
-        gboolean gnome_supported = FALSE;
-        GModule* module;
-        GType (*get_type_function) (void);
-        if (g_module_supported ())
-            if ((module = g_module_open ("libsoup-gnome-2.4.so", G_MODULE_BIND_LOCAL)))
-            {
-                if (g_module_symbol (module, "soup_proxy_resolver_gnome_get_type",
-                                     (void*) &get_type_function))
-                {
-                    soup_session_add_feature_by_type (session, get_type_function ());
-                    gnome_supported = TRUE;
-                }
-            }
-        if (!gnome_supported)
-            midori_soup_session_set_proxy_uri (session, g_getenv ("http_proxy"));
+        soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
+
+        GProxyResolver* resolver = g_proxy_resolver_get_default ();
+        gchar** proxies = g_proxy_resolver_lookup (resolver, "none", NULL, NULL);
+
+        if (!proxies || !g_strcmp0 (proxies[0], "direct://"))
+            uses_proxy = FALSE;
+        g_strfreev (proxies);
     }
     else if (proxy_type == MIDORI_PROXY_HTTP)
     {
+        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
         gchar* proxy = katze_object_get_string (settings, "http-proxy");
         GString* http_proxy = g_string_new (proxy);
         g_string_append_printf (http_proxy, ":%d", katze_object_get_int (settings, "http-proxy-port"));
@@ -85,20 +79,41 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings,
         g_free (proxy);
     }
     else
+    {
+        uses_proxy = FALSE;
+        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
         midori_soup_session_set_proxy_uri (session, NULL);
+    }
+
+    /* If a proxy server looks to be active, we disable prefetching, otherwise
+       libSoup may be prefetching outside the proxy server beyond our control.
+     */
+
+    if (uses_proxy)
+        g_object_set (settings, "enable-dns-prefetching", FALSE, NULL);
 }
+#endif
 
-#ifdef HAVE_LIBSOUP_2_29_91
+#if defined(HAVE_LIBSOUP_2_29_91) && WEBKIT_CHECK_VERSION (1, 1, 21)
 static void
 soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings,
                                              GParamSpec*        pspec,
-                                             SoupSession*       session)
+                                             gpointer           user_data)
 {
-    gpointer jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
     gboolean yes = katze_object_get_boolean (settings, "first-party-cookies-only");
+#ifdef HAVE_WEBKIT2
+    WebKitWebContext* context = webkit_web_context_get_default ();
+    WebKitCookieManager* cookie_manager = webkit_web_context_get_cookie_manager (context);
+    webkit_cookie_manager_set_accept_policy (cookie_manager,
+        yes ? WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY
+            : WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
+#else
+    SoupSession* session = webkit_get_default_session ();
+    gpointer jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
     g_object_set (jar, "accept-policy",
         yes ? SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY
             : SOUP_COOKIE_JAR_ACCEPT_ALWAYS, NULL);
+#endif
 }
 #endif
 
@@ -120,17 +135,14 @@ midori_soup_session_request_started_cb (SoupSession* session,
 #ifndef HAVE_WEBKIT2
 const gchar*
 midori_web_settings_get_accept_language    (MidoriWebSettings* settings);
-#endif
 
 static void
 midori_soup_session_settings_accept_language_cb (SoupSession*       session,
                                                  SoupMessage*       msg,
                                                  MidoriWebSettings* settings)
 {
-    #ifndef HAVE_WEBKIT2
     const gchar* accept = midori_web_settings_get_accept_language (settings);
     soup_message_headers_append (msg->request_headers, "Accept-Language", accept);
-    #endif
 
     if (katze_object_get_boolean (settings, "strip-referer"))
     {
@@ -161,10 +173,16 @@ midori_soup_session_settings_accept_language_cb (SoupSession*       session,
             soup_message_headers_remove (msg->request_headers, "Host");
     }
 }
+#endif
 
 gboolean
 midori_load_soup_session (gpointer settings)
 {
+    #if defined(HAVE_LIBSOUP_2_29_91) && WEBKIT_CHECK_VERSION (1, 1, 21)
+    g_signal_connect (settings, "notify::first-party-cookies-only",
+        G_CALLBACK (soup_session_settings_notify_first_party_cb), NULL);
+    #endif
+
 #ifndef HAVE_WEBKIT2
     SoupSession* session = webkit_get_default_session ();
 
@@ -211,27 +229,14 @@ midori_load_soup_session (gpointer settings)
     g_free (certificate_file);
     #endif
 
-    #if !WEBKIT_CHECK_VERSION (1, 3, 5)
-    /* See http://stevesouders.com/ua/index.php */
-    g_object_set (session, "max-conns", 60,
-                           "max-conns-per-host", 6,
-                           NULL);
-    #endif
-
     g_object_set_data (G_OBJECT (session), "midori-settings", settings);
     soup_session_settings_notify_http_proxy_cb (settings, NULL, session);
     g_signal_connect (settings, "notify::http-proxy",
         G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
     g_signal_connect (settings, "notify::proxy-type",
         G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
-    #ifdef HAVE_LIBSOUP_2_29_91
-    if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings),
-        "enable-file-access-from-file-uris")) /* WebKitGTK+ >= 1.1.21 */
-        g_signal_connect (settings, "notify::first-party-cookies-only",
-            G_CALLBACK (soup_session_settings_notify_first_party_cb), session);
-    #endif
 
-    #if defined (HAVE_LIBSOUP_2_34_0)
+    #ifdef HAVE_LIBSOUP_2_34_0
     g_signal_connect (session, "request-started",
         G_CALLBACK (midori_soup_session_request_started_cb), session);
     #endif
@@ -258,16 +263,59 @@ midori_load_soup_session (gpointer settings)
     return FALSE;
 }
 
+#ifndef HAVE_WEBKIT2
+static void
+midori_session_cookie_jar_changed_cb (SoupCookieJar*     jar,
+                                      SoupCookie*        old_cookie,
+                                      SoupCookie*        new_cookie,
+                                      MidoriWebSettings* settings)
+{
+
+    if (midori_debug ("cookies"))
+    {
+        gchar* old = old_cookie ? soup_cookie_to_cookie_header (old_cookie) : NULL;
+        gchar* new = new_cookie ? soup_cookie_to_cookie_header (new_cookie) : NULL;
+        g_print ("cookie changed from %s to %s\n", old, new);
+        g_free (old);
+        g_free (new);
+    }
+
+    /* Don't allow revival of expiring cookies */
+    if (new_cookie && old_cookie && old_cookie->expires)
+        soup_cookie_set_expires (new_cookie, old_cookie->expires);
+
+    if (new_cookie && new_cookie->expires)
+    {
+        time_t expires = soup_date_to_time_t (new_cookie->expires);
+        gint age = katze_object_get_int (settings, "maximum-cookie-age");
+        /* An age of 0 to SoupCookie means already-expired
+           A user choosing 0 days probably expects 1 hour.
+         */
+        int seconds = age > 0 ? age * SOUP_COOKIE_MAX_AGE_ONE_DAY : SOUP_COOKIE_MAX_AGE_ONE_HOUR;
+        SoupDate* max_date = soup_date_new_from_now (seconds);
+        if (expires > soup_date_to_time_t (max_date))
+        {
+            if (midori_debug ("cookies"))
+            {
+                gchar* new_date = soup_date_to_string (max_date, SOUP_DATE_COOKIE);
+                g_print ("^^ enforcing expiry: %s\n", new_date);
+                g_free (new_date);
+            }
+            soup_cookie_set_expires (new_cookie, max_date);
+        }
+        soup_date_free (max_date);
+    }
+}
+#endif
+
 gboolean
 midori_load_soup_session_full (gpointer settings)
 {
-#ifndef HAVE_WEBKIT2
+    #ifndef HAVE_WEBKIT2
     SoupSession* session = webkit_get_default_session ();
     SoupCookieJar* jar;
     gchar* config_file;
     SoupSessionFeature* feature;
-    gboolean have_new_cookies;
-    SoupSessionFeature* feature_import;
 
     midori_load_soup_session (settings);
 
@@ -276,43 +324,21 @@ midori_load_soup_session_full (gpointer settings)
     soup_session_add_feature (session, feature);
     g_object_unref (feature);
 
-    jar = soup_cookie_jar_new ();
-    g_object_set_data (G_OBJECT (jar), "midori-settings", settings);
+    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
+    jar = soup_cookie_jar_sqlite_new (config_file, FALSE);
     soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
+    g_signal_connect (jar, "changed",
+                      G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);
     g_object_unref (jar);
 
-    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
-    have_new_cookies = g_access (config_file, F_OK) == 0;
-    feature = g_object_new (KATZE_TYPE_HTTP_COOKIES_SQLITE, NULL);
-    g_object_set_data_full (G_OBJECT (feature), "filename",
-                            config_file, (GDestroyNotify)g_free);
-    soup_session_add_feature (session, feature);
-    g_object_unref (feature);
-
-    if (!have_new_cookies)
-    {
-        katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.txt"));
-        if (g_access (config_file, F_OK) == 0)
-        {
-            g_message ("Importing cookies from txt to sqlite3");
-            feature_import = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL);
-            g_object_set_data_full (G_OBJECT (feature_import), "filename",
-                                    config_file, (GDestroyNotify)g_free);
-            soup_session_add_feature (session, SOUP_SESSION_FEATURE (feature_import));
-            soup_session_remove_feature (session, SOUP_SESSION_FEATURE (feature_import));
-        }
-    }
-
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
     katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL));
     feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0));
     soup_session_add_feature (session, feature);
     soup_cache_set_max_size (SOUP_CACHE (feature),
         katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024);
     soup_cache_load (SOUP_CACHE (feature));
-    #endif
     g_free (config_file);
-#endif
+    #endif
     return FALSE;
 }
 
@@ -331,10 +357,8 @@ midori_load_extensions (gpointer data)
     MidoriApp* app = MIDORI_APP (data);
     gchar** keys = g_object_get_data (G_OBJECT (app), "extensions");
     KatzeArray* extensions;
-    #ifdef G_ENABLE_DEBUG
     gboolean startup_timer = midori_debug ("startup");
     GTimer* timer = startup_timer ? g_timer_new () : NULL;
-    #endif
 
     /* Load extensions */
     extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
@@ -342,10 +366,8 @@ midori_load_extensions (gpointer data)
     g_object_set (app, "extensions", extensions, NULL);
     midori_extension_load_from_folder (app, keys, TRUE);
 
-    #ifdef G_ENABLE_DEBUG
     if (startup_timer)
         g_debug ("Extensions:\t%f", g_timer_elapsed (timer, NULL));
-    #endif
 
     return FALSE;
 }
@@ -371,31 +393,6 @@ settings_notify_cb (MidoriWebSettings* settings,
     g_free (config_file);
 }
 
-static void
-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_config_filename_for_reading ("session.old.xbel");
-    GError* error = NULL;
-    if (midori_array_from_file (old_session, config_file, "xbel-tiny", &error))
-    {
-        KatzeItem* item;
-        KATZE_ARRAY_FOREACH_ITEM (item, old_session)
-            midori_browser_add_item (browser, item);
-    }
-    else
-    {
-        sokoke_message_dialog (GTK_MESSAGE_ERROR,
-            _("The session couldn't be loaded: %s\n"), error->message, FALSE);
-        g_error_free (error);
-    }
-    g_free (config_file);
-    gtk_action_set_sensitive (action, FALSE);
-    g_signal_handlers_disconnect_by_func (action,
-        midori_browser_action_last_session_activate_cb, browser);
-}
-
 static void
 midori_session_accel_map_changed_cb (GtkAccelMap*    accel_map,
                                      gchar*          accel_path,
@@ -407,149 +404,12 @@ midori_session_accel_map_changed_cb (GtkAccelMap*    accel_map,
     g_free (config_file);
 }
 
-static guint save_timeout = 0;
-
-static gboolean
-midori_session_save_timeout_cb (KatzeArray* session)
-{
-    gchar* config_file = midori_paths_get_config_filename_for_writing ("session.xbel");
-    GError* error = NULL;
-    if (!midori_array_to_file (session, config_file, "xbel-tiny", &error))
-    {
-        g_warning (_("The session couldn't be saved. %s"), error->message);
-        g_error_free (error);
-    }
-    g_free (config_file);
-
-    save_timeout = 0;
-    return FALSE;
-}
-
-static void
-midori_browser_session_cb (MidoriBrowser* browser,
-                           gpointer       pspec,
-                           KatzeArray*    session)
-{
-    if (!save_timeout)
-        save_timeout = midori_timeout_add_seconds (
-            5, (GSourceFunc)midori_session_save_timeout_cb, session, NULL);
-}
-
-static void
-midori_app_quit_cb (MidoriBrowser* browser,
-                    KatzeArray*    session)
-{
-    midori_session_save_timeout_cb (session);
-}
-
-static void
-midori_browser_weak_notify_cb (MidoriBrowser* browser,
-                               KatzeArray*    session)
-{
-    g_object_disconnect (browser, "any-signal",
-                         G_CALLBACK (midori_browser_session_cb), session, NULL);
-}
-
-gboolean
-midori_load_session (gpointer data)
+void
+midori_session_persistent_settings (MidoriWebSettings* settings,
+                                    MidoriApp*         app)
 {
-    KatzeArray* saved_session = KATZE_ARRAY (data);
-    MidoriBrowser* browser;
-    MidoriApp* app = katze_item_get_parent (KATZE_ITEM (saved_session));
-    MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-    MidoriStartup load_on_startup;
-    gchar* config_file;
-    KatzeArray* session;
-    KatzeItem* item;
-    gint64 current;
-    gchar** open_uris = g_object_get_data (G_OBJECT (app), "open-uris");
-    gchar** execute_commands = g_object_get_data (G_OBJECT (app), "execute-commands");
-    #ifdef G_ENABLE_DEBUG
-    gboolean startup_timer = midori_debug ("startup");
-    GTimer* timer = startup_timer ? g_timer_new () : NULL;
-    #endif
-
-    browser = midori_app_create_browser (app);
     g_signal_connect_after (settings, "notify", G_CALLBACK (settings_notify_cb), app);
-
-    config_file = midori_paths_get_config_filename_for_reading ("session.old.xbel");
-    if (g_access (config_file, F_OK) == 0)
-    {
-        GtkActionGroup* action_group = midori_browser_get_action_group (browser);
-        GtkAction* action = gtk_action_group_get_action (action_group, "LastSession");
-        g_signal_connect (action, "activate",
-            G_CALLBACK (midori_browser_action_last_session_activate_cb), browser);
-        gtk_action_set_visible (action, TRUE);
-    }
-    midori_app_add_browser (app, browser);
-    gtk_widget_show (GTK_WIDGET (browser));
-
-    katze_assign (config_file, midori_paths_get_config_filename_for_reading ("accels"));
     g_signal_connect_after (gtk_accel_map_get (), "changed",
         G_CALLBACK (midori_session_accel_map_changed_cb), NULL);
 
-    load_on_startup = (MidoriStartup)g_object_get_data (G_OBJECT (settings), "load-on-startup");
-    if (katze_array_is_empty (saved_session))
-    {
-        item = katze_item_new ();
-        if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE)
-            katze_item_set_uri (item, "about:new");
-        else
-            katze_item_set_uri (item, "about:home");
-        katze_array_add_item (saved_session, item);
-        g_object_unref (item);
-    }
-
-    session = midori_browser_get_proxy_array (browser);
-    KATZE_ARRAY_FOREACH_ITEM (item, saved_session)
-    {
-        katze_item_set_meta_integer (item, "append", 1);
-        katze_item_set_meta_integer (item, "dont-write-history", 1);
-        if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES
-         || katze_item_get_meta_integer (item, "delay") == MIDORI_DELAY_PENDING_UNDELAY)
-            katze_item_set_meta_integer (item, "delay", MIDORI_DELAY_DELAYED);
-        midori_browser_add_item (browser, item);
-    }
-
-    current = katze_item_get_meta_integer (KATZE_ITEM (saved_session), "current");
-    if (!(item = katze_array_get_nth_item (saved_session, current)))
-    {
-        current = 0;
-        item = katze_array_get_nth_item (saved_session, 0);
-    }
-    midori_browser_set_current_page (browser, current);
-    if (midori_uri_is_blank (katze_item_get_uri (item)))
-        midori_browser_activate_action (browser, "Location");
-
-    guint i = 0;
-    for (i = 0; open_uris && open_uris[i]; i++)
-    {
-        gchar* uri = sokoke_magic_uri (open_uris[i], TRUE, TRUE);
-        midori_browser_add_uri (browser, uri);
-        g_free (uri);
-    }
-
-    g_object_unref (settings);
-    g_object_unref (saved_session);
-    g_free (config_file);
-
-    g_signal_connect_after (browser, "add-tab",
-        G_CALLBACK (midori_browser_session_cb), session);
-    g_signal_connect_after (browser, "remove-tab",
-        G_CALLBACK (midori_browser_session_cb), session);
-    g_signal_connect (app, "quit",
-        G_CALLBACK (midori_app_quit_cb), session);
-    g_object_weak_ref (G_OBJECT (session),
-        (GWeakNotify)(midori_browser_weak_notify_cb), browser);
-
-    if (execute_commands != NULL)
-        midori_app_send_command (app, execute_commands);
-
-    #ifdef G_ENABLE_DEBUG
-    if (startup_timer)
-        g_debug ("Session setup:\t%f", g_timer_elapsed (timer, NULL));
-    #endif
-
-    return FALSE;
 }
-
index cfe6482139acf9d006828e23de093b21a913b52f..d229de94cf51c416aa674813835712695904898a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -13,6 +13,8 @@
 #define __MIDORI_SESSION_H__
 
 #include <glib/gstdio.h>
+#include "midori-app.h"
+#include "midori-websettings.h"
 
 gboolean
 midori_load_soup_session (gpointer settings);
@@ -23,8 +25,9 @@ midori_load_soup_session_full (gpointer settings);
 gboolean
 midori_load_extensions (gpointer data);
 
-gboolean
-midori_load_session (gpointer data);
+void
+midori_session_persistent_settings (MidoriWebSettings* settings,
+                                    MidoriApp*         app);
 
 #endif /* __MIDORI_SESSION_H__ */
 
index aa4e61da5656ef5ce146b66cf8137d10a62eb094..387aafaaf4650c0974fc1c85e5e56b69b2ce578f 100644 (file)
@@ -65,6 +65,26 @@ namespace Midori {
         /* Since: 0.4.8 */
         public uint inactivity_reset { get; set; default = 0; }
 
+        string? default_theme_name_ = null;
+        /* Since: 0.5.5 */
+        public string? default_theme_name { get {
+            if (default_theme_name_ == null)
+                default_theme_name_ = Gtk.Settings.get_default ().gtk_theme_name;
+            return default_theme_name_;
+        } }
+        string? theme_name_ = null;
+        /* Since: 0.5.5 */
+        public string? theme_name { get {
+            return theme_name_;
+        } set {
+            if (theme_name != value) {
+                if (default_theme_name_ == null)
+                    default_theme_name_ = Gtk.Settings.get_default ().gtk_theme_name;
+                theme_name_ = value;
+                Gtk.Settings.get_default ().gtk_theme_name = theme_name_;
+            }
+        } }
+
         GLib.Regex? block_uris_regex = null;
         /* Since: 0.4.8 */
         public string? block_uris { get {
@@ -119,6 +139,8 @@ namespace Midori {
         /* Since: 0.1.4 */
         // [Deprecated (since = "0.4.7")]
         public bool find_while_typing { get; set; default = false; }
+        /* Since: 0.5.4 */
+        public double zoom_level { get; set; default = 1.0; }
 
         public bool open_popups_in_tabs { get; set; default = true; }
         /* Since: 0.2.0 */
@@ -131,6 +153,7 @@ namespace Midori {
         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; }
+        // [Deprecated (since = "0.5.7")]
         public bool always_show_tabbar { get; set; default = true; }
 
         public string homepage { get; set; default = "about:search"; }
index ba27997fb6f83d83fd5a0b061ace7455ccffcd6f..0da3573fa8b952f2f46cb5b8808f0c2dfb52a82a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2011-2012 Christian Dywan <christian@twotoats.de>
+ Copyright (C) 2011-2013 Christian Dywan <christian@twotoats.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -32,8 +32,10 @@ namespace Midori {
         string filename;
         string? html = null;
         List<Spec> thumb_queue = null;
+#if !HAVE_WEBKIT2
         WebKit.WebView thumb_view = null;
         Spec? spec = null;
+#endif
 
         public GLib.KeyFile keyfile;
         public bool close_buttons_left { get; set; default = false; }
@@ -50,6 +52,7 @@ namespace Midori {
 
         public SpeedDial (string new_filename, string? fallback = null) {
             filename = new_filename;
+            thumb_queue = new GLib.List<Spec> ();
             keyfile = new GLib.KeyFile ();
             try {
                 keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
@@ -127,8 +130,7 @@ namespace Midori {
                 }
                 catch (KeyFileError error) { }
             }
-            if (&count != null)
-                count = slot_count;
+            count = slot_count;
 
             uint slot = 1;
             while (slot <= slot_count) {
@@ -141,12 +143,18 @@ namespace Midori {
             return "Dial %u".printf (slot_count + 1);
         }
 
-        public void add (string uri, string title, Gdk.Pixbuf img) {
+        public void add (string uri, string title, Gdk.Pixbuf? img) {
             string id = get_next_free_slot ();
-            add_with_id (id, uri, title, img);
+            uint slot = id.substring (5, -1).to_int ();
+            try {
+                save_message ("speed_dial-save-add %u %s".printf (slot, uri));
+            }
+            catch (Error error) {
+                critical ("Failed to add speed dial thumbnail: %s", error.message);
+            }
         }
 
-        public void add_with_id (string id, string uri, string title, Gdk.Pixbuf 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);
 
@@ -180,7 +188,6 @@ namespace Midori {
                 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);
 
@@ -243,7 +250,7 @@ namespace Midori {
                                 <div class="shortcut" id="%u"><div class="preview">
                                 <a class="cross" href="#"></a>
                                 <a href="%s"><img src="data:image/png;base64,%s" title='%s'></a>
-                                </div><div class="title">%s</div></div>
+                                </div><input type="text" class="title selectable" value="%s"></div>
                                 """,
                                 slot, uri, encoded ?? "", title, title ?? "");
                         }
@@ -333,69 +340,83 @@ namespace Midori {
             refresh ();
         }
 
-        void load_status (GLib.Object thumb_view_, ParamSpec pspec) {
 #if !HAVE_WEBKIT2
-            if (thumb_view.load_status != WebKit.LoadStatus.FINISHED)
+        void load_status (GLib.Object thumb_view_, ParamSpec pspec) {
+            if (thumb_view.load_status != WebKit.LoadStatus.FINISHED
+             && thumb_view.load_status != WebKit.LoadStatus.FAILED)
                 return;
+            thumb_view.notify["load-status"].disconnect (load_status);
+            /* Schedule an idle to give the offscreen time to draw */
+            Idle.add (save_thumbnail);
+        }
+#endif
 
-            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);
+#if !HAVE_WEBKIT2
+        bool save_thumbnail () {
+            return_val_if_fail (spec != null, false);
+
+            var offscreen = (thumb_view.parent as Gtk.OffscreenWindow);
+            var pixbuf = offscreen.get_pixbuf ();
+            int image_width = pixbuf.get_width (), image_height = pixbuf.get_height ();
+            int thumb_width = 240, thumb_height = 160;
+            float image_ratio = image_width / image_height;
+            float thumb_ratio = thumb_width / thumb_height;
+            int x_offset, y_offset, computed_width, computed_height;
+            if (image_ratio > thumb_ratio) {
+                computed_width = (int)(image_height * thumb_ratio);
+                computed_height = image_height;
+                x_offset = (image_width - computed_width) / 2;
+                y_offset = 0;
+            }
+            else {
+                computed_width = image_width;
+                computed_height = (int)(image_width / thumb_ratio);
+                x_offset = 0;
+                y_offset = 0;
+            }
+            var sub = pixbuf;
+            if (y_offset + computed_height <= image_height)
+                sub = new Gdk.Pixbuf.subpixbuf (pixbuf, x_offset, y_offset, computed_width, computed_height);
+            var scaled = sub.scale_simple (thumb_width, thumb_height, Gdk.InterpType.TILES);
+            add_with_id (spec.dial_id, spec.uri, thumb_view.get_title () ?? spec.uri, scaled);
 
             thumb_queue.remove (spec);
-            if (thumb_queue != null && thumb_queue.data != null) {
-                spec = thumb_queue.data;
+            if (thumb_queue.length () > 0) {
+                spec = thumb_queue.nth_data (0);
+                thumb_view.notify["load-status"].connect (load_status);
                 thumb_view.load_uri (spec.uri);
             }
-            else
-                /* disconnect_by_func (thumb_view, load_status) */;
-#endif
+            return false;
         }
+#endif
 
         void get_thumb (string dial_id, string uri) {
 #if !HAVE_WEBKIT2
             if (thumb_view == null) {
                 thumb_view = new WebKit.WebView ();
-                var settings = new WebKit.WebSettings ();
-                settings. set ("enable-javascript", 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
+                thumb_view.settings.set (
+                    "enable-scripts", false,
+                    "enable-plugins", false,
+                    "auto-load-images", true,
+                    "enable-html5-database", false,
+                    "enable-html5-local-storage", false,
+                    "enable-java-applet", false);
                 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
             }
 
+            /* Don't load thumbnails already queued */
+            foreach (var spec_ in thumb_queue)
+                if (spec_.dial_id == dial_id)
+                    return;
+
             thumb_queue.append (new Spec (dial_id, uri));
-            if (thumb_queue.nth_data (1) != null)
+            if (thumb_queue.length () > 1)
                 return;
 
-            spec = thumb_queue.data;
+            spec = thumb_queue.nth_data (0);
             thumb_view.notify["load-status"].connect (load_status);
             thumb_view.load_uri (spec.uri);
 #endif
index 652db7fdba20d263573a57ea9e1e1004cbb5202e..fbc8f22c670676fa1f41e74afad6bf0951f0717b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
  Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
  Copyright (C) 2011 Peter Hatina <phatina@redhat.com>
 
@@ -33,13 +33,19 @@ namespace Midori {
         PROVISIONAL /* A new URI was scheduled. */
     }
 
+    [CCode (cprefix = "MIDORI_LOAD_ERROR_")]
+    public enum LoadError {
+        NONE,
+        DELAYED,
+        SECURITY,
+        CRASH,
+        NETWORK
+    }
+
     public class Tab : Gtk.VBox {
+        public Tab related { get; set construct; }
         public WebKit.WebView web_view { get; private set; }
 
-        #if HAVE_GRANITE_CLUTTER
-        public Granite.Widgets.NavigationBox navigation_box { get; private set; }
-        #endif
-
         private string current_uri = "about:blank";
         public string uri { get {
             return current_uri;
@@ -51,15 +57,29 @@ namespace Midori {
 
         /* Special is an error, blank or delayed page */
         public bool special { get; protected set; default = false; }
+        /* Minimizing a tab indicates that only the icon should be shown.
+           Since: 0.1.8 */
+        public bool minimized { get; set; default = false; }
         /* Since: 0.4.8 */
         public string mime_type { get; protected set; default = "text/plain"; }
         /* Since: 0.1.2 */
         public Security security { get; protected set; default = Security.NONE; }
         public LoadStatus load_status { get; protected set; default = LoadStatus.FINISHED; }
+        public LoadError load_error { get; protected set; default = LoadError.NONE; }
         public string? statusbar_text { get; protected set; default = null; }
         /* Since: 0.5.0 */
+
         public Gdk.Color? fg_color { get; protected set; default = null; }
-        public Gdk.Color? bg_color { get; protected set; default = null; }
+        private Gdk.Color? bg_color_ = null;
+        public Gdk.Color? bg_color { get {
+            return bg_color_;
+        } protected set {
+            bg_color_ = value;
+            colors_changed ();
+        } }
+        /* After fg_color and bg_color have changed.
+           Since: 0.5.7 */
+        public signal void colors_changed ();
 
         /* Special pages don't convey progress */
         private double current_progress = 0.0;
@@ -79,6 +99,14 @@ namespace Midori {
         }
         }
 
+        /* Emitted when a uri is attempted to be loaded.
+           Returns FALSE if the URI could not be handled by Midori or any
+           external application.
+           Since: 0.5.8
+         */
+        public signal bool open_uri (string uri);
+        /* Since: 0.5.8 */
+        public signal bool navigation_requested (string uri);
         public signal void console_message (string message, int line, string source_id);
         public signal void attach_inspector (WebKit.WebView inspector_view);
         /* Emitted when an open inspector that was previously
@@ -89,6 +117,13 @@ namespace Midori {
         /* Allow the browser to provide the find bar */
         public signal void search_text (bool found, string typing);
 
+       /* Since: 0.5.5 */
+        public signal void context_menu (WebKit.HitTestResult hit_test_result, ContextAction menu);
+
+        /* A dialog tab has a fixed size, limited GUI and is transient.
+           Since: 0.5.6 */
+        public bool is_dialog { get; protected set; }
+
         public bool is_blank () {
             return URI.is_blank (uri);
         }
@@ -98,42 +133,29 @@ namespace Midori {
             orientation = Gtk.Orientation.VERTICAL;
             #endif
 
-            #if HAVE_GRANITE_CLUTTER
-            navigation_box = new Granite.Widgets.NavigationBox ();
-            #endif
-
+#if HAVE_WEBKIT2_3_91
+            web_view = related != null ?
+              new WebKit.WebView.with_related_view (related.web_view) : new WebKit.WebView ();
+#else
             web_view = new WebKit.WebView ();
+#endif
             /* Load something to avoid a bug where WebKit might not set a main frame */
             web_view.load_uri ("");
         }
 
         public void inject_stylesheet (string stylesheet) {
 #if !HAVE_WEBKIT2
-            #if HAVE_DOM
             var dom = web_view.get_dom_document ();
+            return_if_fail (dom.head != null);
             try {
                 var style = dom.create_element ("style");
                 style.set_attribute ("type", "text/css");
                 style.append_child (dom.create_text_node (stylesheet));
-                return_if_fail (dom.head != null);
                 dom.head.append_child (style);
             }
             catch (Error error) {
                 critical (_("Failed to inject stylesheet: %s"), error.message);
             }
-            #else
-            web_view.execute_script ("""
-                (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);
-                }) ();
-                """.printf (stylesheet));
-            #endif
 #endif
         }
 
@@ -158,7 +180,7 @@ namespace Midori {
 #endif
 
         public bool can_view_source () {
-            if (is_blank () || special || view_source)
+            if (view_source)
                 return false;
             string content_type = ContentType.from_mime_type (mime_type);
 #if HAVE_WIN32
@@ -228,9 +250,6 @@ namespace Midori {
         }
 
         public void go_forward () {
-            #if HAVE_GRANITE_CLUTTER
-            navigation_box.forward ();
-            #endif
             web_view.go_forward ();
         }
 
@@ -257,6 +276,35 @@ namespace Midori {
             web_view.mark_text_matches (text, case_sensitive, 0);
             web_view.set_highlight_text_matches (true);
             return found;
+#endif
+        }
+
+        /*
+          Updates all editing actions with regard to text selection.
+
+          Since: 0.5.8
+         */
+        public async void update_actions (Gtk.ActionGroup actions) {
+#if HAVE_WEBKIT2
+            try {
+                actions.get_action ("Undo").sensitive = yield web_view.can_execute_editing_command ("Undo", null);
+                actions.get_action ("Redo").sensitive = yield web_view.can_execute_editing_command ("Redo", null);
+                actions.get_action ("Cut").sensitive = yield web_view.can_execute_editing_command ("Cut", null);
+                actions.get_action ("Copy").sensitive = yield web_view.can_execute_editing_command ("Copy", null);
+                actions.get_action ("Paste").sensitive = yield web_view.can_execute_editing_command ("Paste", null);
+                actions.get_action ("Delete").sensitive = yield web_view.can_execute_editing_command ("Cut", null);
+                actions.get_action ("SelectAll").sensitive = yield web_view.can_execute_editing_command ("SelectAll", null);
+            } catch (Error error) {
+                critical ("Failed to update actions: %s", error.message);
+            }
+#else
+            actions.get_action ("Undo").sensitive = web_view.can_undo ();
+            actions.get_action ("Redo").sensitive = web_view.can_redo ();
+            actions.get_action ("Cut").sensitive = web_view.can_cut_clipboard ();
+            actions.get_action ("Copy").sensitive = web_view.can_copy_clipboard ();
+            actions.get_action ("Paste").sensitive = web_view.can_paste_clipboard ();
+            actions.get_action ("Delete").sensitive = web_view.can_cut_clipboard ();
+            actions.get_action ("SelectAll").sensitive = true;
 #endif
         }
     }
index 75b4fe4d11ab1d7f94f54e22a70792f6edbbc4e8..a5cfa8814316e843ae6c391dd2de568f4cbf7f57 100644 (file)
 
 #include <config.h>
 
-#ifdef HAVE_GRANITE
-#include <granite.h>
-#endif
-
 #ifdef HAVE_GCR
     #define GCR_API_SUBJECT_TO_CHANGE
     #include <gcr/gcr.h>
 #endif
 
-#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_29_91)
+#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_34_0)
 SoupMessage*
 midori_map_get_message (SoupMessage* message);
 #endif
@@ -56,12 +52,6 @@ midori_map_get_message (SoupMessage* message);
     #include <sys/utsname.h>
 #endif
 
-#if !WEBKIT_CHECK_VERSION (1, 4, 3)
-/* This is unstable API, so we need to declare it */
-gchar*
-webkit_web_view_get_selected_text (WebKitWebView* web_view);
-#endif
-
 static void
 midori_view_item_meta_data_changed (KatzeItem*   item,
                                     const gchar* key,
@@ -77,17 +67,23 @@ midori_view_uri_scheme_res (WebKitURISchemeRequest* request,
                             gpointer                user_data);
 
 static void
-midori_view_download_requested_cb (WebKitWebContext* context,
+midori_view_download_started_cb (WebKitWebContext* context,
+                                   WebKitDownload*   download,
+                                   MidoriView * view);
+static gboolean
+midori_view_download_query_action (MidoriView*     view,
                                    WebKitDownload*   download,
-                                   gpointer          user_data);
+                                   const gchar * suggested_filename );
 #endif
 
 static gboolean
 midori_view_display_error (MidoriView*     view,
                            const gchar*    uri,
+                           const gchar*    error_icon,
                            const gchar*    title,
                            const gchar*    message,
                            const gchar*    description,
+                           const gchar*    suggestions,
                            const gchar*    try_again,
 #ifndef HAVE_WEBKIT2
                            WebKitWebFrame* web_frame);
@@ -113,21 +109,13 @@ struct _MidoriView
     KatzeArray* news_feeds;
 
     gboolean open_tabs_in_the_background;
-    gboolean close_buttons_on_tabs;
     MidoriNewPage open_new_pages_in;
     gint find_links;
     gint alerts;
 
+    GtkWidget* tab_label;
     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;
     GtkWidget* scrolled_window;
@@ -164,6 +152,7 @@ enum {
     NEW_VIEW,
     DOWNLOAD_REQUESTED,
     ADD_BOOKMARK,
+    ABOUT_CONTENT,
 
     LAST_SIGNAL
 };
@@ -307,6 +296,28 @@ midori_view_class_init (MidoriViewClass* class)
         G_TYPE_NONE, 1,
         G_TYPE_STRING);
 
+    /**
+     * MidoriView::about-content:
+     * @view: the object on which the signal is emitted
+     * @uri: the about URI
+     *
+     * Emitted when loading the about content
+     *
+     * Return value: the view content as string
+     *
+     * Since: 0.5.5
+     */
+    signals[ABOUT_CONTENT] = g_signal_new (
+        "about-content",
+        G_TYPE_FROM_CLASS (class),
+        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+        0,
+        g_signal_accumulator_true_handled,
+        NULL,
+        midori_cclosure_marshal_BOOLEAN__STRING,
+        G_TYPE_BOOLEAN, 1,
+        G_TYPE_STRING);
+
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->constructor = midori_view_constructor;
     gobject_class->finalize = midori_view_finalize;
@@ -336,26 +347,6 @@ midori_view_class_init (MidoriViewClass* class)
                                      GDK_TYPE_PIXBUF,
                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
-    /**
-    * MidoriView:minimized:
-    *
-    * Whether the view is minimized or in normal state.
-    *
-    * Minimizing a view indicates that only the icon should
-    * be advertised rather than the full blown tab label and
-    * it might otherwise be presented specially.
-    *
-    * Since: 0.1.8
-    */
-    g_object_class_install_property (gobject_class,
-                                     PROP_MINIMIZED,
-                                     g_param_spec_boolean (
-                                     "minimized",
-                                     "Minimized",
-                                     "Whether the view is minimized or in normal state",
-                                     FALSE,
-                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
     g_object_class_install_property (gobject_class,
                                      PROP_ZOOM_LEVEL,
                                      g_param_spec_float (
@@ -391,16 +382,6 @@ midori_view_class_init (MidoriViewClass* class)
                                      "The associated settings",
                                      MIDORI_TYPE_WEB_SETTINGS,
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    #ifdef HAVE_WEBKIT2
-    WebKitWebContext* context = webkit_web_context_get_default ();
-    webkit_web_context_register_uri_scheme (context,
-        "res", midori_view_uri_scheme_res, NULL, NULL);
-    webkit_web_context_register_uri_scheme (context,
-        "stock", midori_view_uri_scheme_res, NULL, NULL);
-    g_signal_connect (context, "download-started",
-        (GCallback)midori_view_download_requested_cb, NULL);
-    #endif
 }
 
 static void
@@ -409,21 +390,6 @@ midori_view_set_title (MidoriView* view, const gchar* title)
     const gchar* uri = midori_tab_get_uri (MIDORI_TAB (view));
     katze_assign (view->title, g_strdup (midori_tab_get_display_title (title, uri)));
     view->ellipsize = midori_tab_get_display_ellipsize (view->title, uri);
-
-    #ifdef HAVE_GRANITE
-    if (view->tab)
-        g_object_set (view->tab,
-            "label", view->title, "ellipsize-mode", view->ellipsize, NULL);
-    #else
-    if (view->tab_label)
-    {
-        gtk_label_set_text (GTK_LABEL (view->tab_title), view->title);
-        gtk_widget_set_tooltip_text (view->tab_icon, view->title);
-        gtk_widget_set_tooltip_text (view->tab_title, view->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))), view->title);
@@ -444,20 +410,6 @@ midori_view_apply_icon (MidoriView*  view,
     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, '/'))
-            katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon),
-                                                 icon_name);
-        else
-            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, view->web_view);
@@ -492,129 +444,6 @@ midori_view_unset_icon (MidoriView* view)
     g_object_unref (icon);
 }
 
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-static GdkPixbuf*
-katze_pixbuf_new_from_buffer (const guchar* buffer,
-                              gsize         length,
-                              const gchar*  mime_type,
-                              GError**      error)
-{
-    /* Proposed for inclusion in GdkPixbuf
-       See http://bugzilla.gnome.org/show_bug.cgi?id=74291 */
-    GdkPixbufLoader* loader;
-    GdkPixbuf* pixbuf;
-
-    g_return_val_if_fail (buffer != NULL, NULL);
-    g_return_val_if_fail (length > 0, NULL);
-
-    if (mime_type)
-    {
-        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
-        if (!loader)
-            return NULL;
-    }
-    else
-        loader = gdk_pixbuf_loader_new ();
-    if (!gdk_pixbuf_loader_write (loader, buffer, length, error))
-    {
-        g_object_unref (loader);
-        return NULL;
-    }
-    if (!gdk_pixbuf_loader_close (loader, error))
-    {
-        g_object_unref (loader);
-        return NULL;
-    }
-
-    pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-    g_object_ref (pixbuf);
-    g_object_unref (loader);
-    return pixbuf;
-}
-
-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 (memory);
-}
-
-static gboolean
-katze_net_icon_status_cb (KatzeNetRequest*  request,
-                          MidoriView*       view)
-{
-    switch (request->status)
-    {
-        case KATZE_NET_VERIFIED:
-            if (request->mime_type && strncmp (request->mime_type, "image/", 6))
-            {
-                return FALSE;
-            }
-            break;
-        case KATZE_NET_MOVED:
-            break;
-        default:
-            return FALSE;
-    }
-    return TRUE;
-}
-
-static void
-katze_net_icon_transfer_cb (KatzeNetRequest*  request,
-                            MidoriView*       view)
-{
-    GdkPixbuf* pixbuf;
-    FILE* fp;
-    GdkPixbuf* pixbuf_scaled;
-    gint icon_width, icon_height;
-    size_t ret;
-    GtkSettings* settings;
-
-    if (request->status == KATZE_NET_MOVED)
-        return;
-
-    pixbuf = NULL;
-    if (request->data)
-    {
-        gchar* icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons");
-        if (icon_file && (fp = fopen (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 %s", icon_file, G_STRFUNC);
-        }
-        g_free (icon_file);
-
-        pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data,
-                            request->length, request->mime_type, NULL);
-
-    }
-
-    if (!pixbuf)
-    {
-        midori_view_unset_icon (view);
-        return;
-    }
-
-    g_hash_table_insert (midori_view_get_memory (), g_strdup (view->icon_uri), pixbuf);
-    settings = gtk_widget_get_settings (view->web_view);
-    gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
-    pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR);
-    midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
-}
-#endif
-
 static void
 _midori_web_view_load_icon (MidoriView* view)
 {
@@ -634,74 +463,10 @@ _midori_web_view_load_icon (MidoriView* view)
         g_object_unref (pixbuf);
         midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
     }
-    #elif WEBKIT_CHECK_VERSION (1, 8, 0)
+    #else
     if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
         WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height)))
         midori_view_apply_icon (view, pixbuf, view->icon_uri);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    if ((pixbuf = webkit_web_view_get_icon_pixbuf (
-        WEBKIT_WEB_VIEW (view->web_view))))
-    {
-        GdkPixbuf* pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-            icon_width, icon_height, GDK_INTERP_BILINEAR);
-        g_object_unref (pixbuf);
-        midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
-    }
-    #else
-    GdkPixbuf* pixbuf_scaled;
-    const gchar* uri = midori_tab_get_uri (MIDORI_TAB (view));
-
-    if (!midori_uri_is_http (view->icon_uri))
-        katze_assign (view->icon_uri, NULL);
-
-    if (midori_uri_is_http (uri) || g_str_has_prefix (uri, "file://"))
-    {
-        gchar* icon_file = NULL;
-        if (!view->icon_uri)
-        {
-            guint i = 8;
-            while (uri[i] != '\0' && uri[i] != '/')
-                i++;
-            if (uri[i] == '/')
-            {
-                gchar* path = g_strndup (uri, i);
-                view->icon_uri = g_strdup_printf ("%s/favicon.ico", path);
-                g_free (path);
-            }
-            else
-                view->icon_uri = g_strdup_printf ("%s/favicon.ico", uri);
-        }
-
-        if (g_hash_table_lookup_extended (midori_view_get_memory (),
-                                          view->icon_uri, NULL, (gpointer)&pixbuf))
-        {
-            g_warn_if_fail (pixbuf != NULL);
-            g_object_ref (pixbuf);
-        }
-        else if ((icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons")) &&
-                 (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));
-        }
-        else if (!midori_tab_get_special (MIDORI_TAB (view)))
-        {
-            katze_net_load_uri (NULL, view->icon_uri,
-                (KatzeNetStatusCb)katze_net_icon_status_cb,
-                (KatzeNetTransferCb)katze_net_icon_transfer_cb, view);
-        }
-
-        g_free (icon_file);
-    }
-
-    if (pixbuf)
-    {
-        pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-            icon_width,  icon_height, GDK_INTERP_BILINEAR);
-        g_object_unref (pixbuf);
-        pixbuf = pixbuf_scaled;
-        midori_view_apply_icon (view, pixbuf, view->icon_uri);
-    }
     #endif
 }
 
@@ -709,23 +474,21 @@ static void
 midori_view_update_load_status (MidoriView*      view,
                                 MidoriLoadStatus load_status)
 {
-    if (midori_tab_get_load_status (MIDORI_TAB (view)) == load_status)
-        return;
-
-    midori_tab_set_load_status (MIDORI_TAB (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
+    if (midori_tab_get_load_status (MIDORI_TAB (view)) != load_status)
+        midori_tab_set_load_status (MIDORI_TAB (view), load_status);
 }
 
-#if defined (HAVE_LIBSOUP_2_29_91)
+#ifdef HAVE_LIBSOUP_2_34_0
+/**
+ * midori_view_get_tls_info
+ * @view: a #MidoriView
+ * @request: a #WebKitNetworkRequest with WebKit1, otherwise %NULL
+ * @tls_cert: variable to store the certificate
+ * @tls_flags: variable to store the flags
+ * @hostname: variable to store the hostname
+ *
+ * Returns %TRUE if the the host is secure and trustworthy.
+ **/
 gboolean
 midori_view_get_tls_info (MidoriView*           view,
                           void*                 request,
@@ -739,7 +502,7 @@ midori_view_get_tls_info (MidoriView*           view,
     gboolean success = webkit_web_view_get_tls_info (web_view, tls_cert, tls_flags);
     if (*tls_cert != NULL)
         g_object_ref (*tls_cert);
-    return success;
+    return success && *tls_flags == 0;
     #else
     SoupMessage* message = midori_map_get_message (webkit_network_request_get_message (request));
     if (message != NULL)
@@ -749,7 +512,7 @@ midori_view_get_tls_info (MidoriView*           view,
         g_object_get (message, "tls-certificate", tls_cert, "tls-errors", tls_flags, NULL);
         if (soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
             return TRUE;
-        return tls_flags == 0;
+        return *tls_flags == 0;
     }
     *tls_cert = NULL;
     *tls_flags = 0;
@@ -785,10 +548,28 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
             webkit_policy_decision_download (decision);
             return TRUE;
         }
+        webkit_policy_decision_use (decision);
+        return TRUE;
+    }
+    else if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION)
+    {
+        const gchar* uri = webkit_uri_request_get_uri (
+            webkit_navigation_policy_decision_get_request (WEBKIT_NAVIGATION_POLICY_DECISION (decision)));
+        g_signal_emit (view, signals[NEW_TAB], 0, uri, FALSE);
+        webkit_policy_decision_ignore(decision);
+        return FALSE;
+    }
+    else if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION)
+    {
+    }
+    else
+    {
+        g_debug ("Unhandled policy decision type %d", decision_type);
+        return FALSE;
     }
 
-    void* request = NULL;
-    const gchar* uri = webkit_web_view_get_uri (web_view);
+    WebKitURIRequest * request = webkit_navigation_policy_decision_get_request (WEBKIT_NAVIGATION_POLICY_DECISION (decision));
+    const gchar* uri = webkit_uri_request_get_uri (request);
     #else
     const gchar* uri = webkit_network_request_get_uri (request);
     #endif
@@ -799,19 +580,6 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
         g_free (new_uri);
         return TRUE;
     }
-    else if (sokoke_external_uri (uri))
-    {
-        if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)),
-                             uri, GDK_CURRENT_TIME, NULL))
-        {
-            #ifdef HAVE_WEBKIT2
-            webkit_policy_decision_ignore (decision);
-            #else
-            webkit_web_policy_decision_ignore (decision);
-            #endif
-            return TRUE;
-        }
-    }
     else if (g_str_has_prefix (uri, "data:image/"))
     {
         /* For security reasons, main content served as data: is limited to images
@@ -823,7 +591,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
         #endif
         return TRUE;
     }
-    #if defined (HAVE_GCR)
+    #ifdef HAVE_GCR
     else if (/* midori_tab_get_special (MIDORI_TAB (view)) && */ !strncmp (uri, "https", 5))
     {
         /* We show an error page if the certificate is invalid.
@@ -857,7 +625,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
                         gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());
                         gchar* title = g_strdup_printf ("Error granting trust: %s", error->message);
                         midori_tab_stop_loading (MIDORI_TAB (view));
-                        midori_view_display_error (view, NULL, NULL, title, slots,
+                        midori_view_display_error (view, NULL, NULL, NULL, title, slots, NULL,
                             _("Trust this website"), NULL);
                         g_free (title);
                         g_free (slots);
@@ -902,6 +670,19 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view
     g_free (result);
     view->find_links = -1;
     #endif
+
+    gboolean handled = FALSE;
+    g_signal_emit_by_name (view, "navigation-requested", uri, &handled);
+    if (handled)
+    {
+        #ifdef HAVE_WEBKIT2
+        webkit_policy_decision_ignore (decision);
+        #else
+        webkit_web_policy_decision_ignore (decision);
+        #endif
+        return TRUE;
+    }
+
     return FALSE;
 }
 
@@ -910,6 +691,7 @@ midori_view_load_started (MidoriView* view)
 {
     midori_view_update_load_status (view, MIDORI_LOAD_PROVISIONAL);
     midori_tab_set_progress (MIDORI_TAB (view), 0.0);
+    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NONE);
 }
 
 #ifdef HAVE_GCR
@@ -920,11 +702,6 @@ midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
 static void
 midori_view_load_committed (MidoriView* view)
 {
-    #ifdef HAVE_GRANITE_CLUTTER
-    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
-    granite_widgets_navigation_box_transition_ready (navigation_box);
-    #endif
-
     katze_assign (view->icon_uri, NULL);
 
     GList* children = gtk_container_get_children (GTK_CONTAINER (view));
@@ -943,15 +720,12 @@ midori_view_load_committed (MidoriView* view)
     }
 
     katze_item_set_added (view->item, time (NULL));
-    katze_item_set_meta_integer (view->item, "history-step", -1);
-
     g_object_set (view, "title", NULL, NULL);
-
     midori_view_unset_icon (view);
 
+    #ifdef HAVE_LIBSOUP_2_34_0
     if (!strncmp (uri, "https", 5))
     {
-        #if defined (HAVE_LIBSOUP_2_29_91)
         #ifdef HAVE_WEBKIT2
         void* request = NULL;
         #else
@@ -961,7 +735,7 @@ midori_view_load_committed (MidoriView* view)
         #endif
         GTlsCertificate* tls_cert;
         GTlsCertificateFlags tls_flags;
-        gchar* hostname; /* FIXME leak */
+        gchar* hostname;
         if (midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname))
             midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_TRUSTED);
         #ifdef HAVE_GCR
@@ -979,8 +753,8 @@ midori_view_load_committed (MidoriView* view)
             {
                 midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
                 midori_tab_stop_loading (MIDORI_TAB (view));
-                midori_view_display_error (view, NULL, NULL, _("Security unknown"),
-                    midori_location_action_tls_flags_to_string (tls_flags),
+                midori_view_display_error (view, NULL, NULL, NULL, _("Security unknown"),
+                    midori_location_action_tls_flags_to_string (tls_flags), NULL,
                     _("Trust this website"),
                     NULL);
             }
@@ -988,18 +762,19 @@ midori_view_load_committed (MidoriView* view)
         }
         #endif
         else
-        #endif
             midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
-        #if defined (HAVE_LIBSOUP_2_29_91)
+        #ifdef HAVE_GCR
         if (tls_cert != NULL)
             g_object_unref (tls_cert);
         g_free (hostname);
         #endif
     }
+    #endif
     else
         midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_NONE);
 
     view->find_links = -1;
+    
     midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED);
 
 }
@@ -1066,19 +841,25 @@ midori_view_web_view_resource_request_cb (WebKitWebView*         web_view,
         GdkPixbuf* pixbuf;
         const gchar* icon_name = &uri[8] ? &uri[8] : "";
         gint icon_size = GTK_ICON_SIZE_MENU;
-        GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (view));
-        GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
-        gint real_icon_size;
-        GtkIconInfo* icon_info;
-        const gchar* icon_filename;
         static gint icon_size_large_dialog = 0;
 
         if (!icon_size_large_dialog)
-            icon_size_large_dialog = gtk_icon_size_register ("large-dialog", 64, 64);
+        {
+            gint width = 48, height = 48;
+            gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, &height);
+            icon_size_large_dialog = gtk_icon_size_register ("large-dialog", width * 2, height * 2);
+        }
 
         if (g_ascii_isalpha (icon_name[0]))
-            icon_size = strstr (icon_name, "dialog") ?
-                icon_size_large_dialog : GTK_ICON_SIZE_BUTTON;
+        {
+            if (g_str_has_prefix (icon_name, "dialog/"))
+            {
+                icon_name = &icon_name [strlen("dialog/")];
+                icon_size = icon_size_large_dialog;
+            }
+            else
+                icon_size = GTK_ICON_SIZE_BUTTON;
+        }
         else if (g_ascii_isdigit (icon_name[0]))
         {
             guint i = 0;
@@ -1095,35 +876,6 @@ midori_view_web_view_resource_request_cb (WebKitWebView*         web_view,
                 }
         }
 
-        /* If available, load SVG icon as SVG markup */
-        gtk_icon_size_lookup_for_settings (
-            gtk_widget_get_settings (GTK_WIDGET (view)),
-                icon_size, &real_icon_size, &real_icon_size);
-        icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name,
-            real_icon_size, GTK_ICON_LOOKUP_FORCE_SVG);
-        icon_filename = icon_info ? gtk_icon_info_get_filename (icon_info) : NULL;
-        if (icon_filename && g_str_has_suffix (icon_filename, ".svg"))
-        {
-            gchar* buffer;
-            gsize buffer_size;
-            if (g_file_get_contents (icon_filename, &buffer, &buffer_size, NULL))
-            {
-                #ifdef HAVE_WEBKIT2
-                GInputStream* stream = g_memory_input_stream_new_from_data (buffer, buffer_size, g_free);
-                webkit_uri_scheme_request_finish (request, stream, -1, "image/svg+xml");
-                g_object_unref (stream);
-                #else
-                gchar* encoded = g_base64_encode ((guchar*)buffer, buffer_size);
-                gchar* data_uri = g_strconcat ("data:image/svg+xml;base64,", encoded, NULL);
-                g_free (buffer);
-                g_free (encoded);
-                webkit_network_request_set_uri (request, data_uri);
-                g_free (data_uri);
-                #endif
-                return;
-            }
-        }
-
         /* Render icon as a PNG at the desired size */
         pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL);
         if (!pixbuf)
@@ -1159,9 +911,6 @@ midori_view_web_view_resource_request_cb (WebKitWebView*         web_view,
     }
 }
 
-#define HAVE_GTK_INFO_BAR GTK_CHECK_VERSION (2, 18, 0)
-
-#if HAVE_GTK_INFO_BAR
 static void
 midori_view_infobar_response_cb (GtkWidget* infobar,
                                  gint       response,
@@ -1173,20 +922,6 @@ midori_view_infobar_response_cb (GtkWidget* infobar,
         response_cb (infobar, response, data_object);
     gtk_widget_destroy (infobar);
 }
-#else
-static void
-midori_view_info_bar_button_cb (GtkWidget* button,
-                                gpointer   data_object)
-{
-    GtkWidget* infobar = gtk_widget_get_parent (gtk_widget_get_parent (button));
-    gint response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "midori-infobar-response"));
-    void (*response_cb) (GtkWidget*, gint, gpointer);
-    response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb");
-    if (response_cb != NULL)
-        response_cb (infobar, response, data_object);
-    gtk_widget_destroy (infobar);
-}
-#endif
 
 /**
  * midori_view_add_info_bar
@@ -1222,11 +957,11 @@ midori_view_add_info_bar (MidoriView*    view,
     va_list args;
     const gchar* button_text;
 
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
     g_return_val_if_fail (message != NULL, NULL);
 
     va_start (args, first_button_text);
 
-    #if HAVE_GTK_INFO_BAR
     infobar = gtk_info_bar_new ();
     for (button_text = first_button_text; button_text;
          button_text = va_arg (args, const gchar*))
@@ -1242,29 +977,6 @@ midori_view_add_info_bar (MidoriView*    view,
                                     GTK_ORIENTATION_HORIZONTAL);
     g_signal_connect (infobar, "response",
         G_CALLBACK (midori_view_infobar_response_cb), data_object);
-    #else
-    infobar = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (infobar), 4);
-
-    content_area = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (infobar), content_area, TRUE, TRUE, 0);
-    action_area = gtk_hbutton_box_new ();
-    for (button_text = first_button_text; button_text;
-         button_text = va_arg (args, const gchar*))
-    {
-        gint response_id = va_arg (args, gint);
-        GtkWidget* button = gtk_button_new_with_mnemonic (button_text);
-        g_object_set_data (G_OBJECT (button), "midori-infobar-response",
-                           GINT_TO_POINTER (response_id));
-        g_signal_connect (button, "clicked",
-            G_CALLBACK (midori_view_info_bar_button_cb), data_object);
-        gtk_box_pack_start (GTK_BOX (action_area), button, FALSE, FALSE, 0);
-        if (response_id == GTK_RESPONSE_HELP)
-            gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
-                                                button, TRUE);
-    }
-    gtk_box_pack_start (GTK_BOX (infobar), action_area, FALSE, FALSE, 0);
-    #endif
 
     va_end (args);
     label = gtk_label_new (message);
@@ -1343,7 +1055,6 @@ midori_view_web_view_database_quota_exceeded_cb (WebKitWebView*     web_view,
     }
 }
 
-#if WEBKIT_CHECK_VERSION (1, 1, 23)
 static void
 midori_view_location_response_cb (GtkWidget*                       infobar,
                                   gint                             response,
@@ -1374,7 +1085,6 @@ midori_view_web_view_geolocation_decision_cb (WebKitWebView*                   w
     return TRUE;
 }
 #endif
-#endif
 
 void
 midori_view_set_html (MidoriView*     view,
@@ -1388,14 +1098,21 @@ midori_view_set_html (MidoriView*     view,
     WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
     if (!uri)
         uri = "about:blank";
-    katze_item_set_uri (view->item, uri);
-    midori_tab_set_special (MIDORI_TAB (view), TRUE);
 #ifndef HAVE_WEBKIT2
+    WebKitWebFrame* main_frame = webkit_web_view_get_main_frame (web_view);
     if (!web_frame)
-        web_frame = webkit_web_view_get_main_frame (web_view);
+        web_frame = main_frame;
+    if (web_frame == main_frame)
+    {
+        katze_item_set_uri (view->item, uri);
+        midori_tab_set_special (MIDORI_TAB (view), TRUE);
+    }
     webkit_web_frame_load_alternate_string (
         web_frame, data, uri, uri);
 #else
+    /* XXX: with webkit2 ensure child frames do not set tab URI/special/html */
+    katze_item_set_uri (view->item, uri);
+    midori_tab_set_special (MIDORI_TAB (view), TRUE);
     webkit_web_view_load_alternate_html (web_view, data, uri, uri);
 #endif
 }
@@ -1403,9 +1120,11 @@ midori_view_set_html (MidoriView*     view,
 static gboolean
 midori_view_display_error (MidoriView*     view,
                            const gchar*    uri,
+                           const gchar*    error_icon,
                            const gchar*    title,
                            const gchar*    message,
                            const gchar*    description,
+                           const gchar*    suggestions,
                            const gchar*    try_again,
 #ifndef HAVE_WEBKIT2
                            WebKitWebFrame* web_frame)
@@ -1422,6 +1141,13 @@ midori_view_display_error (MidoriView*     view,
         const gchar* icon;
         gchar* favicon;
         gchar* result;
+        gboolean is_main_frame;
+
+        #ifdef HAVE_WEBKIT2
+        is_main_frame = TRUE;
+        #else
+        is_main_frame = web_frame && (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)) == web_frame);
+        #endif
 
         #if !GTK_CHECK_VERSION (3, 0, 0)
         /* g_object_get_valist: object class `GtkSettings' has no property named `gtk-button-images' */
@@ -1442,11 +1168,14 @@ midori_view_display_error (MidoriView*     view,
                 "rtl" : "ltr",
             "{title}", title_escaped,
             "{favicon}", katze_str_non_null (favicon),
+            "{error_icon}", katze_str_non_null (error_icon),
             "{message}", message,
             "{description}", description,
+            "{suggestions}", katze_str_non_null (suggestions),
             "{tryagain}", try_again,
             "{uri}", uri,
             "{hide-button-images}", show_button_images ? "" : "display:none",
+            "{autofocus}", is_main_frame ? "autofocus=\"true\" " : "",
             NULL);
         g_free (favicon);
         g_free (title_escaped);
@@ -1475,6 +1204,10 @@ webkit_web_view_load_error_cb (WebKitWebView*  web_view,
                                GError*         error,
                                MidoriView*     view)
 {
+    /*in WebKit2's UIProcess/API/gtk/WebKitLoaderClient.cpp,
+    didFailProvisionalLoadWithErrorForFrame early-returns if the frame isn't
+    main, so we know that the pertinent frame here is the view's main frame--so
+    it's safe for midori_view_display_error to assume it fills in a main frame*/
     #ifdef HAVE_WEBKIT2
     void* web_frame = NULL;
     #endif
@@ -1494,10 +1227,39 @@ webkit_web_view_load_error_cb (WebKitWebView*  web_view,
         return FALSE;
     }
 
-    title = g_strdup_printf (_("Error - %s"), uri);
-    message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
-    result = midori_view_display_error (view, uri, title,
-        message, error->message, _("Try again"), web_frame);
+    if (!g_network_monitor_get_network_available (g_network_monitor_get_default ()))
+    {
+        title = g_strdup_printf (_("You are not connected to a network"));
+        message = g_strdup_printf (_("Your computer must be connected to a network to reach “%s”. "
+                                     "Connect to a wireless access point or attach a network cable and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    } 
+    else if (!g_network_monitor_can_reach (g_network_monitor_get_default (), 
+                                           g_network_address_parse_uri ("http://midori-browser.org/", 80, NULL), 
+                                           NULL, 
+                                           NULL))
+    {
+        title = g_strdup_printf (_("You are not connected to the Internet"));
+        message = g_strdup_printf (_("Your computer appears to be connected to a network, but can't reach “%s”. "
+                                     "Check your network settings and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    } 
+    else
+    {
+        title = g_strdup_printf (_("Midori can't find the page you're looking for"));
+        message = g_strdup_printf (_("The page located at “%s” cannot be found. "
+                                     "Check the web address for misspelled words and try again."), 
+                                     midori_uri_parse_hostname(uri, NULL));
+    }
+
+    result = midori_view_display_error (view, uri, "stock://dialog/network-error", title,
+                                        message, error->message, NULL,
+                                        _("Try Again"), web_frame);
+
+    /* if the main frame for the whole tab has a network error, set tab error status */
+    if (web_frame == webkit_web_view_get_main_frame (web_view))
+        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
+
     g_free (message);
     g_free (title);
     return result;
@@ -1531,8 +1293,8 @@ midori_view_apply_scroll_position (MidoriView* view)
 static void
 midori_view_load_finished (MidoriView* view)
 {
-    #ifndef HAVE_WEBKIT2
     midori_view_apply_scroll_position (view);
+    #ifndef HAVE_WEBKIT2
 
     {
         WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
@@ -1544,15 +1306,7 @@ midori_view_load_finished (MidoriView* view)
         "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); "
-        #if !WEBKIT_CHECK_VERSION (1, 1, 18)
-        "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); "
-        #endif
-        "} if (document.location.href.indexOf ('twitter') != -1)"
-        "{ var s = document.location.href.split('/'); "
-        "var u = 'https://api.twitter.com/1/statuses/user_timeline.rss"
-        "?include_rts=true&screen_name=' + s[3] + '&count=25'; "
-        "f.push ('$' + u + '|' + 'Twitter / ' + s[3]); } "
+        "f.push (':' + l[i].href + '|' + l[i].title); } "
         "return f; })("
         "document.getElementsByTagName ('link'));", NULL);
 
@@ -1609,10 +1363,6 @@ midori_view_load_finished (MidoriView* view)
                     G_CALLBACK (midori_view_open_search_response_cb), view,
                     _("_Save Search engine"), GTK_RESPONSE_ACCEPT, NULL); */
             }
-            #if !WEBKIT_CHECK_VERSION (1, 1, 18)
-            else
-                katze_assign (view->icon_uri, g_strdup (uri_and_title));
-            #endif
 
             news_feeds_continue:
             current_item++;
@@ -1621,10 +1371,6 @@ midori_view_load_finished (MidoriView* view)
 
         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
     }
     #endif
 
@@ -1640,8 +1386,8 @@ midori_view_web_view_crashed_cb (WebKitWebView* web_view,
     const gchar* uri = webkit_web_view_get_uri (web_view);
     gchar* title = g_strdup_printf (_("Oops - %s"), uri);
     gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri);
-    midori_view_display_error (view, uri, title,
-        message, "", _("Try again"), NULL);
+    midori_view_display_error (view, uri, NULL, title,
+        message, "", NULL, _("Try again"), NULL);
     g_free (message);
     g_free (title);
 }
@@ -1704,8 +1450,6 @@ midori_view_web_view_notify_load_status_cb (WebKitWebView* web_view,
 }
 #endif
 
-
-#if WEBKIT_CHECK_VERSION (1, 1, 18)
 static void
 midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
                                     GParamSpec*    pspec,
@@ -1722,26 +1466,18 @@ midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
     katze_assign (view->icon_uri, icon_uri);
     _midori_web_view_load_icon (view);
 }
-#endif
 
 static void
-webkit_web_view_notify_uri_cb (WebKitWebView* web_view,
-                               GParamSpec*    pspec,
-                               MidoriView*    view)
-{
-    midori_tab_set_uri (MIDORI_TAB (view), webkit_web_view_get_uri (web_view));
-}
-
-static void
-webkit_web_view_notify_title_cb (WebKitWebView* web_view,
-                                 GParamSpec*    pspec,
-                                 MidoriView*    view)
+webkit_web_view_notify_title_cb (WebKitWebView* web_view,
+                                 GParamSpec*    pspec,
+                                 MidoriView*    view)
 {
     const gchar* title = webkit_web_view_get_title (web_view);
     midori_view_set_title (view, title);
     g_object_notify (G_OBJECT (view), "title");
 }
 
+#ifndef HAVE_WEBKIT2
 static void
 webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view,
                                            const gchar*   text,
@@ -1749,6 +1485,21 @@ webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view,
 {
     midori_tab_set_statusbar_text (MIDORI_TAB (view), text);
 }
+#endif
+
+#if GTK_CHECK_VERSION(3, 2, 0)
+static gboolean
+midori_view_overlay_frame_enter_notify_event_cb (GtkOverlay*       overlay,
+                                                 GdkEventCrossing* event,
+                                                 GtkWidget*        frame)
+{
+    /* Flip horizontal position of the overlay frame */
+    gtk_widget_set_halign (frame,
+        gtk_widget_get_halign (frame) == GTK_ALIGN_START
+        ? GTK_ALIGN_END : GTK_ALIGN_START);
+    return FALSE;
+}
+#endif
 
 static gboolean
 midori_view_web_view_leave_notify_event_cb (WebKitWebView*    web_view,
@@ -1771,6 +1522,7 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView*       web_view,
                                        MidoriView*          view)
 {
     #ifdef HAVE_WEBKIT2
+    katze_object_assign (view->hit_test, g_object_ref (hit_test_result));
     if (!webkit_hit_test_result_context_is_link (hit_test_result))
     {
         katze_assign (view->link_uri, NULL);
@@ -1779,10 +1531,6 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView*       web_view,
     const gchar* link_uri = webkit_hit_test_result_get_link_uri (hit_test_result);
     #endif
 
-    #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_91))
-    sokoke_prefetch_uri (view->settings, link_uri, NULL, NULL);
-    #endif
-
     katze_assign (view->link_uri, g_strdup (link_uri));
     if (link_uri && g_str_has_prefix (link_uri, "mailto:"))
     {
@@ -1812,15 +1560,6 @@ midori_view_ensure_link_uri (MidoriView* view,
 
     if (gtk_widget_get_window (view->web_view))
     {
-        GdkEventButton ev;
-
-        if (!event) {
-            gint ex, ey;
-            event = &ev;
-            gdk_window_get_pointer (gtk_widget_get_window (view->web_view), &ex, &ey, NULL);
-            event->x = ex;
-            event->y = ey;
-        }
 
         if (x != NULL)
             *x = event->x;
@@ -1845,9 +1584,6 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
                                             GdkEventButton* event,
                                             MidoriView*     view)
 {
-    GtkClipboard* clipboard;
-    gchar* uri;
-    gchar* new_uri;
     const gchar* link_uri;
     gboolean background;
 
@@ -1856,6 +1592,9 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
     link_uri = midori_view_get_link_uri (view);
     view->button_press_handled = FALSE;
 
+    if (midori_debug ("mouse"))
+        g_message ("%s button %d\n", G_STRFUNC, event->button);
+
     switch (event->button)
     {
     case 1:
@@ -1910,7 +1649,8 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
             g_object_unref (result);
             if (!is_editable)
             {
-                clipboard = gtk_clipboard_get_for_display (
+                gchar* uri;
+                GtkClipboard* clipboard = gtk_clipboard_get_for_display (
                     gtk_widget_get_display (GTK_WIDGET (view)),
                     GDK_SELECTION_PRIMARY);
                 if ((uri = gtk_clipboard_wait_for_text (clipboard)))
@@ -1924,7 +1664,7 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
                     /* Hold Alt to search for the selected word */
                     if (event->state & GDK_MOD1_MASK)
                     {
-                        new_uri = sokoke_magic_uri (uri, TRUE, FALSE);
+                        gchar* new_uri = sokoke_magic_uri (uri, TRUE, FALSE);
                         if (!new_uri)
                         {
                             gchar* search = katze_object_get_string (
@@ -1968,7 +1708,10 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
         return FALSE;
         break;
     case 3:
+        /* Older versions don't have the context-menu signal */
+        #if WEBKIT_CHECK_VERSION (1, 10, 0)
         if (event->state & GDK_CONTROL_MASK)
+        #endif
         {
             /* Ctrl + Right-click suppresses javascript button handling */
             GtkWidget* menu = gtk_menu_new ();
@@ -1979,11 +1722,19 @@ midori_view_web_view_button_press_event_cb (WebKitWebView*  web_view,
             return TRUE;
         }
         break;
+#ifdef G_OS_WIN32
+    case 4:
+#else
     case 8:
+#endif
         midori_view_go_back (view);
         view->button_press_handled = TRUE;
         return TRUE;
+#ifdef G_OS_WIN32
+    case 5:
+#else
     case 9:
+#endif
         midori_tab_go_forward (MIDORI_TAB (view));
         view->button_press_handled = TRUE;
         return TRUE;
@@ -2172,7 +1923,6 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
                                GdkEventKey*   event,
                                MidoriView*    view)
 {
-#ifndef HAVE_WEBKIT2
     guint character;
 
     event->state = event->state & MIDORI_KEYS_MODIFIER_MASK;
@@ -2200,8 +1950,13 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
     if (character == (event->keyval | 0x01000000))
         return FALSE;
 
+    #ifdef HAVE_WEBKIT2
+    WebKitHitTestResultContext context = katze_object_get_int (view->hit_test, "context");
+    if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+    #else
     if (!webkit_web_view_can_cut_clipboard (web_view)
         && !webkit_web_view_can_paste_clipboard (web_view))
+    #endif
     {
         gchar* text = character ? g_strdup_printf ("%c", character) : NULL;
         #if GTK_CHECK_VERSION(3, 2, 0)
@@ -2213,7 +1968,6 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
         g_free (text);
         return TRUE;
     }
-#endif
     return FALSE;
 }
 
@@ -2239,27 +1993,22 @@ gtk_widget_scroll_event_cb (WebKitWebView*  web_view,
 }
 
 static void
-midori_web_view_menu_new_window_activate_cb (GtkWidget*  widget,
-                                             MidoriView* view)
+midori_web_view_menu_new_window_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
+    MidoriView* view = user_data;
     g_signal_emit (view, signals[NEW_WINDOW], 0, view->link_uri);
 }
 
 static void
-midori_web_view_menu_web_app_activate_cb (GtkWidget*  widget,
-                                          MidoriView* view)
-{
-    sokoke_spawn_app (view->link_uri, FALSE);
-}
-
-static void
-midori_web_view_menu_link_copy_activate_cb (GtkWidget*  widget,
-                                            MidoriView* view)
+midori_web_view_menu_link_copy_activate_cb (GtkAction* widget,
+                                            gpointer   user_data)
 {
+    MidoriView* view = user_data;
     if (g_str_has_prefix (view->link_uri, "mailto:"))
-        sokoke_widget_copy_clipboard (widget, view->link_uri + 7, NULL, NULL);
+        sokoke_widget_copy_clipboard (view->web_view, view->link_uri + 7, NULL, NULL);
     else
-        sokoke_widget_copy_clipboard (widget, view->link_uri, NULL, NULL);
+        sokoke_widget_copy_clipboard (view->web_view, view->link_uri, NULL, NULL);
 }
 
 static void
@@ -2269,27 +2018,32 @@ midori_view_download_uri (MidoriView*        view,
 {
 #ifdef HAVE_WEBKIT2
     WebKitDownload* download = webkit_web_view_download_uri (WEBKIT_WEB_VIEW (view->web_view), uri);
+    WebKitWebContext * web_context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
+    midori_download_set_type (download, type);
+    g_signal_emit_by_name (web_context, "download-started", download, view);
 #else
     WebKitNetworkRequest* request = webkit_network_request_new (uri);
     WebKitDownload* download = webkit_download_new (request);
     g_object_unref (request);
-#endif
-    gboolean handled;
     midori_download_set_type (download, type);
+    gboolean handled;
     g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+    #endif
 }
 
 static void
-midori_web_view_menu_save_activate_cb (GtkWidget*  widget,
-                                       MidoriView* view)
+midori_web_view_menu_save_activate_cb (GtkAction* action,
+                                       gpointer   user_data)
 {
+    MidoriView* view = user_data;
     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)
+midori_web_view_menu_image_new_tab_activate_cb (GtkAction* action,
+                                                gpointer   user_data)
 {
+    MidoriView* view = user_data;
     gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
         g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
@@ -2299,6 +2053,14 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget*  widget,
     g_free (uri);
 }
 
+/**
+ * midori_view_get_resources:
+ * @view: a #MidoriView
+ *
+ * Obtain a list of the resources loaded by the page shown in the view.
+ *
+ * Return value: (transfer full) (element-type WebKitWebResource): the resources
+ **/
 GList*
 midori_view_get_resources (MidoriView* view)
 {
@@ -2309,7 +2071,9 @@ midori_view_get_resources (MidoriView* 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);
-    return g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
+    resources = g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
+    g_list_foreach (resources, (GFunc)g_object_ref, NULL);
+    return resources;
 #else
     return NULL;
 #endif
@@ -2320,10 +2084,10 @@ midori_view_get_data_for_uri (MidoriView*  view,
                               const gchar* uri)
 {
     GList* resources = midori_view_get_resources (view);
-    GList* list;
     GString* result = NULL;
 
 #ifndef HAVE_WEBKIT2
+    GList* list;
     for (list = resources; list; list = g_list_next (list))
     {
         WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data);
@@ -2335,6 +2099,7 @@ midori_view_get_data_for_uri (MidoriView*  view,
         }
     }
 #endif
+    g_list_foreach (resources, (GFunc)g_object_unref, NULL);
     g_list_free (resources);
     return result;
 }
@@ -2377,94 +2142,91 @@ midori_view_clipboard_get_image_cb (GtkClipboard*     clipboard,
 }
 
 static void
-midori_web_view_menu_image_copy_activate_cb (GtkWidget*  widget,
-                                             MidoriView* view)
+midori_web_view_menu_image_copy_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
+    MidoriView* view = user_data;
     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,
+    sokoke_widget_copy_clipboard (view->web_view,
         uri, midori_view_clipboard_get_image_cb, view->hit_test);
     g_free (uri);
 }
 
 static void
-midori_web_view_menu_image_save_activate_cb (GtkWidget*  widget,
-                                             MidoriView* view)
+midori_web_view_menu_image_save_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
+    MidoriView* view = user_data;
     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)
+midori_web_view_menu_video_copy_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
-    gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
-    midori_view_download_uri (view, MIDORI_DOWNLOAD_OPEN_IN_VIEWER, uri);
+    MidoriView* view = user_data;
+    gchar* uri = katze_object_get_string (view->hit_test, "media-uri");
+    sokoke_widget_copy_clipboard (view->web_view, uri, NULL, NULL);
     g_free (uri);
 }
 
 static void
-midori_web_view_menu_video_copy_activate_cb (GtkWidget*  widget,
-                                             MidoriView* view)
+midori_web_view_menu_video_save_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
+    MidoriView* view = user_data;
     gchar* uri = katze_object_get_string (view->hit_test, "media-uri");
-    sokoke_widget_copy_clipboard (widget, uri, NULL, NULL);
+    midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, uri);
     g_free (uri);
 }
 
+#ifndef HAVE_WEBKIT2
 static void
-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);
+midori_view_menu_open_email_activate_cb (GtkAction* action,
+                                         gpointer   user_data)
+{
+    MidoriView* view = user_data;
+    gchar* data = (gchar*)g_object_get_data (G_OBJECT (action), "uri");
+    gchar* uri = g_strconcat ("mailto:", data, NULL);
+    gboolean handled = FALSE;
+    g_signal_emit_by_name (view, "open-uri", uri, &handled);
     g_free (uri);
 }
+#endif
 
 static void
-midori_web_view_menu_new_tab_activate_cb (GtkWidget*  widget,
-                                          MidoriView* view)
+midori_view_menu_open_link_tab_activate_cb (GtkAction* action,
+                                            gpointer   user_data)
 {
-    if (view->link_uri)
-        g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri,
-                       view->open_tabs_in_the_background);
-    else
-    {
-        gchar* data = (gchar*)g_object_get_data (G_OBJECT (widget), "uri");
-        if (strchr (data, '@'))
-        {
-            gchar* uri = g_strconcat ("mailto:", data, NULL);
-            sokoke_show_uri (gtk_widget_get_screen (widget),
-                             uri, GDK_CURRENT_TIME, NULL);
-            g_free (uri);
-        }
-        else
-        {
-            gchar* uri = sokoke_magic_uri (data, TRUE, FALSE);
-            if (!uri)
-                uri = g_strdup (data);
-            g_signal_emit (view, signals[NEW_TAB], 0, uri,
-                           view->open_tabs_in_the_background);
-            g_free (uri);
-        }
-    }
+    MidoriView* view = user_data;
+    gchar* data = (gchar*)g_object_get_data (G_OBJECT (action), "uri");
+    gchar* uri = sokoke_magic_uri (data, TRUE, FALSE);
+    if (!uri)
+        uri = g_strdup (data);
+    g_signal_emit (view, signals[NEW_TAB], 0, uri,
+                   view->open_tabs_in_the_background);
+    g_free (uri);
 }
 
 static void
-midori_web_view_menu_background_tab_activate_cb (GtkWidget*  widget,
-                                                 MidoriView* view)
+midori_web_view_menu_background_tab_activate_cb (GtkAction* action,
+                                                 gpointer   user_data)
 {
+    MidoriView* view = user_data;
     g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri,
                    !view->open_tabs_in_the_background);
 }
 
+#ifndef HAVE_WEBKIT2
 static void
-midori_web_view_menu_search_web_activate_cb (GtkWidget*  widget,
-                                             MidoriView* view)
+midori_web_view_menu_search_web_activate_cb (GtkAction* action,
+                                             gpointer   user_data)
 {
-    const gchar* search = g_object_get_data (G_OBJECT (widget), "search");
+    MidoriView* view = user_data;
+    const gchar* search = g_object_get_data (G_OBJECT (action), "search");
     if (search == NULL)
         search = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings));
     gchar* uri = midori_uri_for_search (search, view->selected_text);
@@ -2480,53 +2242,47 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget*  widget,
 
     g_free (uri);
 }
+#endif
 
 static void
-midori_web_view_menu_copy_activate_cb (GtkWidget*  widget,
-                                       MidoriView* view)
-{
-    sokoke_widget_copy_clipboard (widget, view->selected_text, NULL, NULL);
-}
-
-static void
-midori_view_tab_label_menu_window_new_cb (GtkWidget* menuitem,
-                                          GtkWidget* view)
+midori_view_tab_label_menu_window_new_cb (GtkAction* action,
+                                          gpointer   user_data)
 {
+    MidoriView* view = user_data;
     g_signal_emit (view, signals[NEW_WINDOW], 0,
         midori_view_get_display_uri (MIDORI_VIEW (view)));
 }
 
+#ifndef HAVE_WEBKIT2
 static void
-midori_web_view_open_frame_in_new_tab_cb (GtkWidget*  widget,
-                                          MidoriView* view)
+midori_web_view_open_frame_in_new_tab_cb (GtkAction* action,
+                                          gpointer   user_data)
 {
-#ifndef HAVE_WEBKIT2
+    MidoriView* view = user_data;
     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);
-#endif
 }
+#endif
 
 static void
-midori_web_view_menu_inspect_element_activate_cb (GtkWidget*  widget,
-                                                  MidoriView* view)
+midori_view_inspect_element_activate_cb (GtkAction* action,
+                                         gpointer   user_data)
 {
-#ifndef HAVE_WEBKIT2
-    WebKitWebInspector* inspector;
-    gint x, y;
-
-    inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view));
-    x = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "x"));
-    y = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "y"));
+    MidoriView* view = user_data;
+    WebKitWebInspector* inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view));
+    #ifndef HAVE_WEBKIT2
+    WebKitHitTestResult* hit_test_result = view->hit_test;
+    gint x = katze_object_get_int (hit_test_result, "x");
+    gint y = katze_object_get_int (hit_test_result, "y");
     webkit_web_inspector_inspect_coordinates (inspector, x, y);
+    #endif
     webkit_web_inspector_show (inspector);
-#endif
 }
 
-#if WEBKIT_CHECK_VERSION (1, 5, 0)
 static void
-midori_view_menu_add_search_engine_cb (GtkWidget*  widget,
-                                       MidoriView* view)
+midori_view_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);
@@ -2534,498 +2290,343 @@ midori_view_menu_add_search_engine_cb (GtkWidget*  widget,
     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,
-                             const gchar*  label,
-                             const gchar*  stock_id,
-                             GCallback     callback,
-                             GtkWidget*    widget)
-{
-    GtkWidget* menuitem;
-
-    if (label)
-    {
-        menuitem = gtk_image_menu_item_new_with_mnemonic (label);
-        if (stock_id)
-        {
-            GdkScreen* screen = gtk_widget_get_screen (widget);
-            GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
-            if (gtk_icon_theme_has_icon (icon_theme, stock_id))
-            {
-                GtkWidget* icon = gtk_image_new_from_stock (stock_id,
-                    GTK_ICON_SIZE_MENU);
-                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
-                    icon);
-            }
-        }
-    }
-    else
-        menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
-    gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, position);
-    if (callback)
-        g_signal_connect (menuitem, "activate", callback, widget);
-    else
-        gtk_widget_set_sensitive (menuitem, FALSE);
-    return menuitem;
-}
 
 /**
- * midori_view_populate_popup:
+ * midori_view_get_page_context_action:
  * @view: a #MidoriView
- * @menu: a #GtkMenu
- * @manual: %TRUE if this a manually created popup
+ * @hit_test_result: a #WebKitHitTestResult
  *
- * Populates the given @menu with context menu items
- * according to the position of the mouse pointer. This
- * can be used in situations where a custom hotkey
- * opens the context menu or the default behaviour
- * needs to be intercepted.
+ * Populates actions depending on the hit test result.
  *
- * @manual should usually be %TRUE, except for the
- * case where @menu was created by the #WebKitWebView.
- *
- * Since: 0.2.5
+ * Since: 0.5.5
  */
-void
-midori_view_populate_popup (MidoriView* view,
-                            GtkWidget*  menu,
-                            gboolean    manual)
+MidoriContextAction*
+midori_view_get_page_context_action (MidoriView*          view,
+                                     WebKitHitTestResult* hit_test_result)
 {
-#ifndef HAVE_WEBKIT2
-    g_return_if_fail (MIDORI_IS_VIEW (view));
-    g_return_if_fail (GTK_IS_MENU_SHELL (menu));
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+    g_return_val_if_fail (hit_test_result != NULL, NULL);
 
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
-    GtkWidget* widget = GTK_WIDGET (view);
-    MidoriBrowser* browser = midori_browser_get_for_widget (widget);
+    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
     GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser)));
+    WebKitHitTestResultContext context = katze_object_get_int (hit_test_result, "context");
     GtkActionGroup* actions = midori_browser_get_action_group (browser);
-    GtkMenuShell* menu_shell = GTK_MENU_SHELL (menu);
-    GtkWidget* menuitem;
-    GtkWidget* icon;
-    gchar* stock_id;
-    GList* items;
-    gboolean has_selection;
-    gboolean is_editable;
-    gboolean is_document;
-    GtkWidget* label;
-    guint i;
-
-    gint x, y;
-    WebKitHitTestResultContext context;
-    gboolean is_image;
-    gboolean is_media;
-
-    midori_view_ensure_link_uri (view, &x, &y, NULL);
-    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;
-    is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
-    is_image = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
-    is_media = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;
-    is_document = !view->link_uri && !has_selection && !is_image && !is_media;
-
-    if (is_editable)
-    {
-        menuitem = gtk_separator_menu_item_new ();
-        gtk_menu_shell_prepend (menu_shell, menuitem);
-        gtk_widget_show (menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Redo"));
-        gtk_widget_set_sensitive (menuitem,
-            webkit_web_view_can_redo (web_view));
-        gtk_menu_shell_prepend (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Undo"));
-        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_widget_show (menuitem);
-            }
-        }
-        #endif
+    MidoriContextAction* menu = midori_context_action_new ("PageContextMenu", NULL, NULL, NULL);
+    midori_context_action_add_action_group (menu, actions);
 
-        if (manual)
+    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)
+    {
+        /* Enforce update of actions - there's no "selection-changed" signal */
+        midori_tab_update_actions (MIDORI_TAB (view), actions, NULL, NULL);
+        midori_context_action_add_by_name (menu, "Undo");
+        midori_context_action_add_by_name (menu, "Redo");
+        midori_context_action_add (menu, NULL);
+        midori_context_action_add_by_name (menu, "Cut");
+        midori_context_action_add_by_name (menu, "Copy");
+        midori_context_action_add_by_name (menu, "Paste");
+        midori_context_action_add_by_name (menu, "Delete");
+        midori_context_action_add (menu, NULL);
+        midori_context_action_add_by_name (menu, "SelectAll");
+        midori_context_action_add (menu, NULL);
+        KatzeItem* item = midori_search_action_get_engine_for_form (
+            WEBKIT_WEB_VIEW (view->web_view), view->ellipsize);
+        if (item != NULL)
         {
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Cut"));
-            gtk_widget_set_sensitive (menuitem,
-                webkit_web_view_can_cut_clipboard (web_view));
-            gtk_menu_shell_append (menu_shell, menuitem);
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Copy"));
-            gtk_widget_set_sensitive (menuitem,
-                webkit_web_view_can_copy_clipboard (web_view));
-            gtk_menu_shell_append (menu_shell, menuitem);
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Paste"));
-            gtk_widget_set_sensitive (menuitem,
-                webkit_web_view_can_paste_clipboard (web_view));
-            gtk_menu_shell_append (menu_shell, menuitem);
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Delete"));
-            gtk_widget_set_sensitive (menuitem,
-                webkit_web_view_can_cut_clipboard (web_view));
-            gtk_menu_shell_append (menu_shell, menuitem);
-            menuitem = gtk_separator_menu_item_new ();
-            gtk_widget_show (menuitem);
-            gtk_menu_shell_append (menu_shell, menuitem);
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "SelectAll"));
-            gtk_menu_shell_append (menu_shell, menuitem);
-            /* FIXME: We are missing Font, Input Methods and Insert Character */
-            if (katze_object_get_boolean (view->settings, "enable-developer-extras"))
-            {
-                menuitem = gtk_separator_menu_item_new ();
-                gtk_widget_show (menuitem);
-                gtk_menu_shell_append (menu_shell, menuitem);
-                menuitem = midori_view_insert_menu_item (menu_shell, -1,
-                    _("Inspect _Element"), NULL,
-                    G_CALLBACK (midori_web_view_menu_inspect_element_activate_cb),
-                    widget);
-                gtk_widget_show (menuitem);
-                g_object_set_data (G_OBJECT (menuitem), "x", GINT_TO_POINTER (x));
-                g_object_set_data (G_OBJECT (menuitem), "y", GINT_TO_POINTER (y));
-            }
+            GtkAction* action = gtk_action_new ("AddSearchEngine", _("Add _search engine..."), NULL, NULL);
+            g_object_set_data (G_OBJECT (action), "item", item);
+            g_signal_connect (action, "activate",
+                              G_CALLBACK (midori_view_add_search_engine_cb), view);
+            midori_context_action_add (menu, action);
         }
-        return;
+        /* FIXME: input methods */
+        /* FIXME: font */
+        /* FIXME: insert unicode character */
     }
 
-    items = gtk_container_get_children (GTK_CONTAINER (menu));
-    menuitem = (GtkWidget*)g_list_nth_data (items, 0);
-    /* Form control: no items */
-    if (!manual && !menuitem)
-    {
-        g_list_free (items);
-        return;
-    }
-    /* Form control: separator and Inspect element */
-    if (!manual && GTK_IS_SEPARATOR_MENU_ITEM (menuitem) && g_list_length (items) == 2)
-    {
-        gtk_widget_destroy (menuitem);
-        g_list_free (items);
-        return;
-    }
-    g_list_free (items);
-    /* Link and/ or image, but falsely reported as document */
-    if (is_document)
+    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
     {
-        if (GTK_IS_IMAGE_MENU_ITEM (menuitem))
+        if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
         {
-            icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem));
-            gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL);
-            if (stock_id && !strcmp (stock_id, GTK_STOCK_OPEN))
-                return;
+            GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open _Link"), NULL, STOCK_TAB_NEW);
+            g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->link_uri), (GDestroyNotify)g_free);
+            g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
+            midori_context_action_add (menu, action);
         }
-    }
-
-    if (!is_document)
-    {
-        items = gtk_container_get_children (GTK_CONTAINER (menu));
-        i = 0;
-        while ((menuitem = g_list_nth_data (items, i++)))
-            gtk_widget_destroy (menuitem);
-        g_list_free (items);
-    }
-    if (view->link_uri)
-    {
-        if (!midori_view_always_same_tab (view->link_uri))
+        else 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);
-        midori_view_insert_menu_item (menu_shell, -1,
-            view->open_tabs_in_the_background
-            ? _("Open Link in _Foreground Tab")
-            : _("Open Link in _Background Tab"), NULL,
-            G_CALLBACK (midori_web_view_menu_background_tab_activate_cb), widget);
-        midori_view_insert_menu_item (menu_shell, -1,
-            _("Open Link in New _Window"), STOCK_WINDOW_NEW,
-            G_CALLBACK (midori_web_view_menu_new_window_activate_cb), widget);
-        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);
+            GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open Link in New _Tab"), NULL, STOCK_TAB_NEW);
+            g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->link_uri), (GDestroyNotify)g_free);
+            g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
+            midori_context_action_add (menu, action);
+            midori_context_action_add_simple (menu, "OpenLinkForegroundTab",
+                view->open_tabs_in_the_background
+                ? _("Open Link in _Foreground Tab") : _("Open Link in _Background Tab"), NULL, NULL,
+                midori_web_view_menu_background_tab_activate_cb, view);
+            midori_context_action_add_simple (menu, "OpenLinkWindow", _("Open Link in New _Window"), NULL, STOCK_WINDOW_NEW,
+                midori_web_view_menu_new_window_activate_cb, view);
         }
 
-        midori_view_insert_menu_item (menu_shell, -1,
-            _("Copy Link de_stination"), NULL,
-            G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget);
+        midori_context_action_add_simple (menu, "CopyLinkDestination", _("Copy Link de_stination"), NULL, NULL,
+            midori_web_view_menu_link_copy_activate_cb, view);
 
         if (!midori_view_always_same_tab (view->link_uri))
+        {
             /* GTK_STOCK_SAVE_AS is lacking the underline */
-            midori_view_insert_menu_item (menu_shell, -1,
-                _("Save _As…"), GTK_STOCK_SAVE_AS,
-                G_CALLBACK (midori_web_view_menu_save_activate_cb), widget);
+            midori_context_action_add_simple (menu, "SaveLinkAs", _("Save _As…"), NULL, GTK_STOCK_SAVE_AS,
+                midori_web_view_menu_save_activate_cb, view);
+        }
     }
 
-    if (is_image)
+    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE)
     {
-        if (view->link_uri)
-            gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
-        midori_view_insert_menu_item (menu_shell, -1,
-            view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW
-            ? _("Open _Image in New Window")
-            : _("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,
-            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 (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
+            midori_context_action_add (menu, NULL);
 
-    if (is_media)
-    {
-        midori_view_insert_menu_item (menu_shell, -1,
-            _("Copy Video _Address"), NULL,
-            G_CALLBACK (midori_web_view_menu_video_copy_activate_cb), widget);
-        midori_view_insert_menu_item (menu_shell, -1,
-            FALSE ? _("Save _Video") : _("Download _Video"), GTK_STOCK_SAVE,
-            G_CALLBACK (midori_web_view_menu_video_save_activate_cb), widget);
+        midori_context_action_add_simple (menu, "OpenImageNewTab",
+            view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW
+            ? _("Open _Image in New Window") : _("Open _Image in New Tab")
+            , NULL, STOCK_TAB_NEW,
+            midori_web_view_menu_image_new_tab_activate_cb, view);
+        midori_context_action_add_simple (menu, "CopyImage", _("Copy Im_age"), NULL, NULL,
+            midori_web_view_menu_image_copy_activate_cb, view);
+        midori_context_action_add_simple (menu, "SaveImage", _("Save I_mage"), NULL, GTK_STOCK_SAVE,
+            midori_web_view_menu_image_save_activate_cb, view);
     }
 
-    if (has_selection)
+    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA)
     {
-        gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
-        midori_view_insert_menu_item (menu_shell, -1, NULL, GTK_STOCK_COPY,
-            G_CALLBACK (midori_web_view_menu_copy_activate_cb), widget);
+        midori_context_action_add_simple (menu, "CopyVideoAddress", _("Copy Video _Address"), NULL, NULL,
+            midori_web_view_menu_video_copy_activate_cb, view);
+        midori_context_action_add_simple (menu, "DownloadVideo", _("Download _Video"), NULL, GTK_STOCK_SAVE,
+            midori_web_view_menu_video_save_activate_cb, view);
     }
 
-    if (!view->link_uri && has_selection)
+    #ifndef HAVE_WEBKIT2
+    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION)
     {
-        GtkWidget* window;
-        KatzeArray* search_engines = NULL;
+        if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
+            midori_context_action_add (menu, NULL);
 
-        window = gtk_widget_get_toplevel (GTK_WIDGET (web_view));
-        i = 0;
-        if (MIDORI_IS_BROWSER (window))
-            search_engines = katze_object_get_object (window, "search-engines");
+        /* Ensure view->selected_text */
+        midori_view_has_selection (view);
+        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))
+            {
+                gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
+                GtkAction* action = (GtkAction*)midori_context_action_new_escaped ("SendMessage", text, NULL, GTK_STOCK_JUMP_TO);
+                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
+                g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_email_activate_cb), view);
+                midori_context_action_add (menu, action);
+                g_free (text);
+            }
+            else
+            {
+                GtkAction* action = gtk_action_new ("OpenAddressInNewTab", _("Open Address in New _Tab"), NULL, GTK_STOCK_JUMP_TO);
+                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
+                g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
+                midori_context_action_add (menu, action);
+            }
+        }
 
+        KatzeArray* search_engines = katze_object_get_object (browser, "search-engines");
         if (search_engines != NULL)
         {
-            KatzeItem* item;
-            GtkWidget* sub_menu = gtk_menu_new ();
-
-            menuitem = gtk_image_menu_item_new_with_mnemonic (_("Search _with"));
-            gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), sub_menu);
-            gtk_menu_shell_insert (menu_shell, menuitem, 1);
+            MidoriContextAction* searches = midori_context_action_new ("SearchWith", _("Search _with"), NULL, NULL);
+            midori_context_action_add (menu, GTK_ACTION (searches));
 
+            KatzeItem* item;
+            guint i = 0;
             KATZE_ARRAY_FOREACH_ITEM (item, search_engines)
             {
                 GdkPixbuf* pixbuf;
-
-                menuitem = gtk_image_menu_item_new_with_mnemonic (katze_item_get_name (item));
-                if ((pixbuf = katze_item_get_pixbuf (item, GTK_WIDGET (web_view))))
+                gchar* search_option = g_strdup_printf ("SearchWith%u", i);
+                GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
+                g_free (search_option);
+                midori_context_action_add (searches, action);
+                if ((pixbuf = katze_item_get_pixbuf (item, view->web_view)))
                 {
-                    icon = gtk_image_new_from_pixbuf (pixbuf);
+                    gtk_action_set_gicon (GTK_ACTION (action), G_ICON (pixbuf));
                     g_object_unref (pixbuf);
                 }
-                else
-                    icon = gtk_image_new_from_icon_name (STOCK_EDIT_FIND, GTK_ICON_SIZE_MENU);
-                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon);
-                gtk_image_menu_item_set_always_show_image (
-                    GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-                gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i);
-                g_object_set_data (G_OBJECT (menuitem), "search",
-                                   (gchar*)katze_item_get_uri (item));
-                g_signal_connect (menuitem, "activate",
+                gtk_action_set_always_show_image (GTK_ACTION (action), TRUE);
+                g_object_set_data (G_OBJECT (action), "search", (gchar*)katze_item_get_uri (item));
+                g_signal_connect (action, "activate",
                     G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view);
                 i++;
             }
             g_object_unref (search_engines);
         }
-        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))
-            {
-                gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
-                menuitem = midori_view_insert_menu_item (menu_shell, -1,
-                    text, GTK_STOCK_JUMP_TO,
-                    G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
-                g_free (text);
-            }
-            else
-                menuitem = midori_view_insert_menu_item (menu_shell, -1,
-                    _("Open Address in New _Tab"), GTK_STOCK_JUMP_TO,
-                    G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
-            g_object_set_data (G_OBJECT (menuitem), "uri", view->selected_text);
-        }
+        if (midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings)) != NULL)
+            midori_context_action_add_simple (menu, "SearchWeb", _("_Search the Web"), NULL, GTK_STOCK_FIND,
+                midori_web_view_menu_search_web_activate_cb, view);
     }
+    #endif
 
-    if (is_document)
+    if (context == WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)
     {
-        if (manual)
-        {
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Back"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Forward"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Stop"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Reload"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        }
-        else
-        {
-        items = gtk_container_get_children (GTK_CONTAINER (menu));
-        menuitem = (GtkWidget*)g_list_nth_data (items, 3);
-        /* hack to localize menu item */
-        if (GTK_IS_BIN (menuitem))
-        {
-            GtkStockItem stock_item;
-            if (gtk_stock_lookup (GTK_STOCK_REFRESH, &stock_item))
-            {
-                label = gtk_bin_get_child (GTK_BIN (menuitem));
-                gtk_label_set_label (GTK_LABEL (label), stock_item.label);
-            }
-        }
-        g_list_free (items);
-        }
+        midori_context_action_add_by_name (menu, "Back");
+        midori_context_action_add_by_name (menu, "Forward");
+        midori_context_action_add_by_name (menu, "Stop");
+        midori_context_action_add_by_name (menu, "Reload");
+    }
 
-        gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "UndoTabClose"));
-        gtk_menu_shell_append (menu_shell, menuitem);
+    /* No need to have Copy twice, which is already in the editable menu */
+    if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+    {
+        midori_context_action_add (menu, NULL);
+        /* Enforce update of actions - there's no "selection-changed" signal */
+        midori_tab_update_actions (MIDORI_TAB (view), actions, NULL, NULL);
+        midori_context_action_add_by_name (menu, "Copy");
+        midori_context_action_add_by_name (menu, "SelectAll");
+    }
 
+    if (context == WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)
+    {
+        midori_context_action_add (menu, NULL);
+        midori_context_action_add_by_name (menu, "UndoTabClose");
+        #ifndef HAVE_WEBKIT2
+        WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
         if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
-            midori_view_insert_menu_item (menu_shell, -1,
-                _("Open _Frame in New Tab"), NULL,
-                G_CALLBACK (midori_web_view_open_frame_in_new_tab_cb), widget);
-
-        menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL);
-        gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window"));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-        g_signal_connect (menuitem, "activate",
-            G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view);
-
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "ZoomIn"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "ZoomOut"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Encoding"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        if (gtk_widget_get_sensitive (menuitem))
-        {
-            GtkWidget* sub_menu;
-            static const GtkActionEntry encodings[] = {
-              { "EncodingAutomatic" },
-              { "EncodingChinese" },
-              { "EncodingChineseSimplified" },
-              { "EncodingJapanese" },
-              { "EncodingKorean" },
-              { "EncodingRussian" },
-              { "EncodingUnicode" },
-              { "EncodingWestern" },
-              { "EncodingCustom" },
-            };
-
-            sub_menu = gtk_menu_new ();
-            gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), sub_menu);
-
-            for (i = 0; i < G_N_ELEMENTS (encodings); i++)
-            {
-                menuitem = sokoke_action_create_popup_menu_item (
-                    gtk_action_group_get_action (actions, encodings[i].name));
-                gtk_menu_shell_append (GTK_MENU_SHELL (sub_menu), menuitem);
-            }
-        }
+            midori_context_action_add_simple (menu, "OpenFrameInNewTab", _("Open _Frame in New Tab"), NULL, NULL,
+                midori_web_view_open_frame_in_new_tab_cb, view);
+        #endif
+        midori_context_action_add_simple (menu, "OpenInNewWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
+            midori_view_tab_label_menu_window_new_cb, view);
+        midori_context_action_add_by_name (menu, "ZoomIn");
+        midori_context_action_add_by_name (menu, "ZoomOut");
+
+        MidoriContextAction* encodings = midori_context_action_new ("Encoding", _("_Encoding"), NULL, NULL);
+        midori_context_action_add (menu, GTK_ACTION (encodings));
+        midori_context_action_add_by_name (encodings, "EncodingAutomatic");
+        midori_context_action_add_by_name (encodings, "EncodingChinese");
+        midori_context_action_add_by_name (encodings, "EncodingChineseSimplified");
+        midori_context_action_add_by_name (encodings, "EncodingJapanese");
+        midori_context_action_add_by_name (encodings, "EncodingKorean");
+        midori_context_action_add_by_name (encodings, "EncodingRussian");
+        midori_context_action_add_by_name (encodings, "EncodingUnicode");
+        midori_context_action_add_by_name (encodings, "EncodingWestern");
+        midori_context_action_add_by_name (encodings, "EncodingCustom");
+
+        midori_context_action_add (menu, NULL);
+        midori_context_action_add_by_name (menu, "BookmarkAdd");
+        midori_context_action_add_by_name (menu, "AddSpeedDial");
+        midori_context_action_add_by_name (menu, "SaveAs");
+        midori_context_action_add_by_name (menu, "SourceView");
+        midori_context_action_add_by_name (menu, "SourceViewDom");
+        if (!g_object_get_data (G_OBJECT (browser), "midori-toolbars-visible"))
+            midori_context_action_add_by_name (menu, "Navigationbar");
+        if (state & GDK_WINDOW_STATE_FULLSCREEN)
+            midori_context_action_add_by_name (menu, "Fullscreen");
+    }
 
-        gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "BookmarkAdd"));
-        gtk_menu_shell_append (menu_shell, menuitem);
+    if (katze_object_get_boolean (view->settings, "enable-developer-extras"))
+        midori_context_action_add_simple (menu, "InspectElement", _("Inspect _Element"), NULL, NULL,
+            midori_view_inspect_element_activate_cb, view);
 
-        if (!midori_view_is_blank (view) && !midori_paths_is_readonly ())
-        {
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "AddSpeedDial"));
-            gtk_menu_shell_append (menu_shell, menuitem);
-        }
+    g_signal_emit_by_name (view, "context-menu", hit_test_result, menu);
+    return menu;
+}
 
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "SaveAs"));
-        gtk_menu_shell_append (menu_shell, menuitem);
-        menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "SourceView"));
-        gtk_menu_shell_append (menu_shell, menuitem);
+/**
+ * midori_view_populate_popup:
+ * @view: a #MidoriView
+ * @menu: a #GtkMenu
+ * @manual: %TRUE if this a manually created popup
+ *
+ * Populates the given @menu with context menu items
+ * according to the position of the mouse pointer. This
+ * can be used in situations where a custom hotkey
+ * opens the context menu or the default behaviour
+ * needs to be intercepted.
+ *
+ * @manual should usually be %TRUE, except for the
+ * case where @menu was created by the #WebKitWebView.
+ *
+ * Since: 0.2.5
+ * Deprecated: 0.5.5: Use midori_view_get_page_context_action().
+ */
+void
+midori_view_populate_popup (MidoriView* view,
+                            GtkWidget*  menu,
+                            gboolean    manual)
+{
+    g_return_if_fail (MIDORI_IS_VIEW (view));
+    g_return_if_fail (GTK_IS_MENU_SHELL (menu));
 
-        if (!g_object_get_data (G_OBJECT (browser), "midori-toolbars-visible"))
-        {
-            menuitem = sokoke_action_create_popup_menu_item (
-                gtk_action_group_get_action (actions, "Navigationbar"));
-            gtk_menu_shell_append (menu_shell, menuitem);
-        }
-    }
+    GdkEvent* event = gtk_get_current_event();
+    midori_view_ensure_link_uri (view, NULL, NULL, (GdkEventButton *)event);
+    gdk_event_free (event);
+    MidoriContextAction* context_action = midori_view_get_page_context_action (view, view->hit_test);
+    midori_context_action_create_menu (context_action, GTK_MENU (menu), FALSE);
+}
 
-    if ((!is_document || manual)
-      && katze_object_get_boolean (view->settings, "enable-developer-extras"))
+#if WEBKIT_CHECK_VERSION (1, 10, 0)
+static gboolean
+midori_view_web_view_context_menu_cb (WebKitWebView*       web_view,
+                                      #ifdef HAVE_WEBKIT2
+                                      WebKitContextMenu*   context_menu,
+                                      GdkEvent*            event,
+                                      WebKitHitTestResult* hit_test_result,
+                                      #else
+                                      GtkMenu*             default_menu,
+                                      WebKitHitTestResult* hit_test_result,
+                                      gboolean             keyboard,
+                                      #endif
+                                      MidoriView*          view)
+{
+    #ifndef HAVE_WEBKIT2
+    GdkEvent* event = gtk_get_current_event();
+    midori_view_ensure_link_uri (view, NULL, NULL, (GdkEventButton *)event);
+    gdk_event_free (event);
+    #endif
+    MidoriContextAction* menu = midori_view_get_page_context_action (view, hit_test_result);
+    /* Retain specific menu items we can't re-create easily */
+    guint guesses = 0, guesses_max = 10; /* Maximum number of spelling suggestions */
+    #ifdef HAVE_WEBKIT2
+    GList* items = webkit_context_menu_get_items (context_menu), *item, *preserved = NULL;
+    for (item = items; item; item = g_list_next (item))
     {
-        gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
-        menuitem = midori_view_insert_menu_item (menu_shell, -1,
-            _("Inspect _Element"), NULL,
-            G_CALLBACK (midori_web_view_menu_inspect_element_activate_cb), widget);
-        g_object_set_data (G_OBJECT (menuitem), "x", GINT_TO_POINTER (x));
-        g_object_set_data (G_OBJECT (menuitem), "y", GINT_TO_POINTER (y));
+        WebKitContextMenuAction stock_action = webkit_context_menu_item_get_stock_action (item->data);
+        if (stock_action == WEBKIT_CONTEXT_MENU_ACTION_SPELLING_GUESS && guesses++ < guesses_max)
+            preserved = g_list_append (preserved, g_object_ref (item->data));
     }
-
-    if (state & GDK_WINDOW_STATE_FULLSCREEN)
+    webkit_context_menu_remove_all (context_menu);
+    for (item = preserved; item; item = g_list_next (item))
     {
-        menuitem = sokoke_action_create_popup_menu_item (
-            gtk_action_group_get_action (actions, "Fullscreen"));
-
-        gtk_image_menu_item_set_use_stock (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-        gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), GTK_STOCK_LEAVE_FULLSCREEN);
-        gtk_menu_shell_append (menu_shell, menuitem);
+        webkit_context_menu_append (context_menu, item->data);
+        g_object_unref (item->data);
     }
-
-    gtk_widget_show_all (menu);
-#endif
+    g_list_free (preserved);
+    midori_context_action_create_webkit_context_menu (menu, context_menu);
+    #else
+    GList* items = gtk_container_get_children (GTK_CONTAINER (default_menu)), *item;
+    for (item = items; item; item = g_list_next (item))
+    {
+        /* Private API: Source/WebCore/platform/ContextMenuItem.h */
+        int stock_action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item->data), "webkit-context-menu"));
+        const int ContextMenuItemTagSpellingGuess = 30;
+        if (stock_action == ContextMenuItemTagSpellingGuess && guesses++ < guesses_max)
+            continue;
+        else
+            gtk_widget_destroy (item->data);
+    }
+    g_list_free (items);
+    midori_context_action_create_menu (menu, default_menu, FALSE);
+    #endif
+    return FALSE;
 }
+#endif
 
-static void
-webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
-                                   GtkWidget*     menu,
-                                   MidoriView*    view)
+static gboolean
+midori_view_web_view_close_cb (WebKitWebView* web_view,
+                               GtkWidget*     view)
 {
-    midori_view_populate_popup (view, menu, FALSE);
+    midori_browser_close_tab (midori_browser_get_for_widget (view), view);
+    return TRUE;
 }
 
 static gboolean
@@ -3035,10 +2636,29 @@ webkit_web_view_web_view_ready_cb (GtkWidget*  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
+#ifdef HAVE_WEBKIT2
+    WebKitWindowProperties* features = webkit_web_view_get_window_properties (WEBKIT_WEB_VIEW (web_view));
+#else
+    WebKitWebWindowFeatures* features = webkit_web_view_get_window_features (WEBKIT_WEB_VIEW (web_view));
+#endif
+    gboolean locationbar_visible, menubar_visible, toolbar_visible;
+    gint width, height;
+    g_object_get (features,
+                  "locationbar-visible", &locationbar_visible,
+                  "menubar-visible", &menubar_visible,
+                  "toolbar-visible", &toolbar_visible,
+                  "width", &width,
+                  "height", &height,
+                  NULL);
+    midori_tab_set_is_dialog (MIDORI_TAB (view),
+     !locationbar_visible && !menubar_visible && !toolbar_visible
+     && width > 0 && height > 0);
+
+    /* Open windows opened by scripts in tabs if they otherwise
         would be replacing the page the user opened. */
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
-        return TRUE;
+        if (!midori_tab_get_is_dialog (MIDORI_TAB (view)))
+            return TRUE;
 
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_TAB)
     {
@@ -3051,30 +2671,57 @@ webkit_web_view_web_view_ready_cb (GtkWidget*  web_view,
     gtk_widget_show (new_view);
     g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, FALSE);
 
+    if (midori_tab_get_is_dialog (MIDORI_TAB (view)))
+    {
+        GtkWidget* toplevel = gtk_widget_get_toplevel (new_view);
+        if (width > 0 && height > 0)
+            gtk_widget_set_size_request (toplevel, width, height);
+#ifdef HAVE_WEBKIT2
+        g_signal_connect (web_view, "close",
+                          G_CALLBACK (midori_view_web_view_close_cb), new_view);
+#else
+        g_signal_connect (web_view, "close-web-view",
+                          G_CALLBACK (midori_view_web_view_close_cb), new_view);
+#endif
+    }
+
     return TRUE;
 }
 
-#ifndef HAVE_WEBKIT2
 static GtkWidget*
 webkit_web_view_create_web_view_cb (GtkWidget*      web_view,
+#ifndef HAVE_WEBKIT2
                                     WebKitWebFrame* web_frame,
+#endif
                                     MidoriView*     view)
 {
     MidoriView* new_view;
 
+#ifdef HAVE_WEBKIT2
+    const gchar* uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view));
+#else
+    const gchar* uri = webkit_web_frame_get_uri (web_frame);
+#endif
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
         new_view = view;
     else
     {
-        new_view = (MidoriView*)midori_view_new_with_item (NULL, view->settings);
+        KatzeItem* item = katze_item_new ();
+        item->uri = g_strdup (uri);
+        new_view = (MidoriView*)midori_view_new_from_view (view, item, NULL);
+#ifdef HAVE_WEBKIT2
+        g_signal_connect (new_view->web_view, "ready-to-show",
+                          G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
+#else
         g_signal_connect (new_view->web_view, "web-view-ready",
                           G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
+#endif
     }
-    g_object_set_data_full (G_OBJECT (new_view), "opener-uri",
-        g_strdup (webkit_web_frame_get_uri (web_frame)), g_free);
+    g_object_set_data_full (G_OBJECT (new_view), "opener-uri", g_strdup (uri), g_free);
     return new_view->web_view;
 }
 
+#ifndef HAVE_WEBKIT2
 static gboolean
 webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
                                        WebKitWebFrame*          web_frame,
@@ -3109,14 +2756,80 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
 }
 #endif
 
+gint
+midori_save_dialog (const gchar* title,
+                    const gchar * hostname,
+                    const GString* details,
+                    const gchar *content_type)
+{   
+    GIcon* icon;
+    GtkWidget* image;
+    GdkScreen* screen;
+    GtkWidget* dialog= NULL;
+    GtkIconTheme* icon_theme;
+    gint response;
+    dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+        _("Open or download file from %s"), hostname);
+    icon = g_content_type_get_icon (content_type);
+    g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+    gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
+    g_object_unref (icon);
+    gtk_widget_show (image);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+        "%s", details->str);
+    screen = gtk_widget_get_screen (dialog);
+    
+    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+    if (screen)
+    {
+        icon_theme = gtk_icon_theme_get_for_screen (screen);
+        if (gtk_icon_theme_has_icon (icon_theme, MIDORI_STOCK_TRANSFER))
+            gtk_window_set_icon_name (GTK_WINDOW (dialog), MIDORI_STOCK_TRANSFER);
+        else
+            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,
+        NULL);
+
+    response = midori_dialog_run (GTK_DIALOG (dialog));
+    
+    gtk_widget_destroy (dialog);
+    if (response == GTK_RESPONSE_DELETE_EVENT)
+        response = MIDORI_DOWNLOAD_CANCEL;
+    return response;
+}
+
 #ifdef HAVE_WEBKIT2
+static gboolean
+midori_view_download_decide_destination_cb (WebKitDownload*   download,
+                                    const gchar * suggested_filename,
+                                    MidoriView*      view)
+{
+    if(!midori_view_download_query_action (view, download, suggested_filename)) {
+        webkit_download_cancel (download);
+    }
+    return TRUE;    //we must return TRUE because we handled the signal
+}
+                
 static void
-midori_view_download_requested_cb (WebKitWebContext* context,
+midori_view_download_started_cb (WebKitWebContext* context,
                                    WebKitDownload*   download,
-                                   gpointer          user_data)
+                                   MidoriView          *view)
+{
+    g_signal_connect (download, "decide-destination",
+                      G_CALLBACK (midori_view_download_decide_destination_cb), view);
+}
+
+static gboolean
+midori_view_download_query_action (MidoriView* view,
+                                   WebKitDownload*   download,
+                                   const gchar * suggested_filename)
 {
-    WebKitWebView* web_view = webkit_download_get_web_view (download);
-    MidoriView* view = midori_view_get_for_widget (GTK_WIDGET (web_view));
 #else
 static gboolean
 midori_view_download_requested_cb (GtkWidget*      web_view,
@@ -3124,42 +2837,36 @@ midori_view_download_requested_cb (GtkWidget*      web_view,
                                    MidoriView*     view)
 {
 #endif
-    gchar* opener_uri;
+    gboolean handled = TRUE;
     gchar* hostname;
-    GtkWidget* dialog;
     gchar* content_type;
     gchar* description;
-    GString* details;
-    GIcon* icon;
-    GtkWidget* image;
     gchar* title;
-    GdkScreen* screen;
-    GtkIconTheme* icon_theme;
     gint response;
-    gboolean handled;
-
+    GString* details;
     /* 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");
+    const gchar* 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);
+    
+    #ifdef HAVE_WEBKIT2
+    content_type = g_content_type_guess (suggested_filename, NULL ,
+                                            0 ,NULL);
+    if (!content_type)
+        content_type = g_strdup ("application/octet-stream");
+    midori_download_set_filename (download, g_strdup (suggested_filename));
+    #else
     content_type = midori_download_get_content_type (download,
         g_object_get_data (G_OBJECT (view), "download-mime-type"));
+    #endif
     description = g_content_type_get_description (content_type);
-    icon = g_content_type_get_icon (content_type);
-    g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
-    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);
     #ifdef HAVE_WEBKIT2
+    const gchar * suggestion = webkit_uri_response_get_suggested_filename (webkit_download_get_response (download));
     g_string_append_printf (details, _("File Name: %s"),
-        webkit_uri_response_get_suggested_filename (webkit_download_get_response (download)));
+                suggestion ? suggestion : suggested_filename);
     #else
     g_string_append_printf (details, _("File Name: %s"),
         webkit_download_get_suggested_filename (download));
@@ -3171,8 +2878,6 @@ midori_view_download_requested_cb (GtkWidget*      web_view,
     else
         g_string_append_printf (details, _("File Type: %s ('%s')"), description, content_type);
     g_string_append_c (details, '\n');
-    g_free (description);
-    g_free (content_type);
 
     #ifndef HAVE_WEBKIT2
     /* Link Fingerprint */
@@ -3213,53 +2918,22 @@ midori_view_download_requested_cb (GtkWidget*      web_view,
     }
     #endif
 
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-        "%s", details->str);
-    g_string_free (details, TRUE);
-
-    gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
     #ifdef HAVE_WEBKIT2
     /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */
     title = g_strdup_printf (_("Open %s"), webkit_uri_request_get_uri (webkit_download_get_request (download)));
     #else
     title = g_strdup_printf (_("Open %s"), webkit_download_get_uri (download));
     #endif
-    gtk_window_set_title (GTK_WINDOW (dialog), title);
+    response = midori_save_dialog (title,
+            hostname, details, content_type); //We prompt a dialog
     g_free (title);
-    screen = gtk_widget_get_screen (dialog);
-    if (screen)
-    {
-        icon_theme = gtk_icon_theme_get_for_screen (screen);
-        if (gtk_icon_theme_has_icon (icon_theme, MIDORI_STOCK_TRANSFER))
-            gtk_window_set_icon_name (GTK_WINDOW (dialog), MIDORI_STOCK_TRANSFER);
-        else
-            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,
-        NULL);
-
-    response = midori_dialog_run (GTK_DIALOG (dialog));
-    gtk_widget_destroy (dialog);
-    if (response == GTK_RESPONSE_DELETE_EVENT)
-        response = MIDORI_DOWNLOAD_CANCEL;
+    g_free (hostname);
+    g_free (description);
+    g_free (content_type);
+    g_string_free (details, TRUE);
     midori_download_set_type (download, response);
-
-    /* TODO
-    g_object_connect (download,
-        "signal::decide-destination", download_decide_destination_cb, view,
-        "signal::created-destination", download_created_destination_cb, view,
-        "signal::finished", download_finished_cb, view,
-        "signal::failed", download_failed_cb, view,
-        NULL);
-    */
     g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
-#ifndef HAVE_WEBKIT2
     return handled;
-#endif
 }
 
 #ifndef HAVE_WEBKIT2
@@ -3409,7 +3083,6 @@ midori_view_init (MidoriView* view)
     view->title = NULL;
     view->icon = NULL;
     view->icon_uri = NULL;
-    view->minimized = FALSE;
     view->hit_test = NULL;
     view->link_uri = NULL;
     view->selected_text = NULL;
@@ -3417,10 +3090,6 @@ midori_view_init (MidoriView* view)
     view->find_links = -1;
     view->alerts = 0;
 
-    /* Force the compiler to not optimize out katze_net_load_uri */
-    if (!g_strcmp0 (view->icon_uri, ""))
-        katze_net_load_uri (NULL, NULL, (KatzeNetStatusCb)NULL, (KatzeNetTransferCb)NULL, view);
-
     view->item = katze_item_new ();
 
     view->scrollh = view->scrollv = -2;
@@ -3486,16 +3155,6 @@ 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,
-                "fixed", view->minimized,
-                "label", 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));
@@ -3525,9 +3184,6 @@ midori_view_get_property (GObject*    object,
     case PROP_ICON:
         g_value_set_object (value, view->icon);
         break;
-    case PROP_MINIMIZED:
-        g_value_set_boolean (value, view->minimized);
-        break;
     case PROP_ZOOM_LEVEL:
         g_value_set_float (value, midori_view_get_zoom_level (view));
         break;
@@ -3557,6 +3213,7 @@ _midori_view_set_settings (MidoriView*        view,
                            MidoriWebSettings* settings)
 {
     gboolean zoom_text_and_images;
+    gdouble zoom_level;
 
     if (view->settings)
         g_signal_handlers_disconnect_by_func (view->settings,
@@ -3571,8 +3228,8 @@ _midori_view_set_settings (MidoriView*        view,
                       G_CALLBACK (midori_view_settings_notify_cb), view);
 
     g_object_get (view->settings,
+        "zoom-level", &zoom_level,
         "zoom-text-and-images", &zoom_text_and_images,
-        "close-buttons-on-tabs", &view->close_buttons_on_tabs,
         "open-new-pages-in", &view->open_new_pages_in,
         "open-tabs-in-the-background", &view->open_tabs_in_the_background,
         NULL);
@@ -3582,6 +3239,7 @@ _midori_view_set_settings (MidoriView*        view,
     webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (view->web_view),
         zoom_text_and_images);
     #endif
+    midori_view_set_zoom_level (view, zoom_level);
 }
 
 /**
@@ -3620,21 +3278,62 @@ midori_view_new_with_title (const gchar*       title,
  * Return value: a new #MidoriView
  *
  * Since: 0.4.3
+ * Deprecated: 0.5.8: Use midori_view_new_from_view instead.
  **/
 GtkWidget*
 midori_view_new_with_item (KatzeItem*         item,
                            MidoriWebSettings* settings)
+{
+    return midori_view_new_from_view (NULL, item, settings);
+}
+
+/**
+ * midori_view_new_from_view:
+ * @view: a predating, related #MidoriView, or %NULL
+ * @item: a #KatzeItem, or %NULL
+ * @settings: a #MidoriWebSettings, or %NULL
+ *
+ * Creates a new view, visible by default.
+ *
+ * If a @view is specified the returned new view will share
+ * its settings and if applicable re-use the rendering process.
+ *
+ * When @view should be passed:
+ *     The new one created is a new tab/ window for the old @view
+ *     A tab was duplicated
+ *
+ * When @view may be passed:
+ *     Old and new view belong to the same website or group
+ *
+ * Don't pass a @view if:
+ *     The new view is a completely new website
+ *
+ * The @item may contain title, URI and minimized status and will be copied.
+ *
+ * Usually @settings should be passed from an existing view or browser.
+ *
+ * Return value: a new #MidoriView
+ *
+ * Since: 0.5.8
+ **/
+GtkWidget*
+midori_view_new_from_view (MidoriView*        related,
+                           KatzeItem*         item,
+                           MidoriWebSettings* settings)
 {
     MidoriView* view = g_object_new (MIDORI_TYPE_VIEW,
+                                     "related", MIDORI_TAB (related),
                                      "title", item ? katze_item_get_name (item) : NULL,
                                      NULL);
+    if (!settings && related)
+        settings = related->settings;
     if (settings)
         _midori_view_set_settings (view, settings);
     if (item)
     {
         katze_object_assign (view->item, katze_item_copy (item));
-        view->minimized = katze_item_get_meta_string (
-            view->item, "minimized") != NULL;
+        midori_tab_set_minimized (MIDORI_TAB (view),
+            katze_item_get_meta_string (view->item, "minimized") != NULL);
     }
     gtk_widget_show ((GtkWidget*)view);
     return (GtkWidget*)view;
@@ -3662,14 +3361,6 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
                 g_value_get_boolean (&value));
     }
     #endif
-    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-tabs-in-the-background"))
         view->open_tabs_in_the_background = g_value_get_boolean (&value);
     else if (name == g_intern_string ("enable-javascript"))
@@ -3760,12 +3451,13 @@ midori_view_web_inspector_construct_window (gpointer       inspector,
     const gchar* label;
     GtkWidget* window;
     GtkWidget* toplevel;
-    GdkScreen* screen;
-    gint width, height;
     const gchar* icon_name;
     GtkIconTheme* icon_theme;
     GdkPixbuf* icon;
     GdkPixbuf* gray_icon;
+    #if GTK_CHECK_VERSION (3, 0, 0)
+    GtkWidget* scrolled;
+    #endif
 
     label = midori_view_get_display_title (view);
     title = g_strdup_printf (_("Inspect page - %s"), label);
@@ -3802,8 +3494,16 @@ midori_view_web_inspector_construct_window (gpointer       inspector,
     #if GTK_CHECK_VERSION (3, 4, 0)
     gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
     #endif
+    gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100);
+    #if GTK_CHECK_VERSION (3, 0, 0)
+    scrolled = gtk_scrolled_window_new (NULL, NULL);
+    gtk_container_add (GTK_CONTAINER (scrolled), inspector_view);
+    gtk_container_add (GTK_CONTAINER (window), scrolled);
+    gtk_widget_show_all (scrolled);
+    #else
     gtk_container_add (GTK_CONTAINER (window), inspector_view);
     gtk_widget_show_all (inspector_view);
+    #endif
 
     g_signal_connect (window, "key-press-event",
         G_CALLBACK (midori_view_inspector_window_key_press_event_cb), NULL);
@@ -3852,12 +3552,39 @@ midori_view_web_inspector_attach_window_cb (gpointer    inspector,
     return TRUE;
 }
 
+/**
+ * midori_view_web_inspector_get_own_window:
+ * @inspector: the inspector instance
+ *
+ * Get the widget containing the inspector, generally either a GtkWindow
+ * or the container where it is "docked".
+ *
+ * Return value: (allow-none): the widget containing the inspector, or NULL.
+ * 
+ * Since: 0.5.10
+ */
+static GtkWidget*
+midori_view_web_inspector_get_parent (gpointer inspector)
+{
+    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
+
+    #if defined(HAVE_WEBKIT2) || GTK_CHECK_VERSION (3, 0, 0)
+    GtkWidget* scrolled = gtk_widget_get_parent (inspector_view);
+    if (!scrolled)
+        return NULL;
+    return gtk_widget_get_parent (scrolled);
+    #else
+    return gtk_widget_get_parent (inspector_view);
+    #endif
+}
+
 static gboolean
 midori_view_web_inspector_detach_window_cb (gpointer    inspector,
                                             MidoriView* view)
 {
     GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    GtkWidget* parent = gtk_widget_get_parent (inspector_view);
+    GtkWidget* parent = midori_view_web_inspector_get_parent (inspector);
+
     if (GTK_IS_WINDOW (parent))
         return FALSE;
 
@@ -3872,15 +3599,12 @@ static gboolean
 midori_view_web_inspector_close_window_cb (gpointer    inspector,
                                            MidoriView* view)
 {
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    #ifdef HAVE_WEBKIT2
-    GtkWidget* scrolled = inspector_view;
-    #else
-    GtkWidget* scrolled = gtk_widget_get_parent (inspector_view);
-    #endif
-    if (!scrolled)
+    GtkWidget* parent = midori_view_web_inspector_get_parent (inspector);
+
+    if (!parent)
         return FALSE;
-    gtk_widget_hide (gtk_widget_get_parent (scrolled));
+
+    gtk_widget_hide (parent);
     return TRUE;
 }
 #endif
@@ -3890,7 +3614,6 @@ midori_view_constructor (GType                  type,
                          guint                  n_construct_properties,
                          GObjectConstructParam* construct_properties)
 {
-    gpointer inspector;
     GObject* object = G_OBJECT_CLASS (midori_view_parent_class)->constructor (
         type, n_construct_properties, construct_properties);
     MidoriView* view = MIDORI_VIEW (object);
@@ -3912,6 +3635,10 @@ midori_view_constructor (GType                  type,
                       midori_view_web_view_navigation_decision_cb, view,
                       "signal::permission-request",
                       midori_view_web_view_permission_request_cb, view,
+                      "signal::context-menu",
+                      midori_view_web_view_context_menu_cb, view,
+                      "signal::create",
+                      webkit_web_view_create_web_view_cb, view,
                       #else
                       "signal::notify::load-status",
                       midori_view_web_view_notify_load_status_cb, view,
@@ -3935,28 +3662,24 @@ midori_view_constructor (GType                  type,
                       midori_view_web_view_resource_request_cb, view,
                       "signal::database-quota-exceeded",
                       midori_view_web_view_database_quota_exceeded_cb, view,
-                      #if WEBKIT_CHECK_VERSION (1, 1, 23)
                       "signal::geolocation-policy-decision-requested",
                       midori_view_web_view_geolocation_decision_cb, view,
-                      #endif
-                      #if WEBKIT_CHECK_VERSION (1, 1, 18)
                       "signal::notify::icon-uri",
                       midori_web_view_notify_icon_uri_cb, view,
-                      #endif
                       "signal::hovering-over-link",
                       webkit_web_view_hovering_over_link_cb, view,
                       "signal::status-bar-text-changed",
                       webkit_web_view_statusbar_text_changed_cb, view,
-                      "signal::populate-popup",
-                      webkit_web_view_populate_popup_cb, view,
+                      #if WEBKIT_CHECK_VERSION (1, 10, 0)
+                      "signal::context-menu",
+                      midori_view_web_view_context_menu_cb, view,
+                      #endif
                       "signal::console-message",
                       webkit_web_view_console_message_cb, view,
                       "signal::download-requested",
                       midori_view_download_requested_cb, view,
                       #endif
 
-                      "signal::notify::uri",
-                      webkit_web_view_notify_uri_cb, view,
                       "signal::notify::title",
                       webkit_web_view_notify_title_cb, view,
                       "signal::leave-notify-event",
@@ -3985,21 +3708,19 @@ midori_view_constructor (GType                  type,
         g_signal_connect (view->web_view, "web-process-crashed",
             (GCallback)midori_view_web_view_crashed_cb, view);
     view->scrolled_window = view->web_view;
+    WebKitWebContext* context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
+    webkit_web_context_register_uri_scheme (context,
+        "res", midori_view_uri_scheme_res, NULL, NULL);
+    webkit_web_context_register_uri_scheme (context,
+        "stock", midori_view_uri_scheme_res, NULL, NULL);
+    g_signal_connect (context, "download-started",
+        G_CALLBACK (midori_view_download_started_cb), view);
     #endif
 
     #if GTK_CHECK_VERSION(3, 2, 0)
     view->overlay = gtk_overlay_new ();
     gtk_widget_show (view->overlay);
-    #ifdef HAVE_GRANITE_CLUTTER
-    {
-    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
-    granite_widgets_navigation_box_add (navigation_box, GTK_WIDGET (view->scrolled_window));
-    gtk_widget_show (GTK_WIDGET (view->scrolled_window));
-    gtk_container_add (GTK_CONTAINER (view->overlay), GTK_WIDGET (navigation_box));
-    }
-    #else
     gtk_container_add (GTK_CONTAINER (view->overlay), view->scrolled_window);
-    #endif
     gtk_box_pack_start (GTK_BOX (view), view->overlay, TRUE, TRUE, 0);
 
     /* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */
@@ -4012,6 +3733,10 @@ midori_view_constructor (GType                  type,
     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);
+    /* Enable enter-notify-event signals */
+    gtk_widget_add_events (view->overlay, GDK_ENTER_NOTIFY_MASK);
+    g_signal_connect (view->overlay, "enter-notify-event",
+        G_CALLBACK (midori_view_overlay_frame_enter_notify_event_cb), frame);
     }
     view->overlay_find = g_object_new (MIDORI_TYPE_FINDBAR, NULL);
     gtk_widget_set_halign (view->overlay_find, GTK_ALIGN_END);
@@ -4026,7 +3751,7 @@ midori_view_constructor (GType                  type,
     #ifndef HAVE_WEBKIT2
     gtk_container_add (GTK_CONTAINER (view->scrolled_window), view->web_view);
 
-    inspector = webkit_web_view_get_inspector ((WebKitWebView*)view->web_view);
+    gpointer inspector = webkit_web_view_get_inspector ((WebKitWebView*)view->web_view);
     g_object_connect (inspector,
                       "signal::inspect-web-view",
                       midori_view_web_inspector_inspect_web_view_cb, view,
@@ -4063,8 +3788,8 @@ void
 midori_view_list_versions (GString* markup,
                            gboolean html)
 {
-    midori_view_add_version (markup, html, g_strdup_printf ("%s %s (%s)",
-        g_get_application_name (), PACKAGE_VERSION, midori_app_get_name (NULL)));
+    midori_view_add_version (markup, html, g_strdup_printf ("%s %s (%s) %s",
+        g_get_application_name (), PACKAGE_VERSION, midori_app_get_name (NULL), gdk_get_program_class ()));
     midori_view_add_version (markup, html, g_strdup_printf ("GTK+ %s (%u.%u.%u)\tGlib %s (%u.%u.%u)",
         GTK_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version,
         GIO_VERSION, glib_major_version, glib_minor_version, glib_micro_version));
@@ -4081,13 +3806,6 @@ midori_view_list_versions (GString* markup,
         LIBNOTIFY_VERSION));
     midori_view_add_version (markup, html, g_strdup_printf ("gcr %s\tgranite %s",
         GCR_VERSION, GRANITE_VERSION));
-    midori_view_add_version (markup, html, g_strdup_printf ("single instance %s",
-        #if HAVE_UNIQUE
-        "libunique " UNIQUE_VERSION
-        #else
-        "Sockets"
-        #endif
-        ));
 }
 
 #ifdef HAVE_WEBKIT2
@@ -4131,7 +3849,7 @@ midori_view_list_plugins (MidoriView* view,
                     webkit_plugin_get_name (plugins->data),
                     html ? webkit_plugin_get_description (plugins->data) : ""));
         }
-    #elif WEBKIT_CHECK_VERSION (1, 3, 8)
+    #else
     WebKitWebPluginDatabase* pdb = webkit_get_web_plugin_database ();
     GSList* plugins = webkit_web_plugin_database_get_plugins (pdb);
     GSList* plugin = plugins;
@@ -4144,77 +3862,10 @@ midori_view_list_plugins (MidoriView* view,
             html ? webkit_web_plugin_get_description (plugin->data) : ""));
     }
     webkit_web_plugin_database_plugins_list_free (plugins);
-    #else
-    if (view == NULL)
-        return;
-
-    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);
-    /* Joins available plugins like this: URI1|title1,URI2|title2 */
-    gchar* value = sokoke_js_script_eval (js_context,
-        "function plugins (l) { var f = new Array (); for (var i in l) "
-        "{ var p = l[i].name + '|' + l[i].filename; "
-        "if (f.indexOf (p) == -1) f.push (p); } return f; }"
-        "plugins (navigator.plugins)", NULL);
-    gchar** items = g_strsplit (value, ",", 0);
-    guint i = 0;
-    if (items != NULL)
-        while (items[i] != NULL)
-        {
-            gchar** parts = g_strsplit (items[i], "|", 2);
-            if (parts[0] && !g_str_equal (parts[1], "undefined")
-             && !midori_web_settings_skip_plugin (parts[1]))
-                midori_view_add_version (ns_plugins, html, g_strdup_printf ("%s\t%s",
-                    parts[1], html ? parts[0] : ""));
-            g_strfreev (parts);
-            i++;
-        }
-        if (g_str_has_prefix (value, "undefined"))
-            midori_view_add_version (ns_plugins, html, g_strdup_printf ("%s",
-                "No plugins found"));
-        g_strfreev (items);
-        g_free (value);
     #endif
 }
 
-static void
-list_geolocation (GString* markup)
-{
-    g_string_append (markup,
-    "<a href=\"http://dev.w3.org/geo/api/spec-source.html\" id=\"method\"></a>"
-    "<span id=\"locationInfo\"><noscript>No Geolocation without Javascript</noscript></span>"
-    "<script>"
-    "function displayLocation (position) {"
-    "var geouri = 'geo:' + position.coords.latitude + ',' + position.coords.longitude + ',' + position.coords.altitude + ',u=' + position.coords.accuracy;"
-    "document.getElementById('locationInfo').innerHTML = '<a href=\"' + geouri + '\">' + geouri + '</a><br><code>'"
-    "+ ' timestamp: ' + position.timestamp"
-    "+ ' latitude: ' + position.coords.latitude"
-    "+ ' longitude: ' + position.coords.longitude"
-    "+ ' altitude: ' + position.coords.altitude + '<br>'"
-    "+ ' accuracy: ' + position.coords.accuracy"
-    "+ ' altitudeAccuracy: ' + position.coords.altitudeAccuracy"
-    "+ ' heading: ' + position.coords.heading"
-    "+ ' speed: ' + position.coords.speed"
-    "+ '</code>'; }"
-    "function handleError (error) {"
-    "var errorMessage = '<b>' + ['Unknown error', 'Permission denied', 'Position failed', 'Timed out'][error.code] + '</b>';"
-    "if (error.code == 3) document.getElementById('locationInfo').innerHTML += (' ' + errorMessage);"
-    "else document.getElementById('locationInfo').innerHTML = errorMessage; }"
-    "if (navigator.geolocation) {"
-    "var options = { enableHighAccuracy: true, timeout: 60000, maximumAge: \"Infinite\" };"
-    "  if (navigator.geolocation.watchPosition) {"
-    "    document.getElementById('method').innerHTML = '<code>geolocation.watchPosition</code>:';"
-    "    navigator.geolocation.watchPosition(displayLocation, handleError, options);"
-    "  } else {"
-    "    document.getElementById('method').innerHTML = '<code>geolocation.getCurrentPosition</code>:';"
-    "    navigator.geolocation.getCurrentPosition(displayLocation, handleError);"
-    "  }"
-    "} else"
-    "  document.getElementById('locationInfo').innerHTML = 'Geolocation unavailable';"
-    "</script>");
-}
-
-static void
+void
 midori_view_list_video_formats (MidoriView* view,
                                 GString*    formats,
                                 gboolean    html)
@@ -4234,34 +3885,11 @@ midori_view_list_video_formats (MidoriView* view,
         "' &nbsp; WebM [' + "
         "supported('video/webm; codecs=\"vp8, vorbis\"') + ']' "
         "", NULL);
-    midori_view_add_version (formats, html, g_strdup_printf ("Video Formats %s", value));
-    g_free (value);
-#endif
-}
-
-static const gchar* valid_about_uris[] = {
-    "about:dial",
-    "about:geolocation",
-    "about:home",
-    "about:new",
-    "about:nodocs",
-    "about:paths",
-    "about:private",
-    "about:search",
-    "about:widgets",
-};
-
-static void
-list_about_uris (GString* markup)
-{
-    g_string_append (markup, "<p>");
-    guint i;
-    for (i = 0; i < G_N_ELEMENTS (valid_about_uris); i++)
-        g_string_append_printf (markup, "<a href=\"%s\">%s</a> &nbsp;",
-                                valid_about_uris[i], valid_about_uris[i]);
+    midori_view_add_version (formats, html, g_strdup_printf ("Video Formats %s", value));
+    g_free (value);
+#endif
 }
 
-
 /**
  * midori_view_set_uri:
  * @view: a #MidoriView
@@ -4276,8 +3904,6 @@ void
 midori_view_set_uri (MidoriView*  view,
                      const gchar* uri)
 {
-    gchar* data;
-
     g_return_if_fail (MIDORI_IS_VIEW (view));
     g_return_if_fail (uri != NULL);
 
@@ -4285,229 +3911,32 @@ 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);
 
+    midori_uri_recursive_fork_protection (uri, TRUE);
+
     if (!midori_debug ("unarmed"))
     {
-        gchar* temporary_uri = NULL;
-        if (!strcmp (uri, "about:new"))
-            uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));
-        if (!strcmp (uri, "about:home"))
-            uri = midori_settings_get_homepage (MIDORI_SETTINGS (view->settings));
-        if (!strcmp (uri, "about:search"))
-        {
-            uri = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings));
-            temporary_uri = midori_uri_for_search (uri, "");
-            uri = temporary_uri;
-        }
-
-        if (!strcmp (uri, "about:dial"))
-        {
-            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"))
-                timer = g_timer_new ();
-            #endif
-
-            midori_tab_set_uri (MIDORI_TAB (view), uri);
-            midori_tab_set_mime_type (MIDORI_TAB (view), "text/html");
-            katze_item_set_meta_string (view->item, "mime-type", "text/html");
-            katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
-
-            html = dial != NULL ? midori_speed_dial_get_html (dial, NULL) : "";
-            midori_view_set_html (view, html, uri, NULL);
+        gboolean handled = FALSE;
+        if (g_str_has_prefix (uri, "about:"))
+            g_signal_emit (view, signals[ABOUT_CONTENT], 0, uri, &handled);
 
-            #ifdef G_ENABLE_DEBUG
-            if (midori_debug ("startup"))
-            {
-                g_debug ("Speed Dial: \t%fs", g_timer_elapsed (timer, NULL));
-                g_timer_destroy (timer);
-            }
-            #endif
-        }
-        else if (midori_uri_is_blank (uri))
+        if (handled)
         {
-            data = NULL;
-            if (!strcmp (uri, "about:nodocs"))
-            {
-                gchar* title = g_strdup_printf (_("No documentation installed"));
-                data = g_strdup_printf (
-                    "<html><head><title>%s</title></head>"
-                    "<body><h1>%s</h1>"
-                    "<img src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "<p />There is no documentation installed at %s. "
-                    "You may want to ask your distribution or "
-                    "package maintainer for it or if this a custom build "
-                    "verify that the build is setup properly. "
-                    "<a href=\"http://wiki.xfce.org/midori/faq\">View the FAQ online</a>"
-                    "</body></html>",
-                    title, title, DOCDIR);
-                g_free (title);
-            }
-            else if (!strcmp (uri, "about:widgets"))
-            {
-                static const gchar* widgets[] = {
-                    "<input value=\"demo\"%s>",
-                    "<p><input type=\"password\" value=\"demo\"%s>",
-                    "<p><input type=\"checkbox\" value=\"demo\"%s> demo",
-                    "<p><input type=\"radio\" value=\"demo\"%s> demo",
-                    "<p><select%s><option>foo bar</option><option selected>spam eggs</option></select>",
-                    "<p><select%s size=\"3\"><option>foo bar</option><option selected>spam eggs</option></select>",
-                    "<p><input type=\"file\"%s>",
-                    "<p><input type=\"file\" multiple%s>",
-                    "<input type=\"button\" value=\"demo\"%s>",
-                    "<p><input type=\"email\" value=\"user@localhost.com\"%s>",
-                    "<input type=\"url\" value=\"http://www.example.com\"%s>",
-                    "<input type=\"tel\" value=\"+1 234 567 890\" pattern=\"^[0+][1-9 /-]*$\"%s>",
-                    "<input type=\"number\" min=1 max=9 step=1 value=\"4\"%s>",
-                    "<input type=\"range\" min=1 max=9 step=1 value=\"4\"%s>",
-                    "<input type=\"date\" min=1990-01-01 max=2010-01-01%s>",
-                    "<input type=\"search\" placeholder=\"demo\"%s>",
-                    "<textarea%s>Lorem ipsum doloret sit amet…</textarea>",
-                    "<input type=\"color\" value=\"#d1eeb9\"%s>",
-                    "<progress min=1 max=9 value=4 %s></progress>",
-                    "<keygen type=\"rsa\" challenge=\"235ldahlae983dadfar\"%s>",
-                    "<p><input type=\"reset\"%s>",
-                    "<input type=\"submit\"%s>",
-                };
-                guint i;
-                GString* demo = g_string_new ("<html><head><style>"
-                    ".fallback::-webkit-slider-thumb,"
-                    ".fallback, .fallback::-webkit-file-upload-button {"
-                    "-webkit-appearance: none !important }"
-                    ".column { display:inline-block; vertical-align:top;"
-                    "width:25%;margin-right:1% }</style><title>");
-                g_string_append_printf (demo,
-                    "%s</title></head><body><h1>%s</h1>", uri, uri);
-                g_string_append (demo, "<div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], "");
-                g_string_append (demo, "</div><div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], " disabled");
-                g_string_append (demo, "</div><div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], " class=\"fallback\"");
-                g_string_append (demo, "</div>");
-                data = g_string_free (demo, FALSE);
-            }
-            else if (!strcmp (uri, "about:private"))
-            {
-                data = g_strdup_printf (
-                    "<html><head><title>%s</title>"
-                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"res://about.css\">"
-                    "</head><body><div id=\"container\">"
-                    "<img id=\"logo\" src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "<img id=\"icon\" src=\"stock://gtk-dialog-info\">"
-                    "<div id=\"main\"><h1>%s</h1>"
-                    "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li></ul>"
-                    "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>"
-                    "</div><br style=\"clear: both\"></div></body></html>",
-                    _("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 ("");
-                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_markup_printf_escaped ("<body><h1>%s</h1>"
-                    "<p>config: <code>%s</code></p>"
-                    "<p>res: <code>%s</code></p>"
-                    "<p>lib: <code>%s</code></p>"
-                    "<p>cache: <code>%s</code></p>"
-                    "<p>tmp: <code>%s</code></p>"
-                    "</body>",
-                    uri, midori_paths_get_config_dir_for_reading (), res_dir,
-                    lib_dir, midori_paths_get_cache_dir_for_reading (), midori_paths_get_tmp_dir ());
-                g_free (res_dir);
-                g_free (lib_dir);
-            }
-            else if (!strcmp (uri, "about:") || !strcmp (uri, "about:version"))
-            {
-                gchar* command_line = midori_paths_get_command_line_str (TRUE);
-                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");
-                GString * tmp = g_string_new ("");
-
-                g_string_append_printf (tmp,
-                    "<html><head><title>about:version</title></head>"
-                    "<body><h1>a%sbout:version</h1>"
-                    "<p>%s</p>"
-                    "<img src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "<table>",
-                    "<span style=\"position: absolute; left: -1000px; top: -1000px\">lias a=b; echo Copy carefully #</span>",
-                    _("Version numbers in brackets show the version used at runtime."));
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Command line %s",
-                    command_line));
-                midori_view_list_versions (tmp, TRUE);
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Platform %s %s %s",
-                    platform, sys_name, architecture ? architecture : ""));
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s",
-                    ident));
-                midori_view_list_video_formats (view, tmp, TRUE);
-
-                g_string_append (tmp, "</table><table>");
-                midori_view_list_plugins (view, tmp, TRUE);
-                g_string_append (tmp, "</table>");
-                list_about_uris (tmp);
-                /* TODO: list active extensions */
-
-                g_string_append (tmp, "</body></html>");
-                data = g_string_free (tmp, FALSE);
-
-                g_free (command_line);
-                g_free (ident);
-            }
-            else if (!strcmp (uri, "about:blank"))
-                data = g_strdup ("<body></body>");
-            else
-            {
-                data = g_strdup_printf (
-                    "<html><head><title>%s</title></head><body><h1>%s</h1>"
-                    "<img src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "</body></html>", uri, uri);
-            }
-
             midori_tab_set_uri (MIDORI_TAB (view), uri);
             midori_tab_set_special (MIDORI_TAB (view), TRUE);
-#ifndef HAVE_WEBKIT2
-            webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (view->web_view), data, uri);
-#else
-            webkit_web_view_load_html (WEBKIT_WEB_VIEW (view->web_view), data, uri);
-#endif
-            g_free (data);
             katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
             katze_item_set_uri (view->item, midori_tab_get_uri (MIDORI_TAB (view)));
+            return;
         }
-        else if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_DELAYED)
+
+        if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_DELAYED)
         {
             midori_tab_set_uri (MIDORI_TAB (view), uri);
             midori_tab_set_special (MIDORI_TAB (view), TRUE);
             katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY);
-            midori_view_display_error (view, NULL, NULL, _("Page loading delayed"),
+            midori_view_display_error (view, NULL, "stock://dialog/network-idle", NULL,
+                _("Page loading delayed:"),
                 _("Loading delayed either due to a recent crash or startup preferences."),
+                NULL,
                 _("Load Page"),
                 NULL);
         }
@@ -4522,19 +3951,21 @@ midori_view_set_uri (MidoriView*  view,
                 g_free (exception);
             }
         }
-        else if (sokoke_external_uri (uri))
-        {
-            sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
-        }
         else
         {
+            if (sokoke_external_uri (uri))
+            {
+                g_signal_emit_by_name (view, "open-uri", uri, &handled);
+                if (handled)
+                    return;
+            }
+
             midori_tab_set_uri (MIDORI_TAB (view), uri);
             katze_item_set_uri (view->item, midori_tab_get_uri (MIDORI_TAB (view)));
             katze_assign (view->title, NULL);
             midori_tab_set_view_source (MIDORI_TAB (view), FALSE);
             webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), uri);
         }
-        g_free (temporary_uri);
     }
 }
 
@@ -4647,6 +4078,7 @@ midori_view_get_display_uri (MidoriView* view)
        Yet for practical purposes we prefer "".  */
     if (!strcmp (uri, "about:blank")
      || !strcmp (uri, "about:dial")
+     || !strcmp (uri, "about:new")
      || !strcmp (uri, "about:private"))
         return "";
 
@@ -4710,17 +4142,14 @@ gboolean
 midori_view_has_selection (MidoriView* view)
 {
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 4, 3)
     WebKitDOMDocument* doc;
     WebKitDOMDOMWindow* window;
     WebKitDOMDOMSelection* selection;
     WebKitDOMRange* range;
-#endif
 
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
 
-#if WEBKIT_CHECK_VERSION (1, 4, 3)
     doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
     window = webkit_dom_document_get_default_view (doc);
     selection = webkit_dom_dom_window_get_selection (window);
@@ -4733,10 +4162,6 @@ midori_view_has_selection (MidoriView* view)
         return FALSE;
 
     katze_assign (view->selected_text, webkit_dom_range_get_text (range));
-#else
-    katze_assign (view->selected_text, webkit_web_view_get_selected_text (
-        WEBKIT_WEB_VIEW (view->web_view)));
-#endif
 
     if (view->selected_text && *view->selected_text)
         return TRUE;
@@ -4761,7 +4186,7 @@ midori_view_get_selected_text (MidoriView* view)
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
     if (midori_view_has_selection (view))
-        return view->selected_text;
+        return g_strstrip (view->selected_text);
     return NULL;
 }
 
@@ -4800,13 +4225,6 @@ midori_view_get_proxy_menu_item (MidoriView* view)
     return view->menu_item;
 }
 
-static void
-midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget*  menuitem,
-                                             MidoriView* view)
-{
-    midori_view_duplicate (view);
-}
-
 GtkWidget*
 midori_view_duplicate (MidoriView* view)
 {
@@ -4819,34 +4237,6 @@ midori_view_duplicate (MidoriView* view)
     return new_view;
 }
 
-static void
-midori_view_tab_label_menu_close_other_tabs_cb (GtkWidget* menuitem,
-                                                GtkWidget* view)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (view);
-    GList* tabs = midori_browser_get_tabs (browser);
-    for (; tabs; tabs = g_list_next (tabs))
-    {
-        if (tabs->data != view)
-            midori_browser_close_tab (browser, tabs->data);
-    }
-    g_list_free (tabs);
-}
-
-static void
-midori_view_tab_label_menu_minimize_tab_cb (GtkWidget*  menuitem,
-                                            MidoriView* view)
-{
-    g_object_set (view, "minimized", !view->minimized, NULL);
-}
-
-static void
-midori_view_tab_label_menu_close_cb (GtkWidget* menuitem,
-                                     GtkWidget* view)
-{
-    midori_browser_close_tab (midori_browser_get_for_widget (view), view);
-}
-
 /**
  * midori_view_get_tab_menu:
  * @view: a #MidoriView
@@ -4857,269 +4247,18 @@ midori_view_tab_label_menu_close_cb (GtkWidget* menuitem,
  * Return value: a #GtkMenu
  *
  * Since: 0.1.8
+ * Deprecated: 0.5.7: Use MidoriNotebook API instead.
  **/
 GtkWidget*
 midori_view_get_tab_menu (MidoriView* view)
-{
-    MidoriBrowser* browser;
-    GtkActionGroup* actions;
-    gint pages;
-    GtkWidget* menu;
-    GtkWidget* menuitem;
-
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
-    browser = midori_browser_get_for_widget (GTK_WIDGET (view));
-    actions = midori_browser_get_action_group (browser);
-    pages = midori_browser_get_n_pages (browser);
-
-    menu = gtk_menu_new ();
-    menuitem = sokoke_action_create_popup_menu_item (
-        gtk_action_group_get_action (actions, "TabNew"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = sokoke_action_create_popup_menu_item (
-        gtk_action_group_get_action (actions, "UndoTabClose"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = gtk_separator_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL);
-    gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    g_signal_connect (menuitem, "activate",
-        G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view);
-    menuitem = gtk_menu_item_new_with_mnemonic (_("_Duplicate Tab"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    g_signal_connect (menuitem, "activate",
-        G_CALLBACK (midori_view_tab_label_menu_duplicate_tab_cb), view);
-    menuitem = gtk_menu_item_new_with_mnemonic (
-        view->minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    g_signal_connect (menuitem, "activate",
-        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));
-    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",
-        G_CALLBACK (midori_view_tab_label_menu_close_cb), view);
-    gtk_widget_show_all (menu);
-
-    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));
-        g_object_set (view->tab, "fixed", view->minimized, NULL);
-    }
-    return view->tab;
-}
-
-void
-midori_view_set_tab (MidoriView*        view,
-                     GraniteWidgetsTab* tab)
-{
-    g_return_if_fail (MIDORI_IS_VIEW (view));
-    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),
-        "fixed", view->minimized,
-        NULL);
-}
-
-GtkWidget*
-midori_view_get_proxy_tab_label (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
-    GtkWidget* tab = GTK_WIDGET (midori_view_get_tab (view));
-    GList* children = gtk_container_get_children (GTK_CONTAINER (tab));
-    GtkWidget* label = NULL;
-    for (; children; children = g_list_next (children))
-        if (GTK_IS_EVENT_BOX (children->data))
-            label = children->data;
-    g_list_free (children);
-    g_warn_if_fail (label != NULL);
-    return label;
-}
-
-#else
-static gboolean
-midori_view_tab_label_button_press_event (GtkWidget*      tab_label,
-                                          GdkEventButton* event,
-                                          GtkWidget*      widget)
-{
-    if (event->button == 2)
-    {
-        /* Close the widget on middle click */
-        midori_browser_close_tab (midori_browser_get_for_widget (widget), widget);
-        return TRUE;
-    }
-    else if (MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        /* Show a context menu on right click */
-        GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget));
-
-        katze_widget_popup (widget, GTK_MENU (menu),
-                            event, KATZE_MENU_POSITION_CURSOR);
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-midori_view_tab_close_clicked (GtkWidget* tab_close,
-                               GtkWidget* widget)
-{
-    midori_browser_close_tab (midori_browser_get_for_widget (widget), widget);
-}
-
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-midori_view_tab_icon_style_set_cb (GtkWidget* tab_close,
-                                   GtkStyle*  previous_style)
-{
-    GtkRequisition size;
-    gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (tab_close)), &size);
-    gtk_widget_set_size_request (tab_close, size.width, size.height);
-}
-#endif
-
-static void
-midori_view_update_tab_title (MidoriView* view,
-                              gdouble     angle)
-{
-    if (angle == 0.0)
-        gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize);
-    else
-        gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_NONE);
-    gtk_label_set_angle (GTK_LABEL (view->tab_title), angle);
-}
-
-static void
-gtk_box_repack (GtkBox*    box,
-                GtkWidget* child)
-{
-    GtkWidget* old_box;
-    gboolean expand, fill;
-    guint padding;
-    GtkPackType pack_type;
-
-    old_box = gtk_widget_get_parent (child);
-    g_return_if_fail (GTK_IS_BOX (old_box));
-
-    gtk_box_query_child_packing (GTK_BOX (old_box), child,
-        &expand, &fill, &padding, &pack_type);
-
-    g_object_ref (child);
-    gtk_container_remove (GTK_CONTAINER (old_box), child);
-    if (pack_type == GTK_PACK_START)
-        gtk_box_pack_start (box, child, expand, fill, padding);
-    else
-        gtk_box_pack_end (box, child, expand, fill, padding);
-    g_object_unref (child);
-}
-
-static void
-midori_view_tab_label_parent_set (GtkWidget*  tab_label,
-#if GTK_CHECK_VERSION(3,0,0)
-                                  GObject*  old_parent,
-#else
-                                  GtkObject*  old_parent,
-#endif
-                                  MidoriView* view)
-{
-    GtkWidget* parent;
-
-    /* FIXME: Disconnect orientation notification
-    if (old_parent)
-        ; */
-
-    if (!(parent = gtk_widget_get_parent (tab_label)))
-        return;
-
-    if (GTK_IS_NOTEBOOK (parent))
-    {
-        GtkPositionType pos;
-        gdouble old_angle, angle;
-        GtkWidget* box;
-
-        pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (parent));
-        old_angle = gtk_label_get_angle (GTK_LABEL (view->tab_title));
-        switch (pos)
-        {
-        case GTK_POS_LEFT:
-            angle = 90.0;
-            break;
-        case GTK_POS_RIGHT:
-            angle = 270.0;
-            break;
-        default:
-            angle = 0.0;
-        }
-
-        if (old_angle != angle)
-        {
-            GtkWidget* align;
-
-            if (angle == 0.0)
-                box = gtk_hbox_new (FALSE, 1);
-            else
-                box = gtk_vbox_new (FALSE, 1);
-            gtk_box_repack (GTK_BOX (box), view->tab_icon);
-            gtk_box_repack (GTK_BOX (box), view->tab_title);
-            align = gtk_widget_get_parent (view->tab_close);
-            gtk_box_repack (GTK_BOX (box), align);
-
-            gtk_container_remove (GTK_CONTAINER (tab_label),
-                gtk_bin_get_child (GTK_BIN (tab_label)));
-            gtk_container_add (GTK_CONTAINER (tab_label), GTK_WIDGET (box));
-            gtk_widget_show (box);
-        }
-
-        midori_view_update_tab_title (view, angle);
-
-        /* FIXME: Connect orientation notification */
-    }
-}
-
-static void midori_view_tab_label_data_received (GtkWidget* widget,
-                                                 GdkDragContext* context,
-                                                 gint x,
-                                                 gint y,
-                                                 GtkSelectionData* data,
-                                                 guint ttype,
-                                                 guint timestamp,
-                                                 MidoriView* view)
-{
-    gchar** uri = gtk_selection_data_get_uris (data);
-    if (uri != NULL)
-    {
-        midori_view_set_uri (view, uri[0]);
-        g_strfreev (uri);
-    }
-    else
-    {
-        gchar* text = (gchar*) gtk_selection_data_get_text (data);
-        midori_view_set_uri (view, text);
-        g_free (text);
-    }
+    GtkWidget* notebook = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (view)));
+    MidoriContextAction* context_action = midori_notebook_get_tab_context_action (MIDORI_NOTEBOOK (notebook), MIDORI_TAB (view));
+    GtkMenu* menu = midori_context_action_create_menu (context_action, NULL, FALSE);
+    g_object_unref (context_action);
+    return GTK_WIDGET (menu);
 }
 
 /**
@@ -5129,115 +4268,22 @@ static void midori_view_tab_label_data_received (GtkWidget* widget,
  * Retrieves a proxy tab label that is typically used when
  * adding the view to a notebook.
  *
- * Note that the label actually adjusts its orientation
- * to the according tab position when used in a notebook.
- *
- * The label is created on the first call and will be updated to reflect
- * changes of the loading progress and title.
- *
- * The label is valid until it is removed from its container.
- *
  * Return value: the proxy #GtkEventBox
+ *
+ * Deprecated: 0.5.7: Don't use this label.
  **/
 GtkWidget*
 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[] =
-        "style \"midori-close-button-style\"\n"
-        "{\n"
-        "GtkWidget::focus-padding = 0\n"
-        "GtkWidget::focus-line-width = 0\n"
-        "xthickness = 0\n"
-        "ythickness = 0\n"
-        "}\n"
-        "widget \"*.midori-close-button\" style \"midori-close-button-style\"";
-    #endif
-    GtkWidget* image;
-    GtkWidget* align;
-
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
     if (!view->tab_label)
     {
-        view->tab_icon = katze_throbber_new ();
-        katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon),
-            midori_view_get_icon (view));
-
-        view->tab_title = gtk_label_new (midori_view_get_display_title (view));
-        gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5);
-        gtk_misc_set_padding (GTK_MISC (view->tab_title), 0, 0);
-
-        event_box = gtk_event_box_new ();
-        gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
-        hbox = gtk_hbox_new (FALSE, 1);
-        gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox));
-        midori_view_update_tab_title (view, 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)
-        gtk_rc_parse_string (style_fixup);
-        gtk_widget_set_name (view->tab_close, "midori-close-button");
-        g_signal_connect (view->tab_close, "style-set",
-            G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL);
-        #endif
-        image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-        gtk_container_add (GTK_CONTAINER (view->tab_close), image);
-        align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-        gtk_container_add (GTK_CONTAINER (align), view->tab_close);
-
-        if (katze_object_get_boolean (view->settings, "close-buttons-left"))
-        {
-            gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0);
-            gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0);
-            gtk_box_pack_start (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-        }
-        else
-        {
-            gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0);
-            gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, TRUE, TRUE, 0);
-            gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0);
-        }
-        gtk_widget_show_all (GTK_WIDGET (event_box));
-
-        if (view->minimized)
-            gtk_widget_hide (view->tab_title);
-        if (!view->close_buttons_on_tabs)
-            gtk_widget_hide (view->tab_close);
-
-        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);
-
-        view->tab_label = event_box;
-        g_signal_connect (view->tab_icon, "destroy",
-                          G_CALLBACK (gtk_widget_destroyed),
-                          &view->tab_icon);
-        g_signal_connect (view->tab_label, "destroy",
-                          G_CALLBACK (gtk_widget_destroyed),
-                          &view->tab_label);
-
-        g_signal_connect (view->tab_label, "parent-set",
-                          G_CALLBACK (midori_view_tab_label_parent_set),
-                          view);
-        gtk_drag_dest_set (view->tab_label, GTK_DEST_DEFAULT_ALL, NULL,
-                           0, GDK_ACTION_COPY);
-        gtk_drag_dest_add_text_targets (view->tab_label);
-        gtk_drag_dest_add_uri_targets (view->tab_label);
-        g_signal_connect (view->tab_label, "drag-data-received",
-                          G_CALLBACK (midori_view_tab_label_data_received),
-                          view);
+        view->tab_label = gtk_label_new ("dummy");
+        gtk_widget_show (view->tab_label);
     }
     return view->tab_label;
 }
-#endif
 
 /**
  * midori_view_get_label_ellipsize:
@@ -5353,6 +4399,58 @@ midori_view_can_zoom_out (MidoriView* view)
         || !g_str_has_prefix (midori_tab_get_mime_type (MIDORI_TAB (view)), "image/"));
 }
 
+#ifdef HAVE_WEBKIT2
+static void
+midori_web_resource_get_data_cb (WebKitWebResource *resource,
+                          GAsyncResult *result,
+                          GOutputStream *output_stream)
+{
+    guchar *data;
+    gsize data_length;
+    GInputStream *input_stream;
+    GError *error = NULL;
+
+    data = webkit_web_resource_get_data_finish (resource, result, &data_length, &error);
+    if (!data) {
+        g_printerr ("Failed to save page: %s", error->message);
+        g_error_free (error);
+        g_object_unref (output_stream);
+
+        return;
+    }
+
+    input_stream = g_memory_input_stream_new_from_data (data, data_length, g_free);
+    g_output_stream_splice_async (output_stream, input_stream,
+                                G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
+                                G_PRIORITY_DEFAULT,
+                                NULL, NULL, NULL);
+    g_object_unref (input_stream);
+    g_object_unref (output_stream);
+}
+
+static void
+midori_web_view_save_main_resource_cb (GFile *file,
+                                     GAsyncResult *result,
+                                     WebKitWebView *view)
+{
+    GFileOutputStream *output_stream;
+    WebKitWebResource *resource;
+    GError *error = NULL;
+
+    output_stream = g_file_replace_finish (file, result, &error);
+    if (!output_stream) {
+        g_printerr ("Failed to save page: %s", error->message);
+        g_error_free (error);
+        return;
+    }
+
+    resource = webkit_web_view_get_main_resource (view);
+    webkit_web_resource_get_data (resource, NULL,
+                                (GAsyncReadyCallback)midori_web_resource_get_data_cb,
+                                output_stream);                                
+} 
+#endif
+
 /**
  * midori_view_save_source:
  * @view: a #MidoriView
@@ -5366,10 +4464,19 @@ midori_view_can_zoom_out (MidoriView* view)
  * Since: 0.4.4
  **/
 gchar*
-midori_view_save_source (MidoriView* view,
+midori_view_save_source (MidoriView*  view,
                          const gchar* uri,
-                         const gchar* outfile)
+                         const gchar* outfile,
+                         gboolean     use_dom)
 {
+    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+    
+    if (uri == NULL)
+        uri = midori_view_get_display_uri (view);
+
+    if (g_str_has_prefix (uri, "file:///"))
+        return g_filename_from_uri (uri, NULL, NULL);
+
 #ifndef HAVE_WEBKIT2
     WebKitWebFrame *frame;
     WebKitWebDataSource *data_source;
@@ -5379,17 +4486,25 @@ midori_view_save_source (MidoriView* view,
     FILE* fp;
     size_t ret;
 
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
     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 (use_dom)
+    {
+        WebKitDOMDocument* doc;
 
-    if (g_str_has_prefix (uri, "file:///"))
-        return g_filename_from_uri (uri, NULL, NULL);
+        #if WEBKIT_CHECK_VERSION (1, 9, 5)
+        doc = webkit_web_frame_get_dom_document (frame);
+        #else
+        doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
+        #endif
+
+        WebKitDOMElement* root = webkit_dom_document_query_selector (doc, ":root", NULL);
+        const gchar* content = webkit_dom_html_element_get_outer_html (WEBKIT_DOM_HTML_ELEMENT (root));
+        data = g_string_new (content);
+    } else {
+        data_source = webkit_web_frame_get_data_source (frame);
+        data = webkit_web_data_source_get_data (data_source);
+    }
 
     if (!outfile)
     {
@@ -5425,7 +4540,30 @@ midori_view_save_source (MidoriView* view,
     }
     return unique_filename;
 #else
-    return NULL;
+    GFile *file;
+    char *converted = NULL;
+    WebKitWebView * web_view = WEBKIT_WEB_VIEW (view->web_view);
+    g_return_if_fail (uri);
+
+    if (!outfile)
+        converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL);
+    else
+        converted = g_strdup (outfile);
+
+    file = g_file_new_for_uri (converted);
+
+    if (g_str_has_suffix (uri, ".mht"))
+        webkit_web_view_save_to_file (WEBKIT_WEB_VIEW (web_view), file, WEBKIT_SAVE_MODE_MHTML,
+                                  NULL, NULL, NULL);
+    else
+        g_file_replace_async (file, NULL, FALSE,
+                          G_FILE_CREATE_REPLACE_DESTINATION | G_FILE_CREATE_PRIVATE,
+                          G_PRIORITY_DEFAULT, NULL,
+                          (GAsyncReadyCallback)midori_web_view_save_main_resource_cb,
+                          web_view);
+    g_free (converted);
+    g_object_unref (file);
+    return converted;
 #endif
 }
 
@@ -5483,11 +4621,6 @@ midori_view_go_back (MidoriView* view)
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
-    #ifdef HAVE_GRANITE_CLUTTER
-    GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view));
-    granite_widgets_navigation_box_back (navigation_box);
-    #endif
-
     webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view));
     /* Force the speed dial to kick in if going back to a blank page */
     if (midori_view_is_blank (view))
@@ -5646,26 +4779,43 @@ midori_view_print (MidoriView* view)
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
+    GtkPrintSettings* settings = gtk_print_settings_new ();
+    #if GTK_CHECK_VERSION (3, 6, 0)
+    gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BASENAME, midori_view_get_display_title (view));
+    #endif
+
 #ifdef HAVE_WEBKIT2
     WebKitPrintOperation* operation = webkit_print_operation_new (WEBKIT_WEB_VIEW (view->web_view));
-    GtkPrintSettings* settings = gtk_print_settings_new ();
     webkit_print_operation_set_print_settings (operation, settings);
     g_object_unref (settings);
-    webkit_print_operation_run_dialog (operation,
-        GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
+
+    if (katze_object_get_boolean (view->settings, "print-without-dialog")) {
+        webkit_print_operation_print (operation);
+    }
+    else {
+        webkit_print_operation_run_dialog (operation,
+            GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
+    }
     g_object_unref (operation);
 #else
     WebKitWebFrame* frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
     GtkPrintOperation* operation = gtk_print_operation_new ();
+    gtk_print_operation_set_print_settings (operation, settings);
+    g_object_unref (settings);
     gtk_print_operation_set_custom_tab_label (operation, _("Features"));
-    #if GTK_CHECK_VERSION (2, 18, 0)
     gtk_print_operation_set_embed_page_setup (operation, TRUE);
-    #endif
     g_signal_connect (operation, "create-custom-widget",
         G_CALLBACK (midori_view_print_create_custom_widget_cb), view);
     GError* error = NULL;
-    webkit_web_frame_print_full (frame, operation,
-        GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error);
+
+    if (katze_object_get_boolean (view->settings, "print-without-dialog")) {
+        webkit_web_frame_print_full (frame, operation,
+            GTK_PRINT_OPERATION_ACTION_PRINT, &error);
+    }
+    else {
+        webkit_web_frame_print_full (frame, operation,
+            GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error);
+    }
     g_object_unref (operation);
 
     if (error)
@@ -5770,6 +4920,7 @@ midori_view_execute_script (MidoriView*  view,
  * Returns: a newly allocated #GdkPixbuf
  *
  * Since: 0.2.1
+ * Deprecated: 0.5.4
  **/
 GdkPixbuf*
 midori_view_get_snapshot (MidoriView* view,
@@ -5778,76 +4929,7 @@ midori_view_get_snapshot (MidoriView* view,
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
-    GdkPixbuf* pixbuf;
-    #ifdef HAVE_WEBKIT2_A
-    webkit_web_view_get_snapshot (WEBKIT_WEB_VIEW (view->web_view),
-        WEBKIT_SNAPSHOT_REGION_VISIBLE, WEBKIT_SNAPSHOT_OPTIONS_NONE,
-        NULL, midori_view_get_snapshot_cb, view);
-    #else
-    GtkAllocation allocation;
-    gint x, y;
-    GdkRectangle rect;
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    gint w, h;
-    GdkWindow* window;
-    GdkPixmap* pixmap;
-    GdkEvent event;
-    gboolean result;
-    GdkColormap* colormap;
-    #else
-    cairo_surface_t* surface;
-    cairo_t* cr;
-    #endif
-
-    gtk_widget_get_allocation (view->web_view, &allocation);
-    x = allocation.x;
-    y = allocation.y;
-
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
-                                          allocation.width, allocation.height);
-    cr = cairo_create (surface);
-    cairo_rectangle (cr, x, y, width, height);
-    cairo_clip (cr);
-    gtk_widget_draw (view->web_view, cr);
-    pixbuf = gdk_pixbuf_get_from_surface (surface, x, y, width, height);
-    cairo_surface_destroy (surface);
-    cairo_destroy (cr);
-    #else
-    w = allocation.width;
-    h = allocation.height;
-    rect.x = x;
-    rect.y = y;
-    rect.width = w;
-    rect.height = h;
-
-    window = gtk_widget_get_window (view->web_view);
-    g_return_val_if_fail (window != NULL, NULL);
-
-    pixmap = gdk_pixmap_new (window, w, h, gdk_drawable_get_depth (window));
-    event.expose.type = GDK_EXPOSE;
-    event.expose.window = pixmap;
-    event.expose.send_event = FALSE;
-    event.expose.count = 0;
-    event.expose.area.x = 0;
-    event.expose.area.y = 0;
-    gdk_drawable_get_size (GDK_DRAWABLE (window),
-        &event.expose.area.width, &event.expose.area.height);
-    event.expose.region = gdk_region_rectangle (&event.expose.area);
-
-    g_signal_emit_by_name (view->web_view, "expose-event", &event, &result);
-
-    colormap = gdk_drawable_get_colormap (pixmap);
-    pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, colormap, 0, 0,
-                                           0, 0, rect.width, rect.height);
-    g_object_unref (pixmap);
-    #endif
-    #endif
-
-    GdkPixbuf* scaled = gdk_pixbuf_scale_simple (pixbuf, width, height,
-        GDK_INTERP_TILES);
-    g_object_unref (pixbuf);
-    return scaled;
+    return view->icon ? g_object_ref (view->icon) : NULL;
 }
 
 /**
@@ -5895,7 +4977,16 @@ midori_view_get_for_widget (GtkWidget* web_view)
     #endif
     return MIDORI_VIEW (view);
 }
-
+/**
+ * midori_view_set_colors:
+ * @view: a #MidoriView
+ * @fg_color: a #GdkColor, or %NULL
+ * @bg_color: a #GdkColor, or %NULL
+ *
+ * Sets colors on the label.
+ *
+ * Deprecated: 0.5.7: Use fg_color/ bg_color on Midori.Tab.
+ **/
 void
 midori_view_set_colors (MidoriView* view,
                         GdkColor*   fg_color,
@@ -5903,13 +4994,4 @@ midori_view_set_colors (MidoriView* view,
 {
     midori_tab_set_fg_color (MIDORI_TAB (view), fg_color);
     midori_tab_set_bg_color (MIDORI_TAB (view), bg_color);
-
-    GtkWidget* label = midori_view_get_proxy_tab_label (view);
-    gtk_event_box_set_visible_window (GTK_EVENT_BOX (label),
-        fg_color != NULL || bg_color != NULL);
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, fg_color);
-    gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, fg_color);
-    gtk_widget_modify_bg (label, GTK_STATE_NORMAL, bg_color);
-    gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, bg_color);
 }
-
index 2c90eb741abe5a5032f8087e30f9216b15a195d4..c885100b60a0b4846daafe314314f5bde0a71a9a 100644 (file)
 
 #include <katze/katze.h>
 
-#ifdef HAVE_GRANITE
-    #include <granite/granite.h>
-#endif
-
 G_BEGIN_DECLS
 
 typedef enum
@@ -68,6 +64,11 @@ GtkWidget*
 midori_view_new_with_item              (KatzeItem*         item,
                                         MidoriWebSettings* settings);
 
+GtkWidget*
+midori_view_new_from_view              (MidoriView*        view,
+                                        KatzeItem*         item,
+                                        MidoriWebSettings* settings);
+
 void
 midori_view_set_settings               (MidoriView*        view,
                                         MidoriWebSettings* settings);
@@ -128,15 +129,6 @@ midori_view_duplicate                  (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);
-#endif
-
 GtkWidget*
 midori_view_get_proxy_tab_label        (MidoriView*        view);
 
@@ -195,7 +187,8 @@ midori_view_can_view_source            (MidoriView*        view);
 gchar*
 midori_view_save_source                (MidoriView*        view,
                                         const gchar*       uri,
-                                        const gchar*       outfile);
+                                        const gchar*       outfile,
+                                        gboolean           use_dom);
 
 void
 midori_view_search_text                (MidoriView*        view,
@@ -249,6 +242,11 @@ midori_view_list_plugins               (MidoriView*        view,
                                         GString*           markup,
                                         gboolean           html);
 
+void
+midori_view_list_video_formats         (MidoriView*        view,
+                                        GString*           formats,
+                                        gboolean           html);
+
 void
 midori_view_set_colors                 (MidoriView*        view,
                                         GdkColor*          fg_color,
index f416c3e5ba1e1d9916cdd9fd923690980eca3fe4..39b06fb8894eb31153efce72ab48262150aacb92 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@ namespace Midori {
         }
 
         public override bool can_action (string action) {
-            return action == "about:views";
+            return action == "complete:more/views";
         }
 
         public override async List<Suggestion>? complete (string text, string? action, Cancellable cancellable) {
@@ -53,6 +53,11 @@ namespace Midori {
                     string? uri, title;
                     item.get ("uri", out uri);
                     item.get ("name", out title);
+
+                    /* Omit speed dial and blank pages */
+                    if (uri == "about:dial" || uri == "about:blank")
+                        continue;
+
                     if (uri == null) {
                         warning ("item.uri != null");
                         continue;
@@ -67,12 +72,12 @@ namespace Midori {
                     Gdk.Pixbuf? icon = Midori.Paths.get_icon (uri, null);
                     /* FIXME: Theming? Win32? */
                     string background = "gray";
-                    var suggestion = new Suggestion (uri, title + "\n" + uri, false, background, icon);
+                    var suggestion = new Suggestion (uri, title, true, background, icon, this.position);
                     suggestions.append (suggestion);
 
                     n++;
                     if (n == 3 && action == null) {
-                        suggestion = new Suggestion ("about:views", _("More open tabs…"), false, background);
+                        suggestion = new Suggestion ("complete:more/views", _("More open tabs…"), false, background);
                         suggestion.action = true;
                         suggestions.append (suggestion);
                         break;
index fb7d0d814b77c332861cf7286ede4f91d5de30e1..e420611ec931da10b2a9bdd253615658b589d936 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
  Copyright (C) 2011 Peter Hatina <phatina@redhat.com>
 
  This library is free software; you can redistribute it and/or
     #include <sys/sysctl.h>
 #endif
 
+#if defined (G_OS_WIN32)
+    #include <windows.h>
+#endif
+
 #ifdef HAVE_WEBKIT2
 #define WEB_SETTINGS_STRING(x) "WebKitSettings::"x""
 #else
@@ -60,13 +64,11 @@ struct _MidoriWebSettings
     gint clear_private_data;
     gchar* clear_data;
     gchar* site_data_rules;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    gboolean enable_dns_prefetching;
-    #endif
     gboolean enforce_font_family;
     gchar* user_stylesheet_uri;
     gchar* user_stylesheet_uri_cached;
     GHashTable* user_stylesheets;
+    gboolean print_without_dialog;
 };
 
 struct _MidoriWebSettingsClass
@@ -102,6 +104,7 @@ enum
     PROP_ENABLE_DNS_PREFETCHING,
     PROP_ENFORCE_FONT_FAMILY,
     PROP_USER_STYLESHEET_URI,
+    PROP_PRINT_WITHOUT_DIALOG,
 };
 
 GType
@@ -254,6 +257,13 @@ midori_web_settings_get_property (GObject*    object,
                                   GValue*     value,
                                   GParamSpec* pspec);
 
+/**
+ * midori_web_settings_low_memory_profile:
+ *
+ * Determines if the system has a relatively small amount of memory.
+ *
+ * Returns: %TRUE if there is relatively little memory available
+ **/
 static gboolean
 midori_web_settings_low_memory_profile ()
 {
@@ -376,7 +386,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      TRUE,
                                      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",
@@ -384,7 +393,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                                            "Whether the page cache should be used",
         !midori_web_settings_low_memory_profile (),
                                                            flags));
-    #endif
+
     if (g_object_class_find_property (gobject_class, "enable-fullscreen"))
     g_object_class_install_property (gobject_class,
                                      PROP_ENABLE_FULLSCREEN,
@@ -478,26 +487,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
         "Cookies, HTML5 databases, local storage and application cache blocking",
                                      NULL,
                                      flags));
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    /**
-     * MidoriWebSettings:enable-dns-prefetching:
-     *
-     * Whether to resolve host names in advance.
-     *
-     * Since: 0.3.4
-     */
-    g_object_class_install_property (gobject_class,
-                                     PROP_ENABLE_DNS_PREFETCHING,
-                                     g_param_spec_boolean (
-                                     "enable-dns-prefetching",
-        "Whether to resolve host names in advance",
-        "Whether host names on a website or in bookmarks should be prefetched",
-                                     TRUE,
-                                     flags));
-    #endif
 
     /**
-     * MidoriWebSettings:enforc-font-family:
+     * MidoriWebSettings:enforce-font-family:
      *
      * Whether to enforce user font preferences with an internal stylesheet.
      *
@@ -512,6 +504,16 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      FALSE,
                                      flags));
 
+    g_object_class_install_property (gobject_class,
+                                     PROP_PRINT_WITHOUT_DIALOG,
+                                     g_param_spec_boolean (
+                                     "print-without-dialog",
+                                     "Print without dialog",
+                                     "Print without showing a dialog box",
+                                     FALSE,
+                                     flags));
+
+
     g_object_class_install_property (gobject_class,
                                      PROP_USER_STYLESHEET_URI,
                                      g_param_spec_string (
@@ -567,13 +569,7 @@ midori_web_settings_init (MidoriWebSettings* web_settings)
     web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL;
     web_settings->user_stylesheets = NULL;
 
-    #if WEBKIT_CHECK_VERSION (1, 2, 6) && !WEBKIT_CHECK_VERSION (1, 2, 8)
-    /* Shadows are very slow with WebKitGTK+ 1.2.7 */
-    midori_web_settings_add_style (web_settings, "box-shadow-workaround",
-        "* { -webkit-box-shadow: none !important; }");
-    #endif
-
-    #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1) && !GTK_CHECK_VERSION (3, 0, 0)
+    #if defined (_WIN32) && !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 }"
@@ -617,15 +613,16 @@ midori_web_settings_finalize (GObject* object)
 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_skip_plugin:
+ * @path: the path to the plugin file
+ *
+ * Tests if a plugin is redundant. WebKit sometimes provides
+ * duplicate listings of plugins due to library deployment
+ * miscellanea.
  *
  * Returns: %TRUE if the passed plugin shouldn't be shown in UI listings.
  *
@@ -634,11 +631,42 @@ midori_web_settings_has_plugin_support (void)
 gboolean
 midori_web_settings_skip_plugin (const gchar* path)
 {
-    return !path || strstr (path, "npwrapper.") || strstr (path, "plugins-wrapped");
+    static GHashTable* plugins = NULL;
+    gchar* basename = NULL;
+    gchar* plugin_path = NULL;
+
+    if (!path)
+        return TRUE;
+
+    if (!plugins)
+        plugins = g_hash_table_new (g_str_hash,  g_str_equal);
+
+    basename = g_path_get_basename (path);
+
+    plugin_path = g_hash_table_lookup (plugins, basename);
+    if (g_strcmp0 (path, plugin_path) == 0)
+    {
+        return FALSE;
+    }
+
+    if (plugin_path != NULL)
+    {
+        g_free (basename);
+
+        return TRUE;
+    }
+
+    g_hash_table_insert (plugins, basename, g_strdup (path));
+
+    /* Note: do not free basename */
+
+    return FALSE;
 }
 
 /**
  * midori_web_settings_get_site_data_policy:
+ * @settings: the MidoriWebSettings instance
+ * @uri: the URI for which to make the policy decision
  *
  * Tests if @uri may store site data.
  *
@@ -718,11 +746,11 @@ get_sys_name (gchar** architecture)
 
 /**
  * midori_web_settings_get_system_name:
- * @architecture: location of a string, or %NULL
- * @platform: location of a string, or %NULL
+ * @architecture: (out) (allow-none): location of a string, or %NULL
+ * @platform: (out) (allow-none): location of a string, or %NULL
  *
  * Determines the system name, architecture and platform.
- * @architecturce can have a %NULL value.
+ * This function may write a %NULL value to @architecture.
  *
  * Returns: a string
  *
@@ -798,10 +826,8 @@ generate_ident_string (MidoriWebSettings* web_settings,
     const int webcore_minor = 32;
     #endif
 
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     g_object_set (web_settings, "enable-site-specific-quirks",
         identify_as != MIDORI_IDENT_GENUINE, NULL);
-    #endif
 
     switch (identify_as)
     {
@@ -872,11 +898,9 @@ sokoke_add_quality_value (const gchar *str,
 static gchar *
 sokoke_accept_languages (const gchar* const * lang_names)
 {
-    GArray *langs_garray = NULL;
+    GString* langs = NULL;
     char *cur_lang = NULL;
     char *prev_lang = NULL;
-    char **langs_array;
-    char *langs_str;
     float delta;
     int i, n_lang_names;
 
@@ -885,7 +909,7 @@ sokoke_accept_languages (const gchar* const * lang_names)
     delta = 0.999 / (n_lang_names - 1);
 
     /* Build the array of languages */
-    langs_garray = g_array_new (TRUE, FALSE, sizeof (char*));
+    langs = g_string_sized_new (n_lang_names);
     for (i = 0; lang_names[i] != NULL; i++)
     {
         cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]);
@@ -903,21 +927,17 @@ sokoke_accept_languages (const gchar* const * lang_names)
 
             /* 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);
+            if (langs->len > 0)
+                g_string_append_c (langs, ',');
+            g_string_append (langs, 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);
+    if (langs->len == 0)
+        g_string_append (langs, "en");
 
-    return langs_str;
+    return g_string_free (langs, FALSE);
 }
 
 
@@ -940,6 +960,13 @@ midori_web_settings_update_accept_language (MidoriWebSettings* settings)
         katze_assign (settings->accept, g_strdup (languages));
 }
 
+/**
+ * midori_web_settings_get_accept_language:
+ *
+ * Returns the value of the accept-language header to send to web servers
+ *
+ * Returns: the accept-language string
+ **/
 const gchar*
 midori_web_settings_get_accept_language (MidoriWebSettings* settings)
 {
@@ -1011,23 +1038,21 @@ midori_web_settings_set_property (GObject*      object,
     case PROP_ENABLE_PLUGINS:
         g_object_set (web_settings,
            WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value),
-        #if HAVE_WEBKIT2
+        #ifdef HAVE_WEBKIT2
             "enable-java", g_value_get_boolean (value),
-        #elif WEBKIT_CHECK_VERSION (1, 1, 22)
+        #else
             "enable-java-applet", g_value_get_boolean (value),
         #endif
             NULL);
         break;
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     case PROP_ENABLE_PAGE_CACHE:
         g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-page-cache"),
                       g_value_get_boolean (value), NULL);
         break;
-    #endif
 
     case PROP_PROXY_TYPE:
         web_settings->proxy_type = g_value_get_enum (value);
-    break;
+        break;
     case PROP_IDENTIFY_AS:
         web_settings->identify_as = g_value_get_enum (value);
         if (web_settings->identify_as != MIDORI_IDENT_CUSTOM)
@@ -1067,11 +1092,6 @@ midori_web_settings_set_property (GObject*      object,
     case PROP_SITE_DATA_RULES:
         katze_assign (web_settings->site_data_rules, g_value_dup_string (value));
         break;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    case PROP_ENABLE_DNS_PREFETCHING:
-        web_settings->enable_dns_prefetching = g_value_get_boolean (value);
-        break;
-    #endif
     case PROP_ENFORCE_FONT_FAMILY:
         if ((web_settings->enforce_font_family = g_value_get_boolean (value)))
         {
@@ -1079,9 +1099,9 @@ midori_web_settings_set_property (GObject*      object,
                                                           "default-font-family");
             gchar* monospace = katze_object_get_string (web_settings,
                                                         "monospace-font-family");
-            gchar* css = g_strdup_printf ("body * { font-family: %s !important; } \
-                code, code *, pre, pre *, blockquote, blockquote *, \
-                input, textarea { font-family: %s !important; }",
+            gchar* css = g_strdup_printf ("body * { font-family: %s !important; } "
+                "code, code *, pre, pre *, blockquote, blockquote *, "
+                "input, textarea { font-family: %s !important; }",
                                           font_family, monospace);
             midori_web_settings_add_style (web_settings, "enforce-font-family", css);
             g_free (font_family);
@@ -1116,6 +1136,9 @@ midori_web_settings_set_property (GObject*      object,
             midori_web_settings_process_stylesheets (web_settings, new_len - old_len);
         }
         break;
+    case PROP_PRINT_WITHOUT_DIALOG:
+        web_settings->print_without_dialog = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -1189,12 +1212,10 @@ midori_web_settings_get_property (GObject*    object,
         g_value_set_boolean (value, katze_object_get_boolean (web_settings,
                              WEB_SETTINGS_STRING ("enable-plugins")));
         break;
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     case PROP_ENABLE_PAGE_CACHE:
         g_value_set_boolean (value, katze_object_get_boolean (web_settings,
                              WEB_SETTINGS_STRING ("enable-page-cache")));
         break;
-    #endif
 
     case PROP_PROXY_TYPE:
         g_value_set_enum (value, web_settings->proxy_type);
@@ -1219,11 +1240,6 @@ midori_web_settings_get_property (GObject*    object,
     case PROP_SITE_DATA_RULES:
         g_value_set_string (value, web_settings->site_data_rules);
         break;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    case PROP_ENABLE_DNS_PREFETCHING:
-        g_value_set_boolean (value, web_settings->enable_dns_prefetching);
-        break;
-    #endif
     case PROP_ENFORCE_FONT_FAMILY:
         g_value_set_boolean (value, web_settings->enforce_font_family);
         break;
@@ -1239,6 +1255,9 @@ midori_web_settings_get_property (GObject*    object,
             WEB_SETTINGS_STRING ("user-stylesheet-uri")));
 #endif
         break;
+    case PROP_PRINT_WITHOUT_DIALOG:
+        g_value_set_boolean (value, web_settings->print_without_dialog);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -1250,9 +1269,10 @@ midori_web_settings_get_property (GObject*    object,
  *
  * Creates a new #MidoriWebSettings instance with default values.
  *
- * You will typically want to assign this to a #MidoriWebView or #MidoriBrowser.
+ * You will typically want to assign this to a #MidoriWebView
+ * or #MidoriBrowser.
  *
- * Return value: a new #MidoriWebSettings
+ * Return value: (transfer full): a new #MidoriWebSettings
  **/
 MidoriWebSettings*
 midori_web_settings_new (void)
@@ -1318,6 +1338,7 @@ base64_space_pad (gchar* base64,
 
 /**
  * midori_web_settings_add_style:
+ * @settings: the MidoriWebSettings instance to modify
  * @rule_id: a static string identifier
  * @style: a CSS stylesheet
  *
@@ -1352,6 +1373,7 @@ midori_web_settings_add_style (MidoriWebSettings* settings,
 
 /**
  * midori_web_settings_remove_style:
+ * @settings: the MidoriWebSettings instance to modify
  * @rule_id: the string identifier used previously
  *
  * Removes a stylesheet from midori settings.
@@ -1378,6 +1400,21 @@ midori_web_settings_remove_style (MidoriWebSettings* settings,
     }
 }
 
+/**
+ * midori_settings_new_full:
+ * @extensions: (out) (allow-none): a pointer into which
+ * to write an array of names of extensions which preferences
+ * indicate should be activated, or %NULL.
+ *
+ * Creates a new #MidoriWebSettings instance, loading
+ * configuration from disk according to preferences and
+ * invocation mode.
+ *
+ * You will typically want to assign this to a #MidoriWebView
+ * or #MidoriBrowser.
+ *
+ * Return value: (transfer full): a new #MidoriWebSettings
+ **/
 MidoriWebSettings*
 midori_settings_new_full (gchar*** extensions)
 {
@@ -1442,7 +1479,7 @@ midori_settings_new_full (gchar*** extensions)
             integer = g_key_file_get_integer (key_file, "settings", property, NULL);
             g_object_set (settings, property, integer, NULL);
         }
-        else if (type == G_TYPE_PARAM_FLOAT)
+        else if (type == G_TYPE_PARAM_FLOAT || type == G_TYPE_PARAM_DOUBLE)
         {
             number = g_key_file_get_double (key_file, "settings", property, NULL);
             g_object_set (settings, property, number, NULL);
@@ -1485,6 +1522,20 @@ midori_settings_new_full (gchar*** extensions)
     return settings;
 }
 
+/**
+ * midori_settings_save_to_file:
+ * @settings: a MidoriWebSettings instance to save
+ * @app: (type Midori.Application) (allow-none): a MidoriApplication instance
+ * @filename: the filename into which to save settings
+ * @error: (out) (allow-none): return location for a GError, or %NULL
+ *
+ * Saves a #MidoriWebSettings instance to disk at the path given by @filename.
+ *
+ * Also saves the list of activated extensions from @app.
+ *
+ * Return value: %TRUE if no error occurred; %FALSE if an error 
+ * occurred, in which case @error will contain detailed information
+ **/
 gboolean
 midori_settings_save_to_file (MidoriWebSettings* settings,
                               GObject*           app,
@@ -1499,9 +1550,6 @@ midori_settings_save_to_file (MidoriWebSettings* settings,
     GType type;
     const gchar* property;
     gboolean saved;
-    KatzeArray* extensions = katze_object_get_object (app, "extensions");
-    MidoriExtension* extension;
-    gchar** _extensions;
 
     key_file = g_key_file_new ();
     class = G_OBJECT_GET_CLASS (settings);
@@ -1546,11 +1594,18 @@ midori_settings_save_to_file (MidoriWebSettings* settings,
         }
         else if (type == G_TYPE_PARAM_UINT)
         {
-            gint integer;
+            guint integer;
             g_object_get (settings, property, &integer, NULL);
             if (integer != G_PARAM_SPEC_UINT (pspec)->default_value)
                 g_key_file_set_integer (key_file, "settings", property, integer);
         }
+        else if (type == G_TYPE_PARAM_DOUBLE)
+        {
+            gdouble number;
+            g_object_get (settings, property, &number, NULL);
+            if (number != G_PARAM_SPEC_DOUBLE (pspec)->default_value)
+                g_key_file_set_double (key_file, "settings", property, number);
+        }
         else if (type == G_TYPE_PARAM_FLOAT)
         {
             gfloat number;
@@ -1582,32 +1637,38 @@ midori_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")))
-    {
-        i = 0;
-        while (_extensions[i])
-            g_key_file_set_boolean (key_file, "extensions", _extensions[i++], TRUE);
-    }
-    else if (extensions)
+    if (app != NULL)
     {
-        KATZE_ARRAY_FOREACH_ITEM (extension, extensions)
-            if (midori_extension_is_active (extension))
-            {
-                const gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
-                g_return_val_if_fail (filename != NULL, FALSE);
-                if (filename && strchr (filename, '/'))
-                    g_warning ("%s: %s unexpected /", G_STRFUNC, filename);
-                gchar* key = katze_object_get_string (extension, "key");
-                gchar* subname = key ? g_strdup_printf ("%s/%s", filename, key) : g_strdup (filename);
-                g_key_file_set_boolean (key_file, "extensions", subname, TRUE);
-                g_free (key);
-                g_free (subname);
-            }
-        g_object_unref (extensions);
+        /* Take frozen list of active extensions until preferences reset it */
+        gchar** _extensions;
+        KatzeArray* extensions;
+        if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions")))
+        {
+            i = 0;
+            while (_extensions[i])
+                g_key_file_set_boolean (key_file, "extensions", _extensions[i++], TRUE);
+        }
+        else if ((extensions = katze_object_get_object (app, "extensions")))
+        {
+            MidoriExtension* extension;
+            KATZE_ARRAY_FOREACH_ITEM (extension, extensions)
+                if (midori_extension_is_active (extension))
+                {
+                    const gchar* extension_filename = g_object_get_data (G_OBJECT (extension), "filename");
+                    g_return_val_if_fail (extension_filename != NULL, FALSE);
+                    if (extension_filename && strchr (extension_filename, '/'))
+                        g_warning ("%s: %s unexpected /", G_STRFUNC, extension_filename);
+                    gchar* key = katze_object_get_string (extension, "key");
+                    gchar* subname = key ? g_strdup_printf ("%s/%s", extension_filename, key) : g_strdup (extension_filename);
+                    g_key_file_set_boolean (key_file, "extensions", subname, TRUE);
+                    g_free (key);
+                    g_free (subname);
+                }
+            g_object_unref (extensions);
+        }
     }
+
     saved = sokoke_key_file_save_to_file (key_file, filename, error);
     g_key_file_free (key_file);
     return saved;
 }
-
index cdc726452fe587e116c439dec5ca1315aa4ce302..a56bd613d4963aff53b6ac6df84a781931b5ff97 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
index ba2e0686fa1ee9f13bb4325c62f93e75c656bbf6..51403c6f501624bb05e6a5683802e572dd906c12 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "midori-app.h"
 #include "midori-array.h"
-#include "midori-bookmarks.h"
+#include "midori-bookmarks-db.h"
 #include "midori-browser.h"
 #include "midori-extension.h"
 #include "midori-frontend.h"
index 292412d61f872d6a51f62965cc5cd7fce29d4253..741777966541f6b299a72da008e5cd88eb369d99 100644 (file)
@@ -6,28 +6,34 @@ public const string PACKAGE_NAME;
 [CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]
 namespace Midori {
     public const string VERSION_SUFFIX;
+    [CCode (cheader_filename = "midori/midori-stock.h")]
     namespace Stock {
         public const string WEB_BROWSER;
         public const string TRANSFER;
         public const string PLUGINS;
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
-    public static unowned Midori.Browser web_app_new (string? config,
-        string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
+    [CCode (cheader_filename = "midori/midori-frontend.h")]
+    public static unowned Midori.Browser web_app_new (
+        string webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static unowned Midori.Browser private_app_new (string? config,
         string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static unowned App normal_app_new (string? config, string nickname, bool diagnostic,
-        string? webapp, [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
+        [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static void normal_app_on_quit (App app);
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-array.h")]
+    public static bool array_from_file (Katze.Array array, string filename, string format) throws GLib.Error;
+
+    [CCode (cheader_filename = "midori/midori-app.h")]
     public class App : GLib.Object {
         public App (string? name=null);
         public static void setup ([CCode (array_length_pos = 0.9)] ref unowned string[] args, [CCode (array_length = false)] GLib.OptionEntry[]? entries);
         public static void set_instance_is_running (bool is_running);
         public Browser create_browser ();
         public GLib.List<weak Browser> get_browsers ();
+        public void send_notification (string title, string message);
+        public bool send_command ([CCode (array_length = false)] string[] command);
 
         [NoAccessorMethod]
         public string name { get; set; }
@@ -46,16 +52,16 @@ namespace Midori {
         [NoAccessorMethod]
         public Katze.Array browsers { get; }
         public Browser? browser { get; }
+        public bool crashed { get; }
 
         [HasEmitter]
         public signal void add_browser (Browser browser);
         public signal void remove_browser (Browser browser);
         [HasEmitter]
         public signal void quit ();
-        public void send_notification (string title, string message);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-browser.h")]
     public class Browser : Gtk.Window {
         public Browser ();
         public unowned Gtk.Widget add_item (Katze.Item item);
@@ -113,15 +119,16 @@ namespace Midori {
         public signal void quit ();
         public signal void send_notification (string title, string message);
         public static void update_history (Katze.Item item, string type, string event);
+        public signal void show_preferences (Katze.Preferences preferences);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-panel.h")]
     public class Panel : Gtk.HBox {
         public Panel ();
         public int append_page (Midori.Viewable viewable);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-extension.h")]
     public class Extension : GLib.Object {
         [CCode (has_construct_function = false)]
         public Extension ();
@@ -130,6 +137,7 @@ namespace Midori {
         public void install_boolean (string name, bool default_value);
         public void install_integer (string name, int default_value);
         public void install_string (string name, string default_value);
+        public void install_string_list (string name, string[]? default_value);
 
         public bool get_boolean (string name);
         public int get_integer (string name);
@@ -138,6 +146,7 @@ namespace Midori {
         public void set_boolean (string name, bool value);
         public void set_integer (string name, int value);
         public void set_string (string name, string value);
+        public unowned string get_config_dir ();
 
         [NoAccessorMethod]
         public string? stock_id { get; set; }
@@ -165,7 +174,7 @@ namespace Midori {
         public static void load_from_folder (Midori.App app, [CCode (array_length = false)] string[]? keys, bool activate);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-view.h")]
     public class View : Tab {
         [CCode (type = "GtkWidget*")]
         public View.with_title (string? title=null, WebSettings? settings=null
@@ -177,7 +186,7 @@ namespace Midori {
         public unowned string get_icon_uri ();
         public unowned string get_link_uri ();
         public bool has_selection ();
-        public string get_selected_text ();
+        public unowned string get_selected_text ();
         public Gtk.MenuItem get_proxy_menu_item ();
         public Gtk.Widget duplicate ();
         public Gtk.Menu get_tab_menu ();
@@ -189,10 +198,15 @@ namespace Midori {
         public Gdk.Pixbuf get_snapshot (int width, int height);
         public void populate_popup (Gtk.Menu menu, bool manual);
         public void reload (bool from_cache);
+        public Gtk.Widget add_info_bar (Gtk.MessageType type, string message, GLib.Callback? callback, void* object, ...);
+        public ContextAction get_page_context_action (WebKit.HitTestResult hit_test_result);
+
+        public void list_plugins (GLib.StringBuilder ns_plugins, bool html);
+        public void list_video_formats (GLib.StringBuilder formats, bool html);
+        public static void list_versions (GLib.StringBuilder markup, bool html);
 
         public string title { get; }
         public Gdk.Pixbuf icon { get; }
-        public bool minimized { get; }
         public float zoom_level { get; }
         public Katze.Array news_feeds { get; }
         [NoAccessorMethod]
@@ -201,18 +215,29 @@ namespace Midori {
 
         [HasEmitter]
         public signal bool download_requested (WebKit.Download download);
-
+        public signal bool about_content (string uri);
+        public signal void new_view (Midori.View new_view, Midori.NewView where, bool user_initiated);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-locationaction.h")]
     public class LocationAction : Gtk.Action {
         public static string render_uri ([CCode (array_length = false)] string[] keys, string uri_escaped);
         public static string render_title ([CCode (array_length = false)] string[] keys, string title);
+
+        public double progress { get; set; }
+        public string secondary_icon { get; set; }
+
+        public unowned string get_text ();
+        public void set_text (string text);
+
+        public signal void submit_uri (string uri, bool new_tab);
+        public signal bool key_press_event (Gdk.EventKey event);
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-searchaction.h")]
     public class SearchAction : Gtk.Action {
         public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize);
+        public static string token_for_uri (string uri);
     }
 
     [CCode (cheader_filename = "midori/midori-view.h", cprefix = "MIDORI_DOWNLOAD_")]
@@ -231,13 +256,14 @@ namespace Midori {
         PENDING_UNDELAY,
     }
 
-    [CCode (cheader_filename = "midori/midori.h")]
+    [CCode (cheader_filename = "midori/midori-websettings.h")]
     public class WebSettings : Midori.Settings {
         public WebSettings ();
         [NoAccessorMethod]
         public MidoriStartup load_on_startup { get; set; }
         public static bool has_plugin_support ();
         public static bool skip_plugin (string path);
+        public static unowned string get_system_name (out unowned string? architecture, out unowned string? platform);
     }
 
     [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")]
@@ -250,7 +276,20 @@ namespace Midori {
 
     [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
     namespace Sokoke {
+        public static string magic_uri (string uri, bool allow_search, bool allow_relative);
         public static uint gtk_action_count_modifiers (Gtk.Action action);
+    #if HAVE_WIN32
+        public static string get_win32_desktop_lnk_path_for_filename (string filename);
+        public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
+    #endif
+    }
+
+    #if HAVE_EXECINFO_H
+    [CCode (lower_case_cprefix = "")]
+    namespace Linux {
+        [CCode (cheader_filename = "execinfo.h", array_length = false)]
+        public unowned string[] backtrace_symbols (void* buffer, int size);
     }
+    #endif
 }
 
diff --git a/midori/socket.c b/midori/socket.c
deleted file mode 100644 (file)
index cd4c1bf..0000000
+++ /dev/null
@@ -1,1542 +0,0 @@
-/*
- Copyright 1999-2008 Hiroyuki Yamamoto
- Copyright 2006-2009 Enrico Tröger <enrico.troeger@uvena.de>
-
- 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.
-*/
-
-/*
- This file is based on socket.c in libSylph.
- socket_init(), remove_socket_link_full() and send_open_command() were
- relicensed and taken from Geany and adjusted to be more generic.
-*/
-
-#if HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#if !HAVE_UNIQUE
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#ifdef G_OS_WIN32
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#else
-#  if HAVE_SYS_WAIT_H
-#    include <sys/wait.h>
-#  endif
-#  include <sys/socket.h>
-#  include <sys/un.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif /* G_OS_WIN32 */
-#if HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
-#include <setjmp.h>
-#if HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif
-
-#include "socket.h"
-
-#define BUFFSIZE       8192
-
-#ifdef G_OS_WIN32
-#define SockDesc               SOCKET
-#define SOCKET_IS_VALID(s)     ((s) != INVALID_SOCKET)
-#else
-#define SockDesc               gint
-#define SOCKET_IS_VALID(s)     ((s) >= 0)
-#define INVALID_SOCKET         (-1)
-#endif
-
-typedef gint (*SockAddrFunc)   (GList          *addr_list,
-                                gpointer        data);
-
-typedef struct _SockConnectData        SockConnectData;
-typedef struct _SockLookupData SockLookupData;
-typedef struct _SockAddrData   SockAddrData;
-typedef struct _SockSource     SockSource;
-
-struct _SockConnectData {
-       gint id;
-       gchar *hostname;
-       gushort port;
-       GList *addr_list;
-       GList *cur_addr;
-       SockLookupData *lookup_data;
-       GIOChannel *channel;
-       guint io_tag;
-       SockConnectFunc func;
-       gpointer data;
-};
-
-struct _SockLookupData {
-       gchar *hostname;
-       pid_t child_pid;
-       GIOChannel *channel;
-       guint io_tag;
-       SockAddrFunc func;
-       gpointer data;
-};
-
-struct _SockAddrData {
-       gint family;
-       gint socktype;
-       gint protocol;
-       gint addr_len;
-       struct sockaddr *addr;
-};
-
-struct _SockSource {
-       GSource parent;
-       SockInfo *sock;
-};
-
-static guint io_timeout = 60;
-
-static GList *sock_list = NULL;
-
-#ifdef G_OS_UNIX
-static GList *sock_connect_data_list = NULL;
-
-static gchar *socket_filename = NULL;
-#endif
-
-static gboolean sock_prepare           (GSource        *source,
-                                        gint           *timeout);
-static gboolean sock_check             (GSource        *source);
-static gboolean sock_dispatch          (GSource        *source,
-                                        GSourceFunc     callback,
-                                        gpointer        user_data);
-
-GSourceFuncs sock_watch_funcs = {
-       sock_prepare,
-       sock_check,
-       sock_dispatch,
-       NULL
-};
-
-gint fd_recv                           (gint            fd,
-                                        gchar          *buf,
-                                        gint            len,
-                                        gint            flags);
-
-#ifdef G_OS_WIN32
-static SockInfo *sock_find_from_fd     (gint   fd);
-#endif
-
-static gint sock_connect_with_timeout  (gint                    sock,
-                                        const struct sockaddr  *serv_addr,
-                                        gint                    addrlen,
-                                        guint                   timeout_secs);
-
-#ifndef INET6
-static gint sock_connect_by_hostname   (gint            sock,
-                                        const gchar    *hostname,
-                                        gushort         port);
-#else
-static SockDesc sock_connect_by_getaddrinfo    (const gchar    *hostname,
-                                                gushort         port);
-#endif
-
-#ifdef G_OS_UNIX
-static void sock_address_list_free             (GList          *addr_list);
-
-static gboolean sock_connect_async_cb          (GIOChannel     *source,
-                                                GIOCondition    condition,
-                                                gpointer        data);
-static gint sock_connect_async_get_address_info_cb
-                                               (GList          *addr_list,
-                                                gpointer        data);
-
-static gint sock_connect_address_list_async    (SockConnectData *conn_data);
-
-static gboolean sock_get_address_info_async_cb (GIOChannel     *source,
-                                                GIOCondition    condition,
-                                                gpointer        data);
-static SockLookupData *sock_get_address_info_async
-                                               (const gchar    *hostname,
-                                                gushort         port,
-                                                SockAddrFunc    func,
-                                                gpointer        data);
-static gint sock_get_address_info_async_cancel (SockLookupData *lookup_data);
-#endif /* G_OS_UNIX */
-
-void send_open_command(gint sock, const gchar* command, gchar **args)
-{
-       gsize i;
-
-       g_return_if_fail(sock > -1);
-       g_return_if_fail(command != NULL);
-
-       fd_write_all(sock, command, strlen(command));
-       fd_write_all(sock, "\n", 1);
-
-       if(!args)
-               return;
-
-       for (i = 0; args[i] != NULL; i++)
-       {
-               fd_write_all(sock, args[i], strlen(args[i]));
-                fd_write_all(sock, "\n", 1);
-       }
-       fd_write_all(sock, ".\n", 2);
-}
-
-#ifndef G_OS_WIN32
-static void remove_socket_link_full(void)
-{
-       gchar real_path[512];
-       gsize len;
-
-       real_path[0] = '\0';
-
-       /* read the contents of the symbolic link socket_info.file_name and delete it
-        * readlink should return something like "/tmp/appname_socket.499602d2" */
-       len = readlink(socket_filename, real_path, sizeof(real_path) - 1);
-       if ((gint) len > 0)
-       {
-               real_path[len] = '\0';
-               g_unlink(real_path);
-       }
-       g_unlink(socket_filename);
-}
-#endif
-
-/* (Unix domain) socket support to replace the old FIFO code
- * Returns created socket, -1 if an error occurred */
-gint socket_init(const gchar *instance_name, const gchar *config_dir, gboolean *exists)
-{
-       gint sock;
-#ifdef G_OS_WIN32
-       HANDLE hmutex;
-       WSADATA wsadata;
-       gint result;
-
-       *exists = FALSE;
-       result = WSAStartup(MAKEWORD(2, 2), &wsadata);
-       if (result != NO_ERROR) {
-               g_warning("WSAStartup() failed\n");
-               return -1;
-       }
-
-       hmutex = CreateMutexA(NULL, FALSE, instance_name);
-       if (! hmutex)
-       {
-               g_debug ("cannot create Mutex\n");
-               return -1;
-       }
-       if (GetLastError() != ERROR_ALREADY_EXISTS)
-       {
-               /* To support multiple instances with different configuration directories (as we do on
-                * non-Windows systems) we would need to use different port number s but it might be
-                * difficult to get a port number which is unique for a configuration directory (path)
-                * and which is unused. This port number has to be guessed by the first and new instance
-                * and the only data is the configuration directory path.
-                * For now we use one port number, that is we support only one instance at all. */
-               sock = fd_open_inet(49876);
-               if (sock < 0)
-                       return 0;
-               return sock;
-       }
-
-       sock = fd_connect_inet(49876);
-       if (sock < 0)
-               return -1;
-#else
-       *exists = FALSE;
-       if (socket_filename == NULL)
-               socket_filename = g_strdup_printf("%s%c%s_socket_%s_%s",
-                       config_dir, G_DIR_SEPARATOR, PACKAGE_NAME, g_get_host_name(), instance_name);
-
-       sock = fd_connect_unix(socket_filename);
-       if (sock < 0)
-       {
-               remove_socket_link_full(); /* deletes the socket file and the symlink */
-               return fd_open_unix(socket_filename);
-       }
-#endif
-       *exists = TRUE;
-       return sock;
-}
-
-gint sock_cleanup(void)
-{
-#ifdef G_OS_WIN32
-       WSACleanup();
-#else
-       if (socket_filename != NULL)
-       {
-               remove_socket_link_full(); /* deletes the socket file and the symlink */
-               g_free(socket_filename);
-       }
-#endif
-       return 0;
-}
-
-gint sock_set_io_timeout(guint sec)
-{
-       io_timeout = sec;
-       return 0;
-}
-
-gint fd_connect_inet(gushort port)
-{
-       SockDesc sock;
-       struct sockaddr_in addr;
-
-       sock = socket(AF_INET, SOCK_STREAM, 0);
-       if (!SOCKET_IS_VALID(sock)) {
-#ifdef G_OS_WIN32
-               g_warning("fd_connect_inet(): socket() failed: %d\n",
-                         WSAGetLastError());
-#else
-               perror("fd_connect_inet(): socket");
-#endif
-               return -1;
-       }
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(port);
-       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-       if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-               fd_close(sock);
-               return -1;
-       }
-
-       return sock;
-}
-
-gint fd_open_inet(gushort port)
-{
-       SockDesc sock;
-       struct sockaddr_in addr;
-       gint val;
-
-       sock = socket(AF_INET, SOCK_STREAM, 0);
-       if (!SOCKET_IS_VALID(sock)) {
-#ifdef G_OS_WIN32
-               g_warning("fd_open_inet(): socket() failed: %d\n",
-                         WSAGetLastError());
-#else
-               perror("fd_open_inet(): socket");
-#endif
-               return -1;
-       }
-
-       val = 1;
-       if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) {
-               perror("setsockopt");
-               fd_close(sock);
-               return -1;
-       }
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(port);
-       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-       if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-               perror("bind");
-               fd_close(sock);
-               return -1;
-       }
-
-       if (listen(sock, 1) < 0) {
-               perror("listen");
-               fd_close(sock);
-               return -1;
-       }
-
-       return sock;
-}
-
-gint fd_connect_unix(const gchar *path)
-{
-#ifdef G_OS_UNIX
-       gint sock;
-       struct sockaddr_un addr;
-
-       sock = socket(PF_UNIX, SOCK_STREAM, 0);
-       if (sock < 0) {
-               perror("fd_connect_unix(): socket");
-               return -1;
-       }
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
-
-       if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-               fd_close(sock);
-               return -1;
-       }
-
-       return sock;
-#else
-       return -1;
-#endif
-}
-
-gint fd_open_unix(const gchar *path)
-{
-#ifdef G_OS_UNIX
-       gint sock;
-       struct sockaddr_un addr;
-       gint val;
-
-       sock = socket(PF_UNIX, SOCK_STREAM, 0);
-
-       if (sock < 0) {
-               perror("sock_open_unix(): socket");
-               return -1;
-       }
-
-       val = 1;
-       if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) {
-               perror("setsockopt");
-               fd_close(sock);
-               return -1;
-       }
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sun_family = AF_UNIX;
-       strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
-
-       if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-               perror("bind");
-               fd_close(sock);
-               return -1;
-       }
-
-       if (listen(sock, 1) < 0) {
-               perror("listen");
-               fd_close(sock);
-               return -1;
-       }
-
-       return sock;
-#else
-       return -1;
-#endif
-}
-
-gint fd_accept(gint sock)
-{
-       struct sockaddr_in caddr;
-       guint caddr_len;
-
-       caddr_len = sizeof(caddr);
-       return accept(sock, (struct sockaddr *)&caddr, &caddr_len);
-}
-
-#ifdef G_OS_WIN32
-static SockInfo *sock_find_from_fd(gint fd)
-{
-       GList *cur;
-
-       for (cur = sock_list; cur != NULL; cur = cur->next) {
-               if (((SockInfo *)cur->data)->sock == fd)
-                       return (SockInfo *)cur->data;
-       }
-
-       return NULL;
-}
-#endif
-
-static gint set_nonblocking_mode(gint fd, gboolean nonblock)
-{
-#ifdef G_OS_WIN32
-       gulong val = nonblock ? 1 : 0;
-       SockInfo *sock;
-
-       if (!nonblock)
-               WSAEventSelect(fd, NULL, 0);
-       if (ioctlsocket(fd, FIONBIO, &val) == SOCKET_ERROR) {
-               g_warning("set_nonblocking_mode(): ioctlsocket() failed: %d\n",
-                         WSAGetLastError());
-               return -1;
-       }
-
-       sock = sock_find_from_fd(fd);
-       if (sock)
-               sock->nonblock = nonblock;
-       g_debug ("set nonblocking mode to %d\n", nonblock);
-
-       return 0;
-#else
-       gint flags;
-
-       flags = fcntl(fd, F_GETFL, 0);
-       if (flags < 0) {
-               perror("fcntl");
-               return -1;
-       }
-
-       if (nonblock)
-               flags |= O_NONBLOCK;
-       else
-               flags &= ~O_NONBLOCK;
-
-       return fcntl(fd, F_SETFL, flags);
-#endif
-}
-
-gint sock_set_nonblocking_mode(SockInfo *sock, gboolean nonblock)
-{
-       gint ret;
-
-       g_return_val_if_fail(sock != NULL, -1);
-
-       ret = set_nonblocking_mode(sock->sock, nonblock);
-       if (ret == 0)
-               sock->nonblock = nonblock;
-
-       return ret;
-}
-
-static gboolean is_nonblocking_mode(gint fd)
-{
-#ifdef G_OS_WIN32
-       SockInfo *sock;
-
-       sock = sock_find_from_fd(fd);
-       if (sock)
-               return sock->nonblock;
-
-       return FALSE;
-#else
-       gint flags;
-
-       flags = fcntl(fd, F_GETFL, 0);
-       if (flags < 0) {
-               perror("fcntl");
-               return FALSE;
-       }
-
-       return ((flags & O_NONBLOCK) != 0);
-#endif
-}
-
-gboolean sock_is_nonblocking_mode(SockInfo *sock)
-{
-       g_return_val_if_fail(sock != NULL, FALSE);
-
-#ifdef G_OS_WIN32
-       return sock->nonblock;
-#else
-       return is_nonblocking_mode(sock->sock);
-#endif
-}
-
-gboolean sock_has_read_data(SockInfo *sock)
-{
-#ifdef G_OS_WIN32
-       gulong val;
-
-       if (ioctlsocket(sock->sock, FIONREAD, &val) < 0) {
-               g_warning("sock_has_read_data(): ioctlsocket() failed: %d\n",
-                         WSAGetLastError());
-               return TRUE;
-       }
-
-       if (val == 0)
-               return FALSE;
-       else
-               return TRUE;
-#else
-       return TRUE;
-#endif
-}
-
-
-static gboolean sock_prepare(GSource *source, gint *timeout)
-{
-       *timeout = 1;
-       return FALSE;
-}
-
-static gboolean sock_check(GSource *source)
-{
-       SockInfo *sock = ((SockSource *)source)->sock;
-       struct timeval timeout = {0, 0};
-       fd_set fds;
-       GIOCondition condition = sock->condition;
-
-       FD_ZERO(&fds);
-       FD_SET(sock->sock, &fds);
-
-       select(sock->sock + 1,
-              (condition & G_IO_IN)  ? &fds : NULL,
-              (condition & G_IO_OUT) ? &fds : NULL,
-              NULL, &timeout);
-
-       return FD_ISSET(sock->sock, &fds) != 0;
-}
-
-static gboolean sock_dispatch(GSource *source, GSourceFunc callback,
-                             gpointer user_data)
-{
-       SockInfo *sock = ((SockSource *)source)->sock;
-
-       return sock->callback(sock, sock->condition, sock->data);
-}
-
-static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition,
-                             gpointer data)
-{
-       SockInfo *sock = (SockInfo *)data;
-
-       if ((condition & sock->condition) == 0)
-               return TRUE;
-
-       return sock->callback(sock, sock->condition, sock->data);
-}
-
-guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
-                    gpointer data)
-{
-       sock->callback = func;
-       sock->condition = condition;
-       sock->data = data;
-       return g_io_add_watch(sock->sock_ch, condition, sock_watch_cb, sock);
-}
-
-static gint fd_check_io(gint fd, GIOCondition cond)
-{
-       struct timeval timeout;
-       fd_set fds;
-
-       if (is_nonblocking_mode(fd))
-               return 0;
-
-       timeout.tv_sec  = io_timeout;
-       timeout.tv_usec = 0;
-
-       FD_ZERO(&fds);
-       FD_SET(fd, &fds);
-
-       if (cond == G_IO_IN) {
-               select(fd + 1, &fds, NULL, NULL,
-                      io_timeout > 0 ? &timeout : NULL);
-       } else {
-               select(fd + 1, NULL, &fds, NULL,
-                      io_timeout > 0 ? &timeout : NULL);
-       }
-
-       if (FD_ISSET(fd, &fds)) {
-               return 0;
-       } else {
-               g_warning("Socket IO timeout\n");
-               return -1;
-       }
-}
-
-#ifdef G_OS_UNIX
-static sigjmp_buf jmpenv;
-
-static void G_GNUC_NORETURN timeout_handler(gint sig)
-{
-       siglongjmp(jmpenv, 1);
-}
-#endif
-
-static gint sock_connect_with_timeout(gint sock,
-                                     const struct sockaddr *serv_addr,
-                                     gint addrlen,
-                                     guint timeout_secs)
-{
-       gint ret;
-#ifdef G_OS_UNIX
-       void (*prev_handler)(gint);
-
-       alarm(0);
-       prev_handler = signal(SIGALRM, timeout_handler);
-       if (sigsetjmp(jmpenv, 1)) {
-               alarm(0);
-               signal(SIGALRM, prev_handler);
-               errno = ETIMEDOUT;
-               return -1;
-       }
-       alarm(timeout_secs);
-#endif
-
-       ret = connect(sock, serv_addr, addrlen);
-
-#ifdef G_OS_UNIX
-       alarm(0);
-       signal(SIGALRM, prev_handler);
-#endif
-
-       return ret;
-}
-
-struct hostent *my_gethostbyname(const gchar *hostname)
-{
-       struct hostent *hp;
-#ifdef G_OS_UNIX
-       void (*prev_handler)(gint);
-
-       alarm(0);
-       prev_handler = signal(SIGALRM, timeout_handler);
-       if (sigsetjmp(jmpenv, 1)) {
-               alarm(0);
-               signal(SIGALRM, prev_handler);
-               fprintf(stderr, "%s: host lookup timed out.\n", hostname);
-               errno = 0;
-               return NULL;
-       }
-       alarm(io_timeout);
-#endif
-
-       if ((hp = gethostbyname(hostname)) == NULL) {
-#ifdef G_OS_UNIX
-               alarm(0);
-               signal(SIGALRM, prev_handler);
-#endif
-               fprintf(stderr, "%s: unknown host.\n", hostname);
-               errno = 0;
-               return NULL;
-       }
-
-#ifdef G_OS_UNIX
-       alarm(0);
-       signal(SIGALRM, prev_handler);
-#endif
-
-       return hp;
-}
-
-#ifndef INET6
-static gint my_inet_aton(const gchar *hostname, struct in_addr *inp)
-{
-#ifdef HAVE_INET_ATON
-       return inet_aton(hostname, inp);
-#else
-#ifdef HAVE_INET_ADDR
-       guint32 inaddr;
-
-       inaddr = inet_addr(hostname);
-       if (inaddr != -1) {
-               memcpy(inp, &inaddr, sizeof(inaddr));
-               return 1;
-       } else
-               return 0;
-#else
-       return 0;
-#endif
-#endif /* HAVE_INET_ATON */
-}
-
-static gint sock_connect_by_hostname(gint sock, const gchar *hostname,
-                                    gushort port)
-{
-       struct hostent *hp;
-       struct sockaddr_in ad;
-
-       memset(&ad, 0, sizeof(ad));
-       ad.sin_family = AF_INET;
-       ad.sin_port = htons(port);
-
-       if (!my_inet_aton(hostname, &ad.sin_addr)) {
-               if ((hp = my_gethostbyname(hostname)) == NULL) {
-                       fprintf(stderr, "%s: unknown host.\n", hostname);
-                       errno = 0;
-                       return -1;
-               }
-
-               if (hp->h_length != 4 && hp->h_length != 8) {
-                       fprintf(stderr, "illegal address length received for host %s\n", hostname);
-                       errno = 0;
-                       return -1;
-               }
-
-               memcpy(&ad.sin_addr, hp->h_addr, hp->h_length);
-       }
-
-       return sock_connect_with_timeout(sock, (struct sockaddr *)&ad,
-                                        sizeof(ad), io_timeout);
-}
-
-#else /* INET6 */
-
-#ifdef G_OS_WIN32
-/* MinGW defines gai_strerror() in ws2tcpip.h, but it is not implemented. */
-#undef gai_strerror
-const gchar *gai_strerror(gint errcode)
-{
-       static gchar str[32];
-
-       g_snprintf(str, sizeof(str), "gai errcode: (%d)", errcode);
-       return str;
-}
-#endif
-
-static SockDesc sock_connect_by_getaddrinfo(const gchar *hostname, gushort port)
-{
-       SockDesc sock = INVALID_SOCKET;
-       gint gai_error;
-       struct addrinfo hints, *res, *ai;
-       gchar port_str[6];
-
-       memset(&hints, 0, sizeof(hints));
-       /* hints.ai_flags = AI_CANONNAME; */
-       hints.ai_family = AF_UNSPEC;
-       hints.ai_socktype = SOCK_STREAM;
-       hints.ai_protocol = IPPROTO_TCP;
-
-       /* convert port from integer to string. */
-       g_snprintf(port_str, sizeof(port_str), "%d", port);
-
-       if ((gai_error = getaddrinfo(hostname, port_str, &hints, &res)) != 0) {
-               fprintf(stderr, "getaddrinfo for %s:%s failed: %s\n",
-                       hostname, port_str, gai_strerror(gai_error));
-               return INVALID_SOCKET;
-       }
-
-       for (ai = res; ai != NULL; ai = ai->ai_next) {
-               sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-               if (!SOCKET_IS_VALID(sock))
-                       continue;
-
-               if (sock_connect_with_timeout
-                       (sock, ai->ai_addr, ai->ai_addrlen, io_timeout) == 0)
-                       break;
-
-               fd_close(sock);
-       }
-
-       if (res != NULL)
-               freeaddrinfo(res);
-
-       if (ai == NULL)
-               return INVALID_SOCKET;
-
-       return sock;
-}
-#endif /* !INET6 */
-
-SockInfo *sock_connect(const gchar *hostname, gushort port)
-{
-       SockDesc sock;
-       SockInfo *sockinfo;
-
-#ifdef INET6
-       sock = sock_connect_by_getaddrinfo(hostname, port);
-       if (!SOCKET_IS_VALID(sock))
-               return NULL;
-#else
-       sock = socket(AF_INET, SOCK_STREAM, 0);
-       if (!SOCKET_IS_VALID(sock)) {
-#ifdef G_OS_WIN32
-               g_warning("socket() failed: %d\n", WSAGetLastError());
-#else
-               perror("socket");
-#endif /* G_OS_WIN32 */
-               return NULL;
-       }
-
-       if (sock_connect_by_hostname(sock, hostname, port) < 0) {
-               if (errno != 0) perror("connect");
-               fd_close(sock);
-               return NULL;
-       }
-#endif /* INET6 */
-
-       sockinfo = g_new0(SockInfo, 1);
-       sockinfo->sock = sock;
-       sockinfo->sock_ch = g_io_channel_unix_new(sock);
-       sockinfo->hostname = g_strdup(hostname);
-       sockinfo->port = port;
-       sockinfo->state = CONN_ESTABLISHED;
-       sockinfo->nonblock = FALSE;
-
-       sock_list = g_list_prepend(sock_list, sockinfo);
-
-       g_usleep(100000);
-
-       return sockinfo;
-}
-
-#ifdef G_OS_UNIX
-static void sock_address_list_free(GList *addr_list)
-{
-       GList *cur;
-
-       for (cur = addr_list; cur != NULL; cur = cur->next) {
-               SockAddrData *addr_data = (SockAddrData *)cur->data;
-               g_free(addr_data->addr);
-               g_free(addr_data);
-       }
-
-       g_list_free(addr_list);
-}
-
-/* asynchronous TCP connection */
-
-static gboolean sock_connect_async_cb(GIOChannel *source,
-                                     GIOCondition condition, gpointer data)
-{
-       SockConnectData *conn_data = (SockConnectData *)data;
-       gint fd;
-       gint val;
-       guint len;
-       SockInfo *sockinfo;
-
-       fd = g_io_channel_unix_get_fd(source);
-
-       conn_data->io_tag = 0;
-       conn_data->channel = NULL;
-       g_io_channel_unref(source);
-
-       if (condition & (G_IO_ERR | G_IO_HUP)) {
-               g_debug ("sock_connect_async_cb: condition = %d\n",
-                           condition);
-               fd_close(fd);
-               sock_connect_address_list_async(conn_data);
-               return FALSE;
-       }
-
-       len = sizeof(val);
-       if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &val, &len) < 0) {
-               perror("getsockopt");
-               fd_close(fd);
-               sock_connect_address_list_async(conn_data);
-               return FALSE;
-       }
-
-       if (val != 0) {
-               fd_close(fd);
-               sock_connect_address_list_async(conn_data);
-               return FALSE;
-       }
-
-       sockinfo = g_new0(SockInfo, 1);
-       sockinfo->sock = fd;
-       sockinfo->sock_ch = g_io_channel_unix_new(fd);
-       sockinfo->hostname = g_strdup(conn_data->hostname);
-       sockinfo->port = conn_data->port;
-       sockinfo->state = CONN_ESTABLISHED;
-       sockinfo->nonblock = TRUE;
-
-       sock_list = g_list_prepend(sock_list, sockinfo);
-
-       conn_data->func(sockinfo, conn_data->data);
-
-       sock_connect_async_cancel(conn_data->id);
-
-       return FALSE;
-}
-
-static gint sock_connect_async_get_address_info_cb(GList *addr_list,
-                                                  gpointer data)
-{
-       SockConnectData *conn_data = (SockConnectData *)data;
-
-       conn_data->addr_list = addr_list;
-       conn_data->cur_addr = addr_list;
-       conn_data->lookup_data = NULL;
-
-       return sock_connect_address_list_async(conn_data);
-}
-
-gint sock_connect_async(const gchar *hostname, gushort port,
-                       SockConnectFunc func, gpointer data)
-{
-       static gint id = 1;
-       SockConnectData *conn_data;
-
-       conn_data = g_new0(SockConnectData, 1);
-       conn_data->id = id++;
-       conn_data->hostname = g_strdup(hostname);
-       conn_data->port = port;
-       conn_data->addr_list = NULL;
-       conn_data->cur_addr = NULL;
-       conn_data->io_tag = 0;
-       conn_data->func = func;
-       conn_data->data = data;
-
-       conn_data->lookup_data = sock_get_address_info_async
-               (hostname, port, sock_connect_async_get_address_info_cb,
-                conn_data);
-
-       if (conn_data->lookup_data == NULL) {
-               g_free(conn_data->hostname);
-               g_free(conn_data);
-               return -1;
-       }
-
-       sock_connect_data_list = g_list_append(sock_connect_data_list,
-                                              conn_data);
-
-       return conn_data->id;
-}
-
-gint sock_connect_async_cancel(gint id)
-{
-       SockConnectData *conn_data = NULL;
-       GList *cur;
-
-       for (cur = sock_connect_data_list; cur != NULL; cur = cur->next) {
-               if (((SockConnectData *)cur->data)->id == id) {
-                       conn_data = (SockConnectData *)cur->data;
-                       break;
-               }
-       }
-
-       if (conn_data) {
-               sock_connect_data_list = g_list_remove(sock_connect_data_list,
-                                                      conn_data);
-
-               if (conn_data->lookup_data)
-                       sock_get_address_info_async_cancel
-                               (conn_data->lookup_data);
-
-               if (conn_data->io_tag > 0)
-                       g_source_remove(conn_data->io_tag);
-               if (conn_data->channel) {
-                       g_io_channel_shutdown(conn_data->channel, FALSE, NULL);
-                       g_io_channel_unref(conn_data->channel);
-               }
-
-               sock_address_list_free(conn_data->addr_list);
-               g_free(conn_data->hostname);
-               g_free(conn_data);
-       } else {
-               g_warning("sock_connect_async_cancel: id %d not found.\n", id);
-               return -1;
-       }
-
-       return 0;
-}
-
-static gint sock_connect_address_list_async(SockConnectData *conn_data)
-{
-       SockAddrData *addr_data;
-       gint sock = -1;
-
-       for (; conn_data->cur_addr != NULL;
-            conn_data->cur_addr = conn_data->cur_addr->next) {
-               addr_data = (SockAddrData *)conn_data->cur_addr->data;
-
-               if ((sock = socket(addr_data->family, addr_data->socktype,
-                                  addr_data->protocol)) < 0) {
-                       perror("socket");
-                       continue;
-               }
-
-               set_nonblocking_mode(sock, TRUE);
-
-               if (connect(sock, addr_data->addr, addr_data->addr_len) < 0) {
-                       if (EINPROGRESS == errno) {
-                               break;
-                       } else {
-                               perror("connect");
-                               fd_close(sock);
-                       }
-               } else
-                       break;
-       }
-
-       if (conn_data->cur_addr == NULL) {
-               g_warning("sock_connect_address_list_async: "
-                         "connection to %s:%d failed\n",
-                         conn_data->hostname, conn_data->port);
-               conn_data->func(NULL, conn_data->data);
-               sock_connect_async_cancel(conn_data->id);
-               return -1;
-       }
-
-       g_debug ("sock_connect_address_list_async: waiting for connect\n");
-
-       conn_data->cur_addr = conn_data->cur_addr->next;
-
-       conn_data->channel = g_io_channel_unix_new(sock);
-       conn_data->io_tag = g_io_add_watch(conn_data->channel,
-                                          G_IO_OUT | G_IO_ERR | G_IO_HUP,
-                                          sock_connect_async_cb, conn_data);
-
-       return 0;
-}
-
-static gint sock_kill_process(pid_t pid)
-{
-       pid_t ret = (pid_t)-1;
-
-       kill(pid, SIGKILL);
-
-       while (ret == (pid_t)-1) {
-               if ((ret = waitpid(pid, NULL, 0)) != pid) {
-                       perror("sock_kill_process(): waitpid");
-                       if (ret == (pid_t)-1 && errno != EINTR)
-                               break;
-               }
-       }
-
-       return (gint)pid;
-}
-
-/* asynchronous DNS lookup */
-
-static gboolean sock_get_address_info_async_cb(GIOChannel *source,
-                                              GIOCondition condition,
-                                              gpointer data)
-{
-       SockLookupData *lookup_data = (SockLookupData *)data;
-       GList *addr_list = NULL;
-       SockAddrData *addr_data;
-       gsize bytes_read;
-       gint ai_member[4];
-       struct sockaddr *addr;
-
-       for (;;) {
-               if (g_io_channel_read(source, (gchar *)ai_member,
-                                     sizeof(ai_member), &bytes_read)
-                   != G_IO_ERROR_NONE) {
-                       g_warning("sock_get_address_info_async_cb: "
-                                 "address length read error\n");
-                       break;
-               }
-
-               if (bytes_read == 0 || bytes_read != sizeof(ai_member))
-                       break;
-
-               if (ai_member[0] == AF_UNSPEC) {
-                       g_warning("DNS lookup failed\n");
-                       break;
-               }
-
-               addr = g_malloc(ai_member[3]);
-               if (g_io_channel_read(source, (gchar *)addr, ai_member[3],
-                                     &bytes_read)
-                   != G_IO_ERROR_NONE) {
-                       g_warning("sock_get_address_info_async_cb: "
-                                 "address data read error\n");
-                       g_free(addr);
-                       break;
-               }
-
-               if (bytes_read != (gsize)ai_member[3]) {
-                       g_warning("sock_get_address_info_async_cb: "
-                                 "incomplete address data\n");
-                       g_free(addr);
-                       break;
-               }
-
-               addr_data = g_new0(SockAddrData, 1);
-               addr_data->family = ai_member[0];
-               addr_data->socktype = ai_member[1];
-               addr_data->protocol = ai_member[2];
-               addr_data->addr_len = ai_member[3];
-               addr_data->addr = addr;
-
-               addr_list = g_list_append(addr_list, addr_data);
-       }
-
-       g_io_channel_shutdown(source, FALSE, NULL);
-       g_io_channel_unref(source);
-
-       sock_kill_process(lookup_data->child_pid);
-
-       lookup_data->func(addr_list, lookup_data->data);
-
-       g_free(lookup_data->hostname);
-       g_free(lookup_data);
-
-       return FALSE;
-}
-
-static SockLookupData *sock_get_address_info_async(const gchar *hostname,
-                                                  gushort port,
-                                                  SockAddrFunc func,
-                                                  gpointer data)
-{
-       SockLookupData *lookup_data = NULL;
-       gint pipe_fds[2];
-       pid_t pid;
-
-       if (pipe(pipe_fds) < 0) {
-               perror("pipe");
-               func(NULL, data);
-               return NULL;
-       }
-
-       if ((pid = fork()) < 0) {
-               perror("fork");
-               func(NULL, data);
-               return NULL;
-       }
-
-       /* child process */
-       if (pid == 0) {
-#ifdef INET6
-               gint gai_err;
-               struct addrinfo hints, *res, *ai;
-               gchar port_str[6];
-#else /* !INET6 */
-               struct hostent *hp;
-               gchar **addr_list_p;
-               struct sockaddr_in ad;
-#endif /* INET6 */
-               gint ai_member[4] = {AF_UNSPEC, 0, 0, 0};
-
-               close(pipe_fds[0]);
-
-#ifdef INET6
-               memset(&hints, 0, sizeof(hints));
-               /* hints.ai_flags = AI_CANONNAME; */
-               hints.ai_family = AF_UNSPEC;
-               hints.ai_socktype = SOCK_STREAM;
-               hints.ai_protocol = IPPROTO_TCP;
-
-               g_snprintf(port_str, sizeof(port_str), "%d", port);
-
-               gai_err = getaddrinfo(hostname, port_str, &hints, &res);
-               if (gai_err != 0) {
-                       g_warning("getaddrinfo for %s:%s failed: %s\n",
-                                 hostname, port_str, gai_strerror(gai_err));
-                       fd_write_all(pipe_fds[1], (gchar *)ai_member,
-                                    sizeof(ai_member));
-                       close(pipe_fds[1]);
-                       _exit(1);
-               }
-
-               for (ai = res; ai != NULL; ai = ai->ai_next) {
-                       ai_member[0] = ai->ai_family;
-                       ai_member[1] = ai->ai_socktype;
-                       ai_member[2] = ai->ai_protocol;
-                       ai_member[3] = ai->ai_addrlen;
-
-                       fd_write_all(pipe_fds[1], (gchar *)ai_member,
-                                    sizeof(ai_member));
-                       fd_write_all(pipe_fds[1], (gchar *)ai->ai_addr,
-                                    ai->ai_addrlen);
-               }
-
-               if (res != NULL)
-                       freeaddrinfo(res);
-#else /* !INET6 */
-               hp = my_gethostbyname(hostname);
-               if (hp == NULL || hp->h_addrtype != AF_INET) {
-                       fd_write_all(pipe_fds[1], (gchar *)ai_member,
-                                    sizeof(ai_member));
-                       close(pipe_fds[1]);
-                       _exit(1);
-               }
-
-               ai_member[0] = AF_INET;
-               ai_member[1] = SOCK_STREAM;
-               ai_member[2] = IPPROTO_TCP;
-               ai_member[3] = sizeof(ad);
-
-               memset(&ad, 0, sizeof(ad));
-               ad.sin_family = AF_INET;
-               ad.sin_port = htons(port);
-
-               for (addr_list_p = hp->h_addr_list; *addr_list_p != NULL;
-                    addr_list_p++) {
-                       memcpy(&ad.sin_addr, *addr_list_p, hp->h_length);
-                       fd_write_all(pipe_fds[1], (gchar *)ai_member,
-                                    sizeof(ai_member));
-                       fd_write_all(pipe_fds[1], (gchar *)&ad, sizeof(ad));
-               }
-#endif /* INET6 */
-
-               close(pipe_fds[1]);
-
-               _exit(0);
-       } else {
-               close(pipe_fds[1]);
-
-               lookup_data = g_new0(SockLookupData, 1);
-               lookup_data->hostname = g_strdup(hostname);
-               lookup_data->child_pid = pid;
-               lookup_data->func = func;
-               lookup_data->data = data;
-
-               lookup_data->channel = g_io_channel_unix_new(pipe_fds[0]);
-               lookup_data->io_tag = g_io_add_watch
-                       (lookup_data->channel, G_IO_IN,
-                        sock_get_address_info_async_cb, lookup_data);
-       }
-
-       return lookup_data;
-}
-
-static gint sock_get_address_info_async_cancel(SockLookupData *lookup_data)
-{
-       if (lookup_data->io_tag > 0)
-               g_source_remove(lookup_data->io_tag);
-       if (lookup_data->channel) {
-               g_io_channel_shutdown(lookup_data->channel, FALSE, NULL);
-               g_io_channel_unref(lookup_data->channel);
-       }
-
-       if (lookup_data->child_pid > 0)
-               sock_kill_process(lookup_data->child_pid);
-
-       g_free(lookup_data->hostname);
-       g_free(lookup_data);
-
-       return 0;
-}
-#endif /* G_OS_UNIX */
-
-
-gint sock_printf(SockInfo *sock, const gchar *format, ...)
-{
-       va_list args;
-       gchar buf[BUFFSIZE];
-
-       va_start(args, format);
-       g_vsnprintf(buf, sizeof(buf), format, args);
-       va_end(args);
-
-       return sock_write_all(sock, buf, strlen(buf));
-}
-
-#ifdef G_OS_WIN32
-static void sock_set_errno_from_last_error(gint error)
-{
-       switch (error) {
-       case WSAEWOULDBLOCK:
-               errno = EAGAIN;
-               break;
-       default:
-               g_debug ("last error = %d\n", error);
-               errno = 0;
-               break;
-       }
-}
-#endif
-
-gint sock_read(SockInfo *sock, gchar *buf, gint len)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-
-       return fd_read(sock->sock, buf, len);
-}
-
-gint fd_read(gint fd, gchar *buf, gint len)
-{
-#ifdef G_OS_WIN32
-       return fd_recv(fd, buf, len, 0);
-#else
-       if (fd_check_io(fd, G_IO_IN) < 0)
-               return -1;
-
-       return read(fd, buf, len);
-#endif
-}
-
-gint sock_write(SockInfo *sock, const gchar *buf, gint len)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-
-       return fd_write(sock->sock, buf, len);
-}
-
-gint fd_write(gint fd, const gchar *buf, gint len)
-{
-#ifdef G_OS_WIN32
-       gint ret;
-#endif
-       if (fd_check_io(fd, G_IO_OUT) < 0)
-               return -1;
-
-#ifdef G_OS_WIN32
-       ret = send(fd, buf, len, 0);
-       if (ret == SOCKET_ERROR) {
-               gint err;
-               err = WSAGetLastError();
-               sock_set_errno_from_last_error(err);
-               if (err != WSAEWOULDBLOCK)
-                       g_warning("fd_write() failed with %d (errno = %d)\n",
-                                 err, errno);
-       }
-       return ret;
-#else
-       return write(fd, buf, len);
-#endif
-}
-
-gint sock_write_all(SockInfo *sock, const gchar *buf, gint len)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-
-       return fd_write_all(sock->sock, buf, len);
-}
-
-gint fd_write_all(gint fd, const gchar *buf, gint len)
-{
-       gint n, wrlen = 0;
-
-       while (len) {
-               n = fd_write(fd, buf, len);
-               if (n <= 0)
-                       return -1;
-               len -= n;
-               wrlen += n;
-               buf += n;
-       }
-
-       return wrlen;
-}
-
-gint fd_recv(gint fd, gchar *buf, gint len, gint flags)
-{
-#ifdef G_OS_WIN32
-       gint ret;
-#endif
-       if (fd_check_io(fd, G_IO_IN) < 0)
-               return -1;
-
-#ifdef G_OS_WIN32
-       ret = recv(fd, buf, len, flags);
-       if (ret == SOCKET_ERROR) {
-               gint err;
-               err = WSAGetLastError();
-               sock_set_errno_from_last_error(err);
-               if (err != WSAEWOULDBLOCK)
-                       g_warning("fd_recv(): failed with %d (errno = %d)\n",
-                                 err, errno);
-       }
-       return ret;
-#else
-       return recv(fd, buf, len, flags);
-#endif
-}
-
-gint fd_gets(gint fd, gchar *buf, gint len)
-{
-       gchar *newline, *bp = buf;
-       gint n;
-
-       if (--len < 1)
-               return -1;
-       do {
-               if ((n = fd_recv(fd, bp, len, MSG_PEEK)) <= 0)
-                       return -1;
-               if ((newline = memchr(bp, '\n', n)) != NULL)
-                       n = newline - bp + 1;
-               if ((n = fd_read(fd, bp, n)) < 0)
-                       return -1;
-               bp += n;
-               len -= n;
-       } while (!newline && len);
-
-       *bp = '\0';
-       return bp - buf;
-}
-
-gint sock_gets(SockInfo *sock, gchar *buf, gint len)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-
-       return fd_gets(sock->sock, buf, len);
-}
-
-gint fd_getline(gint fd, gchar **line)
-{
-       gchar buf[BUFFSIZE];
-       gchar *str = NULL;
-       gint len;
-       gulong size = 0;
-       gulong cur_offset = 0;
-
-       while ((len = fd_gets(fd, 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;
-}
-
-gint sock_getline(SockInfo *sock, gchar **line)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-       g_return_val_if_fail(line != NULL, -1);
-
-       return fd_getline(sock->sock, line);
-}
-
-gint sock_puts(SockInfo *sock, const gchar *buf)
-{
-       gint ret;
-
-       if ((ret = sock_write_all(sock, buf, strlen(buf))) < 0)
-               return ret;
-       return sock_write_all(sock, "\r\n", 2);
-}
-
-/* peek at the socket data without actually reading it */
-gint sock_peek(SockInfo *sock, gchar *buf, gint len)
-{
-       g_return_val_if_fail(sock != NULL, -1);
-
-       return fd_recv(sock->sock, buf, len, MSG_PEEK);
-}
-
-gint sock_close(SockInfo *sock)
-{
-       GList *cur;
-
-       if (!sock)
-               return 0;
-
-       if (sock->sock_ch) {
-               g_io_channel_shutdown(sock->sock_ch, FALSE, NULL);
-               g_io_channel_unref(sock->sock_ch);
-       }
-
-       for (cur = sock_list; cur != NULL; cur = cur->next) {
-               if ((SockInfo *)cur->data == sock) {
-                       sock_list = g_list_remove(sock_list, sock);
-                       break;
-               }
-       }
-
-       g_free(sock->hostname);
-       g_free(sock);
-
-       return 0;
-}
-
-gint fd_close(gint fd)
-{
-#ifdef G_OS_WIN32
-       return closesocket(fd);
-#else
-       return close(fd);
-#endif
-}
-
-#endif
diff --git a/midori/socket.h b/midori/socket.h
deleted file mode 100644 (file)
index d4054f4..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- Copyright 1999-2008 Hiroyuki Yamamoto
-
- 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 __SYLPH_SOCKET_H__
-#define __SYLPH_SOCKET_H__
-
-#include <glib.h>
-#include "config.h"
-#if HAVE_NETDB_H
-#  include <netdb.h>
-#endif
-
-typedef struct _SockInfo       SockInfo;
-
-typedef enum
-{
-       CONN_READY,
-       CONN_LOOKUPSUCCESS,
-       CONN_ESTABLISHED,
-       CONN_LOOKUPFAILED,
-       CONN_FAILED
-} ConnectionState;
-
-typedef gint (*SockConnectFunc)                (SockInfo       *sock,
-                                        gpointer        data);
-typedef gboolean (*SockFunc)           (SockInfo       *sock,
-                                        GIOCondition    condition,
-                                        gpointer        data);
-
-struct _SockInfo
-{
-       gint sock;
-       GIOChannel *sock_ch;
-
-       gchar *hostname;
-       gushort port;
-       ConnectionState state;
-       gboolean nonblock;
-       gpointer data;
-
-       SockFunc callback;
-       GIOCondition condition;
-};
-
-void send_open_command                 (gint sock, const gchar *command,
-                                        gchar **args);
-gint socket_init                       (const gchar *instance_name,
-                                        const gchar *config_dir, gboolean *exists);
-
-gint sock_cleanup                      (void);
-
-gint sock_set_io_timeout               (guint sec);
-
-gint sock_set_nonblocking_mode         (SockInfo *sock, gboolean nonblock);
-gboolean sock_is_nonblocking_mode      (SockInfo *sock);
-
-gboolean sock_has_read_data            (SockInfo *sock);
-
-guint sock_add_watch                   (SockInfo *sock, GIOCondition condition,
-                                        SockFunc func, gpointer data);
-
-struct hostent *my_gethostbyname       (const gchar *hostname);
-
-SockInfo *sock_connect                 (const gchar *hostname, gushort port);
-#ifdef G_OS_UNIX
-gint sock_connect_async                        (const gchar *hostname, gushort port,
-                                        SockConnectFunc func, gpointer data);
-gint sock_connect_async_cancel         (gint id);
-#endif
-
-/* Basic I/O functions */
-gint sock_printf       (SockInfo *sock, const gchar *format, ...)
-                        G_GNUC_PRINTF(2, 3);
-gint sock_read         (SockInfo *sock, gchar *buf, gint len);
-gint sock_write                (SockInfo *sock, const gchar *buf, gint len);
-gint sock_write_all    (SockInfo *sock, const gchar *buf, gint len);
-gint sock_gets         (SockInfo *sock, gchar *buf, gint len);
-gint sock_getline      (SockInfo *sock, gchar **line);
-gint sock_puts         (SockInfo *sock, const gchar *buf);
-gint sock_peek         (SockInfo *sock, gchar *buf, gint len);
-gint sock_close                (SockInfo *sock);
-
-/* Functions to directly work on FD.  They are needed for pipes */
-gint fd_connect_inet   (gushort port);
-gint fd_open_inet      (gushort port);
-gint fd_connect_unix   (const gchar *path);
-gint fd_open_unix      (const gchar *path);
-gint fd_accept         (gint sock);
-
-gint fd_read           (gint sock, gchar *buf, gint len);
-gint fd_write          (gint sock, const gchar *buf, gint len);
-gint fd_write_all      (gint sock, const gchar *buf, gint len);
-gint fd_gets           (gint sock, gchar *buf, gint len);
-gint fd_getline                (gint sock, gchar **line);
-gint fd_close          (gint sock);
-
-#endif /* __SYLPH_SOCKET_H__ */
index c10ae02681e264c1e1907952f80af657b9893b86..2e3165583dab77de7e927023c54232393aceacba 100644 (file)
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2007-2011 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
  Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
  Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
 
 #include <glib/gstdio.h>
 #include "katze/katze.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <shlobj.h>
+#include <gdk/gdkwin32.h>
+#endif
+
 static gchar*
 sokoke_js_string_utf8 (JSStringRef js_string)
 {
@@ -104,39 +110,10 @@ sokoke_message_dialog (GtkMessageType message_type,
                        const gchar*   detailed_message,
                        gboolean       modal)
 {
-    GtkWidget* dialog = gtk_message_dialog_new (
-        NULL, 0, message_type, GTK_BUTTONS_OK, "%s", short_message);
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                              "%s", detailed_message);
-    if (modal)
-    {
-        gtk_dialog_run (GTK_DIALOG (dialog));
-        gtk_widget_destroy (dialog);
-    }
-    else
-    {
-        g_signal_connect_swapped (dialog, "response",
-            G_CALLBACK (gtk_widget_destroy), dialog);
-        gtk_widget_show (dialog);
-    }
-
+    midori_show_message_dialog (message_type, short_message, detailed_message, modal);
 }
 
-static void
-sokoke_open_with_response_cb (GtkWidget* dialog,
-                              gint       response,
-                              GtkEntry*  entry)
-{
-    if (response == GTK_RESPONSE_ACCEPT)
-    {
-        const gchar* command = gtk_entry_get_text (entry);
-        const gchar* uri = g_object_get_data (G_OBJECT (dialog), "uri");
-        sokoke_spawn_program (command, FALSE, uri, TRUE, FALSE);
-    }
-    gtk_widget_destroy (dialog);
-}
-
-static GAppInfo*
+GAppInfo*
 sokoke_default_for_uri (const gchar* uri,
                         gchar**      scheme_ptr)
 {
@@ -148,14 +125,6 @@ sokoke_default_for_uri (const gchar* uri,
         return NULL;
 
     info = g_app_info_get_default_for_uri_scheme (scheme);
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    if (!info)
-    {
-        gchar* type = g_strdup_printf ("x-scheme-handler/%s", scheme);
-        info = g_app_info_get_default_for_type (type, FALSE);
-        g_free (type);
-    }
-    #endif
     if (scheme_ptr != NULL)
         *scheme_ptr = scheme;
     else
@@ -164,109 +133,6 @@ sokoke_default_for_uri (const gchar* uri,
 
 }
 
-/**
- * sokoke_show_uri:
- * @screen: a #GdkScreen, or %NULL
- * @uri: the URI to show
- * @timestamp: the timestamp of the event
- * @error: the location of a #GError, or %NULL
- *
- * Shows the specified URI with an application or xdg-open.
- * x-scheme-handler is supported for GLib < 2.28 as of 0.3.3.
- *
- * Return value: %TRUE on success, %FALSE if an error occurred
- **/
-gboolean
-sokoke_show_uri (GdkScreen*   screen,
-                 const gchar* uri,
-                 guint32      timestamp,
-                 GError**     error)
-{
-    #ifdef G_OS_WIN32
-    CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
-    SHELLEXECUTEINFO info = { sizeof (info) };
-    info.nShow = SW_SHOWNORMAL;
-    info.lpFile = uri;
-
-    return ShellExecuteEx (&info);
-    #else
-
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    GAppInfo* info;
-    gchar* scheme;
-    #endif
-    GtkWidget* dialog;
-    GtkWidget* box;
-    gchar* filename;
-    gchar* ms;
-    GtkWidget* entry;
-
-    g_return_val_if_fail (GDK_IS_SCREEN (screen) || !screen, FALSE);
-    g_return_val_if_fail (uri != NULL, FALSE);
-    g_return_val_if_fail (!error || !*error, FALSE);
-
-    sokoke_recursive_fork_protection (uri, TRUE);
-
-    /* g_app_info_launch_default_for_uri, gdk_display_get_app_launch_context */
-    if (gtk_show_uri (screen, uri, timestamp, error))
-        return TRUE;
-
-    #if !GLIB_CHECK_VERSION (2, 28, 0)
-    info = sokoke_default_for_uri (uri, &scheme);
-    if (info)
-    {
-        gchar* argument = g_strdup (&uri[scheme - uri]);
-        GList* uris = g_list_prepend (NULL, argument);
-        if (g_app_info_launch_uris (info, uris, NULL, NULL))
-        {
-            g_list_free (uris);
-            g_free (scheme);
-            g_object_unref (info);
-            return TRUE;
-        }
-        g_list_free (uris);
-        g_free (scheme);
-        g_object_unref (info);
-    }
-    #endif
-
-    {
-        gchar* command = g_strconcat ("xdg-open ", uri, NULL);
-        gboolean result = g_spawn_command_line_async (command, error);
-        g_free (command);
-        if (result)
-            return TRUE;
-        if (error)
-            *error = NULL;
-    }
-
-    dialog = gtk_dialog_new_with_buttons (_("Open with"), NULL, 0,
-        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
-    box = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-    if (g_str_has_prefix (uri, "file:///"))
-        filename = g_filename_from_uri (uri, NULL, NULL);
-    else
-        filename = g_strdup (uri);
-    ms = g_strdup_printf (_("Choose an application or command to open \"%s\":"),
-                          filename);
-    gtk_box_pack_start (GTK_BOX (box), gtk_label_new (ms), TRUE, FALSE, 4);
-    g_free (ms);
-    entry = gtk_entry_new ();
-    gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-    gtk_box_pack_start (GTK_BOX (box), entry, TRUE, FALSE, 4);
-    g_signal_connect (dialog, "response",
-                      G_CALLBACK (sokoke_open_with_response_cb), entry);
-    g_object_set_data_full (G_OBJECT (dialog), "uri",
-                            filename, (GDestroyNotify)g_free);
-    gtk_widget_show_all (dialog);
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    gtk_widget_grab_focus (entry);
-
-    return TRUE;
-    #endif
-}
-
 /**
  * sokoke_prepare_command:
  * @command: the command, properly quoted
@@ -474,10 +340,12 @@ sokoke_external_uri (const gchar* uri)
 {
     GAppInfo* info;
 
-    if (!uri || !strncmp (uri, "http", 4)
-             || !strncmp (uri, "file", 4)
-             || !strncmp (uri, "geo", 3)
-             || !strncmp (uri, "about:", 6))
+    /* URI schemes are case-insensitive, followed by ':' - rfc3986 */
+    if (!uri || !strncasecmp (uri, "http:", 5)
+             || !strncasecmp (uri, "https:", 6)
+             || !strncasecmp (uri, "file:", 5)
+             || !strncasecmp (uri, "geo:", 4)
+             || !strncasecmp (uri, "about:", 6))
         return FALSE;
 
     info = sokoke_default_for_uri (uri, NULL);
@@ -743,80 +611,6 @@ sokoke_widget_get_text_size (GtkWidget*   widget,
     g_object_unref (layout);
 }
 
-/**
- * sokoke_action_create_popup_menu_item:
- * @action: a #GtkAction
- *
- * Creates a menu item from an action, just like
- * gtk_action_create_menu_item(), but it won't
- * display an accelerator.
- *
- * Note: This menu item is not a proxy and will
- *       not reflect any changes to the action.
- *
- * Return value: a new #GtkMenuItem
- **/
-GtkWidget*
-sokoke_action_create_popup_menu_item (GtkAction* action)
-{
-    GtkWidget* menuitem;
-    GtkWidget* icon;
-    gchar* label;
-    gchar* stock_id;
-    gchar* icon_name;
-    gboolean sensitive;
-    gboolean visible;
-
-    g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-    if (KATZE_IS_ARRAY_ACTION (action))
-        return gtk_action_create_menu_item (action);
-
-    g_object_get (action,
-                  "label", &label,
-                  "stock-id", &stock_id,
-                  "icon-name", &icon_name,
-                  "sensitive", &sensitive,
-                  "visible", &visible,
-                  NULL);
-    if (GTK_IS_TOGGLE_ACTION (action))
-    {
-        menuitem = gtk_check_menu_item_new_with_mnemonic (label);
-        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-            gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
-        if (GTK_IS_RADIO_ACTION (action))
-            gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem),
-                                                   TRUE);
-    }
-    else if (stock_id)
-    {
-        if (label)
-        {
-            menuitem = gtk_image_menu_item_new_with_mnemonic (label);
-            icon = gtk_action_create_icon (action, GTK_ICON_SIZE_MENU);
-            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon);
-        }
-        else
-            menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
-    }
-    else
-    {
-        menuitem = gtk_image_menu_item_new_with_mnemonic (label);
-        if (icon_name)
-        {
-            icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon);
-        }
-    }
-    gtk_widget_set_sensitive (menuitem, sensitive);
-    sokoke_widget_set_visible (menuitem, visible);
-    gtk_widget_set_no_show_all (menuitem, TRUE);
-    g_signal_connect_swapped (menuitem, "activate",
-                              G_CALLBACK (gtk_action_activate), action);
-
-    return menuitem;
-}
-
 /**
  * sokoke_time_t_to_julian:
  * @timestamp: a time_t timestamp value
@@ -957,10 +751,15 @@ sokoke_prefetch_uri (MidoriWebSettings*  settings,
                      GCallback           callback,
                      gpointer            user_data)
 {
-    #define MAXHOSTS 50
-    static gchar* hosts = NULL;
-    static gint host_count = G_MAXINT;
     gchar* hostname;
+#ifndef HAVE_WEBKIT2
+    SoupURI* soup_uri;
+    SoupSession* session = webkit_get_default_session ();
+
+    g_object_get (G_OBJECT (session), "proxy-uri", &soup_uri, NULL);
+    if (soup_uri)
+        return FALSE;
+#endif
 
     if (settings && !katze_object_get_boolean (settings, "enable-dns-prefetching"))
         return FALSE;
@@ -979,6 +778,10 @@ sokoke_prefetch_uri (MidoriWebSettings*  settings,
     g_free (hostname);
     return FALSE;
 #else
+    #define MAXHOSTS 50
+    static gchar* hosts = NULL;
+    static gint host_count = G_MAXINT;
+
     if (!hosts ||
         !g_regex_match_simple (hostname, hosts,
                                G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
@@ -1006,36 +809,6 @@ sokoke_prefetch_uri (MidoriWebSettings*  settings,
 #endif
 }
 
-/**
- * sokoke_recursive_fork_protection
- * @uri: the URI to check
- * @set_uri: if TRUE the URI will be saved
- *
- * Protects against recursive invokations of the Midori executable
- * with the same URI.
- *
- * As an example, consider having an URI starting with 'tel://'. You
- * could attempt to open it with sokoke_show_uri. In turn, 'exo-open'
- * might be called. Now quite possibly 'exo-open' is unable to handle
- * 'tel://' and might well fall back to 'midori' as default browser.
- *
- * To protect against this scenario, call this function with the
- * URI and %TRUE before calling any external tool.
- * #MidoriApp calls sokoke_recursive_fork_protection() with %FALSE
- * and bails out if %FALSE is returned.
- *
- * Return value: %TRUE if @uri is new, %FALSE on recursion
- **/
-gboolean
-sokoke_recursive_fork_protection (const gchar* uri,
-                                  gboolean     set_uri)
-{
-    static gchar* fork_uri = NULL;
-    if (set_uri)
-        katze_assign (fork_uri, g_strdup (uri));
-    return g_strcmp0 (fork_uri, uri) == 0 ? FALSE : TRUE;
-}
-
 static void
 sokoke_widget_clipboard_owner_clear_func (GtkClipboard* clipboard,
                                           gpointer      user_data)
@@ -1094,9 +867,8 @@ sokoke_entry_changed_cb (GtkEditable* editable,
     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,
+    gtk_entry_set_icon_from_stock (
+        entry, GTK_ENTRY_ICON_SECONDARY,
         visible ? GTK_STOCK_CLEAR : NULL);
 }
 
@@ -1111,11 +883,11 @@ sokoke_entry_focus_out_event_cb (GtkEditable*   editable,
 
 static void
 sokoke_entry_icon_released_cb (GtkEntry*            entry,
-                               GtkIconEntryPosition icon_pos,
+                               GtkEntryIconPosition icon_pos,
                                GdkEvent*            event,
                                gpointer             user_data)
 {
-    if (icon_pos != GTK_ICON_ENTRY_SECONDARY)
+    if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
         return;
 
     gtk_entry_set_text (entry, "");
@@ -1129,7 +901,7 @@ sokoke_search_entry_new (const gchar* placeholder_text)
     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_set_icon_activatable (GTK_ENTRY (entry),
         GTK_ENTRY_ICON_SECONDARY, TRUE);
     {
         g_object_connect (entry,
@@ -1146,3 +918,90 @@ sokoke_search_entry_new (const gchar* placeholder_text)
     return entry;
 }
 
+#ifdef G_OS_WIN32
+gchar*
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename)
+{
+    const gchar* desktop_dir;
+    gchar* lnk_path, *lnk_file;
+
+    /* CSIDL_PROGRAMS for "start menu -> programs" instead - needs saner/shorter filename */
+    desktop_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+
+    lnk_file = g_strconcat (filename, ".lnk", NULL);
+    lnk_path = g_build_filename (desktop_dir, lnk_file, NULL);
+
+    g_free (lnk_file);
+
+    return lnk_path;
+}
+
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri)
+{
+    WCHAR w[MAX_PATH];
+
+    gchar* exec_dir, *exec_path, *argument;
+    gchar* lnk_path, *launcher_type;
+
+    IShellLink* pShellLink;
+    IPersistFile* pPersistFile;
+
+    exec_dir = g_win32_get_package_installation_directory_of_module (NULL);
+    exec_path = g_build_filename (exec_dir, "bin", "midori.exe", NULL);
+
+    if (g_str_has_suffix (prefix, " -a "))
+        launcher_type = "-a";
+    else if (g_str_has_suffix (prefix, " -c "))
+        launcher_type = "-c";
+    else
+        g_assert_not_reached ();
+
+    argument = g_strdup_printf ("%s \"%s\"", launcher_type, uri);
+
+    /* Create link */
+    CoCreateInstance (&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID *)&pShellLink);
+    pShellLink->lpVtbl->SetPath (pShellLink, exec_path);
+    pShellLink->lpVtbl->SetArguments (pShellLink, argument);
+    /* TODO: support adding site favicon as webapp icon */
+    /* pShellLink->lpVtbl->SetIconLocation (pShellLink, icon_path, icon_index); */
+
+    /* Save link */
+    lnk_path = sokoke_get_win32_desktop_lnk_path_for_filename (filename);
+    pShellLink->lpVtbl->QueryInterface (pShellLink, &IID_IPersistFile, (LPVOID *)&pPersistFile);
+    MultiByteToWideChar (CP_UTF8, 0, lnk_path, -1, w, MAX_PATH);
+    pPersistFile->lpVtbl->Save (pPersistFile, w, TRUE);
+
+    pPersistFile->lpVtbl->Release (pPersistFile);
+    pShellLink->lpVtbl->Release (pShellLink);
+
+    g_free (exec_dir);
+    g_free (exec_path);
+    g_free (argument);
+    g_free (lnk_path);
+    g_free (launcher_type);
+}
+
+GdkPixbuf*
+sokoke_get_gdk_pixbuf_from_win32_executable (gchar* path)
+{
+    if (path == NULL)
+        return NULL;
+
+    GdkPixbuf* pixbuf = NULL;
+    HICON hIcon = NULL;
+    HINSTANCE hInstance = NULL;
+    hIcon = ExtractIcon (hInstance, (LPCSTR)path, 0);
+    if (hIcon == NULL)
+        return NULL;
+
+#if GTK_CHECK_VERSION (3, 9, 12)
+    pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon, NULL, NULL);
+#else
+    pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon);
+#endif
+    DestroyIcon (hIcon);
+
+    return pixbuf;
+}
+#endif
index 1b2f23521211c9282c891ba1f5fc95639442006a..bbce8454967e8e1c210f0acb2717c0de1fd93f41 100644 (file)
@@ -29,19 +29,6 @@ sokoke_message_dialog                   (GtkMessageType  message_type,
                                          const gchar*    detailed_message,
                                          gboolean        modal);
 
-gboolean
-sokoke_show_uri_with_mime_type          (GdkScreen*      screen,
-                                         const gchar*    uri,
-                                         const gchar*    mime_type,
-                                         guint32         timestamp,
-                                         GError**        error);
-
-gboolean
-sokoke_show_uri                         (GdkScreen*      screen,
-                                         const gchar*    uri,
-                                         guint32         timestamp,
-                                         GError**        error);
-
 gchar*
 sokoke_prepare_command                  (const gchar*    command,
                                          gboolean        quote_command,
@@ -90,9 +77,6 @@ sokoke_widget_get_text_size             (GtkWidget*      widget,
                                          gint*           width,
                                          gint*           height);
 
-GtkWidget*
-sokoke_action_create_popup_menu_item    (GtkAction*      action);
-
 gint64
 sokoke_time_t_to_julian                 (const time_t*   timestamp);
 
@@ -115,10 +99,6 @@ sokoke_prefetch_uri                     (MidoriWebSettings*  settings,
 gboolean
 sokoke_resolve_hostname                 (const gchar*        hostname);
 
-gboolean
-sokoke_recursive_fork_protection        (const gchar*         uri,
-                                         gboolean             set_uri);
-
 void
 sokoke_widget_copy_clipboard (GtkWidget*          widget,
                               const gchar*        text,
@@ -128,4 +108,12 @@ sokoke_widget_copy_clipboard (GtkWidget*          widget,
 GtkWidget*
 sokoke_search_entry_new               (const gchar*        placeholder_text);
 
+#ifdef G_OS_WIN32
+gchar*
+sokoke_get_win32_desktop_lnk_path_for_filename (gchar* filename);
+
+void
+sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri);
+#endif
+
 #endif /* !__SOKOKE_H__ */
index 692844fef5ce94761281c320925237bf6a2baffa..9f40181cc807a8d5874f9da2b2e644a1a4a6002d 100644 (file)
@@ -81,7 +81,7 @@ namespace WebKit {
                public async Cairo.Surface? get_favicon (string page_uri, GLib.Cancellable? cancellable) throws GLib.Error;
                public string? get_favicon_uri (string page_uri);
                public void clear ();
-       }
+       } 
        [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_download_get_type ()")]
        public class Download : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -95,8 +95,10 @@ namespace WebKit {
                public unowned WebKit.URIResponse get_response ();
                public void set_destination (string uri);
                public string destination { get; }
+               public double elapsed_time{ get; }
                public double estimated_progress { get; }
                public WebKit.URIResponse response { get; }
+               public WebKit.URIRequest request{ get; }
                public signal bool created_destination (string destination);
                public virtual signal bool decide_destination (string suggested_filename);
                public signal void failed (void* error);
@@ -395,6 +397,7 @@ namespace WebKit {
                public URIRequest (string uri);
                public unowned string get_uri ();
                public string uri { get; construct; }
+               public unowned Soup.MessageHeaders get_http_headers ();
        }
        [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_uri_response_get_type ()")]
        public class URIResponse : GLib.Object {
@@ -403,12 +406,14 @@ namespace WebKit {
                public uint64 get_content_length ();
                public bool get_https_status (out unowned GLib.TlsCertificate certificate, out GLib.TlsCertificateFlags errors);
                public unowned string get_mime_type ();
+               public unowned string get_suggested_filename ();
                public uint get_status_code ();
                public unowned string get_uri ();
                public uint64 content_length { get; }
                public string mime_type { get; }
                public uint status_code { get; }
                public string uri { get; }
+               public string suggested_filename { get; }
        }
        [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_uri_scheme_request_get_type ()")]
        public class URISchemeRequest : GLib.Object {
@@ -436,6 +441,7 @@ namespace WebKit {
                public unowned string[] get_spell_checking_languages ();
                public void register_uri_scheme (string scheme, owned WebKit.URISchemeRequestCallback callback);
                public void set_additional_plugins_directory (string directory);
+               public void set_process_model (WebKit.ProcessModel process_model);
                public void set_cache_model (WebKit.CacheModel cache_model);
                public void set_spell_checking_enabled (bool enabled);
                public void set_spell_checking_languages (string[] languages);
@@ -486,6 +492,7 @@ namespace WebKit {
        public class WebView : WebKit.WebViewBase, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public WebView ();
+               public WebView.with_related_view (WebKit.WebView related);
                public async bool can_execute_editing_command (string command, GLib.Cancellable? cancellable) throws GLib.Error;
                public bool can_go_back ();
                public bool can_go_forward ();
@@ -552,6 +559,22 @@ namespace WebKit {
                [CCode (has_construct_function = false)]
                protected WebViewBase ();
        }
+       [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_extension_get_type ()")]
+       public class WebExtension : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected WebExtension ();
+               public WebKit.WebPage get_page (uint64 page_id);
+               public signal void page_created (WebKit.WebPage web_page);
+       }
+       [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_extension_get_type ()")]
+       public class WebPage : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected WebPage ();
+               public uint64 get_id ();
+               public string uri { get; }
+               public signal bool send_request (WebKit.URIRequest request, WebKit.URIResponse? redirected_response);
+               public signal void document_loaded ();
+       }
        [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_window_properties_get_type ()")]
        public class WindowProperties : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -578,6 +601,11 @@ namespace WebKit {
                public abstract void allow ();
                public abstract void deny ();
        }
+       [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PROCESS_MODEL_")]
+       public enum ProcessModel {
+               SHARED_SECONDARY_PROCESS,
+               MULTIPLE_SECONDARY_PROCESSES
+       }
        [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_CACHE_MODEL_")]
        public enum CacheModel {
                DOCUMENT_VIEWER,
index 6461a2039c3254507bb3323019f007f6152e03ee..46273d48ca9cd3383a1a5afb99425efc089fe22c 100644 (file)
@@ -6,6 +6,7 @@ namespace WebKit {
        public class FaviconDatabase : GLib.Object {
                public signal void icon_loaded (string frame_uri);
                public Gdk.Pixbuf? try_get_favicon_pixbuf (string page_uri, uint width, uint height);
+               public async Gdk.Pixbuf? get_favicon_pixbuf (string page_uri, uint width, uint height, GLib.Cancellable? cancellable) throws GLib.Error;
                public void set_path (string? path);
                public void clear ();
        }
diff --git a/midori/wscript_build b/midori/wscript_build
deleted file mode 100644 (file)
index b5b6ef8..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import Options
-import platform
-import os
-
-progressive = True
-libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
-       'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 ' \
-       'GCR GRANITE ZEITGEIST'
-
-if Options.commands['build'] or Options.commands['check']:
-    blddir = str (bld.bldnode)[6:] # dir:// + absolute path
-    duplicate_vapi = blddir + '/default/midori/midori-core.vapi'
-    if os.path.exists (duplicate_vapi):
-      os.remove (duplicate_vapi)
-
-if progressive:
-    obj = bld.new_task_gen ('cc', 'staticlib')
-    obj.target = 'midori-core'
-    obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.vala'])
-    obj.env.append_value ('CCFLAGS', '-w')
-    obj.uselib = libs
-    obj.vapi_dirs = '../midori ../katze'
-    obj.packages = 'glib-2.0 gmodule-2.0 gio-2.0 libsoup-2.4 posix sqlite3'
-    if bld.env['HAVE_WEBKIT2']:
-        obj.packages += ' webkit2gtk-3.0'
-    else:
-        obj.packages += ' webkitgtk-3.0'
-    if bld.env['HAVE_GTK3']:
-        obj.packages += ' gtk+-3.0'
-    else:
-        obj.packages += ' gtk+-2.0'
-    if bld.env['HAVE_GRANITE']:
-        obj.packages += ' granite'
-    obj.install_path = None
-    bld.add_group ()
-
-    obj = bld.new_task_gen ('cc', 'staticlib')
-    obj.target = 'midori-c'
-    obj.includes = '.. ../katze . ../toolbars'
-    obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.c'], excludes=['main.c'])
-    obj.uselib = libs
-    obj.uselib_local = 'midori-core'
-    obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
-    obj.install_path = None
-    bld.add_group ()
-
-    obj = bld.new_task_gen ('cc', 'program')
-    obj.target = 'midori'
-    obj.includes = '.. ../katze . ../panels'
-    obj.source = './main.c'
-    obj.uselib = libs
-    obj.uselib_local = 'midori-c'
-    if bld.env['WINRC']:
-        obj.source += ' ../data/midori.rc'
diff --git a/module.xml b/module.xml
deleted file mode 100644 (file)
index bfe1074..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:gnome="http://api.gnome.org/doap-extensions#"
-  xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">midori</name>
-  <shortdesc xml:lang="en">Midori is a lightweight web browser</shortdesc>
-  <homepage rdf:resource="http://www.twotoasts.de"/>
-  <mailing-list rdf:resource="http://foo-projects.org/mailman/listinfo/xfce"/>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Christian Dywan</foaf:name>
-      <foaf:mbox>christian@twotoasts.de</foaf:mbox>
-      <gnome:userid>kalikiana</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-</Project>
index 8418ea2b4068554ac4b42c23630139a23cf16dc7..a237f9a7f68fd121e7b18b60d5558639963486e8 100644 (file)
@@ -17,6 +17,7 @@
 #include "midori-platform.h"
 #include "midori-view.h"
 #include "midori-core.h"
+#include "midori-bookmarks-db.h"
 
 #include <glib/gi18n.h>
 #include <string.h>
@@ -27,7 +28,7 @@
 
 gboolean
 midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
-                                         KatzeItem*     bookmark,
+                                         KatzeItem*     bookmark_or_parent,
                                          gboolean       new_bookmark,
                                          gboolean       is_folder,
                                          GtkWidget*     proxy);
@@ -39,16 +40,17 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
 struct _MidoriBookmarks
 {
     GtkVBox parent_instance;
-
     GtkWidget* toolbar;
     GtkWidget* edit;
     GtkWidget* delete;
     GtkWidget* treeview;
     MidoriApp* app;
-    KatzeArray* array;
+    MidoriBookmarksDb* bookmarks_db;
 
     gint filter_timeout;
     gchar* filter;
+
+    KatzeItem* hovering_item;
 };
 
 struct _MidoriBookmarksClass
@@ -85,6 +87,38 @@ midori_bookmarks_get_property (GObject*    object,
                                GValue*     value,
                                GParamSpec* pspec);
 
+static void
+midori_bookmarks_row_changed_cb (GtkTreeModel*    model,
+                                 GtkTreePath*     path,
+                                 GtkTreeIter*     iter,
+                                 MidoriBookmarks* bookmarks);
+
+static void
+midori_bookmarks_add_item_cb (KatzeArray*      array,
+                              KatzeItem*       item,
+                              MidoriBookmarks* bookmarks);
+
+static void
+midori_bookmarks_update_item_cb (KatzeArray*      array,
+                                KatzeItem*       item,
+                                MidoriBookmarks* bookmarks);
+
+static void
+midori_bookmarks_remove_item_cb (KatzeArray*      array,
+                                 KatzeItem*       item,
+                                 MidoriBookmarks* bookmarks);
+
+static void
+midori_bookmarks_update_cb (KatzeArray*      array,
+                            MidoriBookmarks* bookmarks);
+
+static void
+midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks);
+
+static void
+midori_bookmarks_add_item (KatzeItem*       item,
+                           MidoriBookmarks* bookmarks);
+
 static void
 midori_bookmarks_class_init (MidoriBookmarksClass* class)
 {
@@ -120,6 +154,7 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable)
     return STOCK_BOOKMARKS;
 }
 
+#if 0 /* Make sure the following function is never used */
 /* TODO: Function never used */
 void
 midori_bookmarks_export_array_db (sqlite3*    db,
@@ -133,7 +168,7 @@ midori_bookmarks_export_array_db (sqlite3*    db,
     gchar* parent_id;
 
     parent_id = g_strdup_printf ("%" G_GINT64_FORMAT, parentid);
-    if (!(root_array = midori_array_query (array, "*", "parentid = %q", parent_id)))
+    if (!(root_array = midori_bookmarks_db_query_recursive (array, "*", "parentid = %q", parent_id, FALSE)))
     {
         g_free (parent_id);
         return;
@@ -155,27 +190,7 @@ midori_bookmarks_export_array_db (sqlite3*    db,
     g_free (parent_id);
     g_list_free (list);
 }
-
-void
-midori_bookmarks_import_array_db (sqlite3*    db,
-                                  KatzeArray* array,
-                                  gint64      parentid)
-{
-    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);
-    }
-    g_list_free (list);
-}
+#endif /* 0 */
 
 static KatzeArray*
 midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
@@ -185,21 +200,21 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
     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);
+        array = midori_bookmarks_db_query_recursive (bookmarks->bookmarks_db,
+                                                     "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "title LIKE '%%%q%%'", keyword, FALSE);
     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);
+            array = midori_bookmarks_db_query_recursive (bookmarks->bookmarks_db,
+                                                         "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q", parent_id, FALSE);
 
             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_bookmarks_db_query_recursive (bookmarks->bookmarks_db,
+                                                         "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid IS NULL", NULL, FALSE);
     }
     return array ? array : katze_array_new (KATZE_TYPE_ITEM);
 }
@@ -228,92 +243,112 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks,
         gtk_tree_store_remove (model, &child);
     else
         g_object_unref (item);
+    g_object_unref (G_OBJECT (array));
 }
 
-gint64
-midori_bookmarks_insert_item_db (sqlite3*   db,
-                                 KatzeItem* item,
-                                 gint64     parentid)
+static gboolean
+midori_bookmarks_reach_item_recurse (GtkTreeModel* model,
+                                    GtkTreeIter* iter,
+                                    gint64 id)
 {
-    gchar* sqlcmd;
-    char* errmsg = NULL;
-    KatzeItem* old_parent;
-    gchar* new_parentid;
-    gchar* id = NULL;
-    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);
-
-    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");
-
-    if (KATZE_ITEM_IS_BOOKMARK (item))
-        uri = katze_item_get_uri (item);
+    do
+    {
+        GtkTreeIter child;
+        KatzeItem *item;
+        gint64 itemid = -1;
 
-    if (katze_item_get_text (item))
-        desc = katze_item_get_text (item);
+        gtk_tree_model_get (model, iter, 0, &item, -1);
 
-    /* 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"));
-    else
-        new_parentid = g_strdup_printf ("NULL");
-
-    sqlcmd = sqlite3_mprintf (
-            "INSERT INTO bookmarks (id, parentid, title, uri, desc, toolbar, app) "
-            "VALUES (%q, %q, '%q', '%q', '%q', %d, %d)",
-            id,
-            new_parentid,
-            katze_item_get_name (item),
-            katze_str_non_null (uri),
-            katze_str_non_null (desc),
-            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"))
+        if (!KATZE_ITEM_IS_SEPARATOR(item))
         {
-            KatzeArray* seq_array;
+            itemid = katze_item_get_meta_integer (item, "id");
+            g_object_unref (item);
+        }
 
-            sqlite3_free (sqlcmd);
-            sqlcmd = sqlite3_mprintf (
-                    "SELECT seq FROM sqlite_sequence WHERE name = 'bookmarks'");
+        if (id == itemid)
+            return TRUE;
 
-            seq_array = katze_array_from_sqlite (db, sqlcmd);
-            if (katze_array_get_nth_item (seq_array, 0))
+        if (gtk_tree_model_iter_children (model, &child, iter))
+        {
+            if (midori_bookmarks_reach_item_recurse (model, &child, id))
             {
-                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);
+                *iter = child;
+                return TRUE;
             }
-            g_object_unref (seq_array);
         }
     }
+    while (gtk_tree_model_iter_next(model, iter));
+
+    return FALSE;
+}
+
+static gboolean
+midori_bookmarks_reach_item (GtkTreeModel* model,
+                            GtkTreeIter* iter,
+                            gint64 id)
+{
+    if (!gtk_tree_model_get_iter_first(model, iter))
+        return FALSE;
+
+    return midori_bookmarks_reach_item_recurse (model, iter, id);
+}
+
+static void
+midori_bookmarks_add_item_to_model(GtkTreeStore*    model,
+                                  GtkTreeIter*     parent,
+                                  KatzeItem*       item)
+{
+    if (KATZE_ITEM_IS_BOOKMARK (item))
+    {
+        gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item), -1);
+
+        gtk_tree_store_insert_with_values (model, NULL, parent,
+            0,
+            0, item, 1, tooltip, -1);
+        g_free (tooltip);
+    }
     else
     {
-        g_printerr (_("Failed to add bookmark item: %s\n"), errmsg);
-        sqlite3_free (errmsg);
+        GtkTreeIter root_iter;
+
+        gtk_tree_store_insert_with_values (model, &root_iter, parent,
+            0, 0, item, -1);
+
+        /* That's an invisible dummy, so we always have an expander */
+        gtk_tree_store_insert_with_values (model, NULL, &root_iter,
+            0,
+            0, NULL, -1);
     }
+}
+
+static void
+midori_bookmarks_update_item_in_model(MidoriBookmarks* bookmarks,
+                                     GtkTreeStore*    model,
+                                     GtkTreeIter*     iter,
+                                     KatzeItem*       item)
+{
+    g_signal_handlers_block_by_func (model,
+        midori_bookmarks_row_changed_cb,
+        bookmarks);
+
+    if (KATZE_ITEM_IS_BOOKMARK (item))
+    {
+        gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item), -1);
 
-    sqlite3_free (sqlcmd);
-    g_free (new_parentid);
-    g_free (id);
+        gtk_tree_store_set(model, iter,
+            0, item, 1, tooltip, -1);
+
+        g_free (tooltip);
+    }
+    else
+    {
+        gtk_tree_store_set(model, iter,
+            0, item, -1);
+    }
 
-    return seq;
+    g_signal_handlers_unblock_by_func (model,
+        midori_bookmarks_row_changed_cb,
+        bookmarks);
 }
 
 static void
@@ -321,11 +356,94 @@ midori_bookmarks_add_item_cb (KatzeArray*      array,
                               KatzeItem*       item,
                               MidoriBookmarks* bookmarks)
 {
-    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);
+    midori_bookmarks_add_item (item, bookmarks);
+}
+
+
+static void
+midori_bookmarks_add_item (KatzeItem*       item,
+                           MidoriBookmarks* bookmarks)
+{
+    gint64 parentid = katze_item_get_meta_integer (item, "parentid");
+    GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
+    GtkTreeIter iter;
+
+    if (parentid == -1)
+    {
+        midori_bookmarks_add_item_to_model (GTK_TREE_STORE (model), NULL, item);
+    }
+    else if (midori_bookmarks_reach_item (model, &iter, parentid))
+    {
+        GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
+
+        if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (bookmarks->treeview), path))
+        {
+            midori_bookmarks_add_item_to_model (GTK_TREE_STORE (model), &iter, item);
+        }
+
+        gtk_tree_path_free (path);
+    }
+}
+
+static void
+midori_bookmarks_update_item_cb (KatzeArray*      array,
+                                KatzeItem*       item,
+                                MidoriBookmarks* bookmarks)
+{
+    gint64 id = katze_item_get_meta_integer (item, "id");
+    gint64 parentid = katze_item_get_meta_integer (item, "parentid");
+    GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
+    GtkTreeIter iter;
+
+    if (midori_bookmarks_reach_item (model, &iter, id))
+    {
+        gint64 old_parentid = 0;
+        GtkTreeIter parent;
+
+        if (gtk_tree_model_iter_parent (model, &parent, &iter))
+        {
+            KatzeItem* old_parent;
+
+            gtk_tree_model_get (model, &parent, 0, &old_parent, -1);
+
+            old_parentid = katze_item_get_meta_integer (old_parent, "id");
+
+            g_object_unref (old_parent);
+
+            if (parentid == old_parentid)
+            {
+                midori_bookmarks_update_item_in_model (bookmarks, GTK_TREE_STORE (model), &iter, item);
+            }
+            else
+            {
+                gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+
+                if (!gtk_tree_model_iter_has_child (model, &parent))
+                {
+                    GtkTreePath* path = gtk_tree_model_get_path(model, &parent);
+
+                    if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (bookmarks->treeview), path))
+                        gtk_tree_view_collapse_row (GTK_TREE_VIEW (bookmarks->treeview), path);
+
+                    gtk_tree_path_free (path);
+                }
+
+                midori_bookmarks_add_item (item, bookmarks);
+            }
+        }
+        else if (parentid == 0)
+        {
+            midori_bookmarks_update_item_in_model (bookmarks, GTK_TREE_STORE (model), &iter, item);
+        }
+        else
+        {
+            gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+
+            midori_bookmarks_add_item (item, bookmarks);
+        }
+    }
+    else
+        midori_bookmarks_add_item (item, bookmarks);
 }
 
 static void
@@ -333,10 +451,33 @@ midori_bookmarks_remove_item_cb (KatzeArray*      array,
                                  KatzeItem*       item,
                                  MidoriBookmarks* bookmarks)
 {
+    gint64 id = katze_item_get_meta_integer (item, "id");
     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);
+    GtkTreeIter iter;
+
+    if (midori_bookmarks_reach_item (model, &iter, id))
+    {
+        GtkTreeIter parent;
+
+        if (gtk_tree_model_iter_parent (model, &parent, &iter))
+        {
+            gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+
+            if (!gtk_tree_model_iter_has_child (model, &parent))
+            {
+                GtkTreePath* path = gtk_tree_model_get_path(model, &parent);
+
+                if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (bookmarks->treeview), path))
+                    gtk_tree_view_collapse_row (GTK_TREE_VIEW (bookmarks->treeview), path);
+
+                gtk_tree_path_free (path);
+            }
+        }
+        else
+        {
+            gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+        }
+    }
 }
 
 static void
@@ -376,9 +517,17 @@ midori_bookmarks_row_changed_cb (GtkTreeModel*    model,
     else
         parentid = 0;
 
-    katze_array_remove_item (bookmarks->array, item);
     katze_item_set_meta_integer (item, "parentid", parentid);
-    katze_array_add_item (bookmarks->array, item);
+
+    g_signal_handlers_block_by_func (bookmarks->bookmarks_db,
+        midori_bookmarks_update_item_cb,
+        bookmarks);
+
+    midori_bookmarks_db_update_item (bookmarks->bookmarks_db, item);
+
+    g_signal_handlers_unblock_by_func (bookmarks->bookmarks_db,
+        midori_bookmarks_update_item_cb,
+        bookmarks);
 
     g_object_unref (item);
     if (new_parent)
@@ -386,14 +535,55 @@ midori_bookmarks_row_changed_cb (GtkTreeModel*    model,
 }
 
 static void
-midori_bookmarks_add_clicked_cb (GtkWidget* toolitem)
+midori_bookmarks_add_clicked_cb (GtkWidget* toolitem,
+                                                 MidoriBookmarks* bookmarks)
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (toolitem);
-    /* FIXME: Take selected folder into account */
+    GtkTreeView* treeview = GTK_TREE_VIEW (bookmarks->treeview);
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    KatzeItem* parent = NULL;
+
+    if (katze_tree_view_get_selected_iter (treeview,
+            &model, &iter))
+    {
+        gboolean done = FALSE;
+        while (!done)
+        {
+            gtk_tree_model_get (model, &iter, 0, &parent, -1);
+
+            if (KATZE_ITEM_IS_FOLDER (parent))
+            {
+                GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
+
+                if (!gtk_tree_view_row_expanded (treeview, path))
+                    gtk_tree_view_expand_row (treeview, path, FALSE);
+
+                gtk_tree_path_free (path);
+                done = TRUE;
+            }
+            else
+            {
+                GtkTreeIter child = iter;
+
+                if (parent) g_object_unref (parent);
+                parent = NULL;
+
+                if (!gtk_tree_model_iter_parent (model, &iter, &child))
+                {
+                    done = TRUE;
+                }
+            }
+        }
+    }
+
     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, parent, TRUE, TRUE, toolitem);
     else
-        midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE, toolitem);
+        midori_browser_edit_bookmark_dialog_new (browser, parent, TRUE, FALSE, toolitem);
+
+    if (parent)
+        g_object_unref (parent);
 }
 
 static void
@@ -408,24 +598,15 @@ 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);
-        }
-
         g_object_unref (item);
     }
 }
@@ -441,45 +622,104 @@ 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)
+static gchar* 
+midori_bookmarks_statusbar_bookmarks_str (gint count)
+{
+    if (!count)
+        return NULL;
+
+    /* i18n: [n] bookmark(s) */
+    return g_strdup_printf (ngettext ("%d bookmark", "%d bookmarks", count), count);
+}
+
+static gchar* 
+midori_bookmarks_statusbar_subfolders_str (gint count)
 {
-    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"));
+    if (!count)
+        return NULL;
+
+    /* i18n: [n] subfolder(s) */
+    return g_strdup_printf (ngettext ("%d subfolder", "%d subfolders", count), count);
+}
+
+static void
+midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks)
+{
+    gchar* text = NULL;
+
+    if (bookmarks->hovering_item)
+    {
+        KatzeItem* item = bookmarks->hovering_item;
+
+        g_assert (!KATZE_ITEM_IS_SEPARATOR (item));
+
+        if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            gint child_folders_count = midori_bookmarks_db_count_recursive (bookmarks->bookmarks_db,
+                "uri = ''", NULL, item, FALSE);
+            gint child_bookmarks_count = midori_bookmarks_db_count_recursive (bookmarks->bookmarks_db,
+                "uri <> ''", NULL, item, FALSE);
+            gchar* child_folders_str = midori_bookmarks_statusbar_subfolders_str (child_folders_count);
+            gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+
+            if (!child_bookmarks_count && !child_folders_count)
+                /* i18n: Empty folder */
+                text = g_strdup_printf (_("Empty folder"));
+            else if (!child_bookmarks_count && (child_folders_count >= 1))
+                /* i18n: Folder containing [[n] folder(s)] and no bookmark */
+                text = g_strdup_printf (_("Folder containing %s and no bookmark"),
+                    child_folders_str);
+            else if ((child_bookmarks_count >= 1) && !child_folders_count)
+                /* i18n: Folder containing [[n] bookmark(s)] */
+               text = g_strdup_printf (_("Folder containing %s"), child_bookmarks_str);
+            else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+                /* i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)] */
+                text = g_strdup_printf (_("Folder containing %s and %s"),
+                    child_bookmarks_str, child_folders_str);
+
+            g_free (child_folders_str);
+            g_free (child_bookmarks_str);
+        }
+        else if (KATZE_ITEM_IS_BOOKMARK (item))
+        {
+            const gchar* uri = katze_item_get_uri (item);
+
+            /* i18n: Bookmark leading to: [bookmark uri] */
+            text = g_strdup_printf (_("Bookmark leading to: %s"), uri);
+        }
+    }
     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);
+        gint child_folders_count = midori_bookmarks_db_count_recursive (bookmarks->bookmarks_db,
+            "uri = ''", NULL, NULL, FALSE);
+        gint child_bookmarks_count = midori_bookmarks_db_count_recursive (bookmarks->bookmarks_db,
+            "uri <> ''", NULL, NULL, FALSE);
+        gchar* child_folders_str = midori_bookmarks_statusbar_subfolders_str (child_folders_count);
+        gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+        
+        if (!child_bookmarks_count && (child_folders_count >= 1))
+            /* i18n: [[n] folder(s)] and no bookmark */
+            text = g_strdup_printf (_("%s and no bookmark"),
+                child_folders_str);
+        else if ((child_bookmarks_count >= 1) && !child_folders_count)
+            text = g_strdup (child_bookmarks_str);
+        else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+            /* i18n: [[n] bookmark(s)] and [[n] folder(s)] */
+            text = g_strdup_printf (_("%s and %s"),
+                child_bookmarks_str, child_folders_str);
+        
+        g_free (child_folders_str);
+        g_free (child_bookmarks_str);
     }
 
-    sqlite3_free (sqlcmd);
-    g_free (parentid);
-
-    return updated;
+    if (text)
+    {
+        MidoriBrowser* browser = midori_browser_get_for_widget (bookmarks->treeview);
+        
+        g_object_set (browser, "statusbar-text", text, NULL);
+        
+        g_free(text);
+    }
 }
 
 static void
@@ -496,13 +736,8 @@ midori_bookmarks_delete_clicked_cb (GtkWidget*       toolitem,
 
         gtk_tree_model_get (model, &iter, 0, &item, -1);
 
-        /* Manually remove the iter and block clearing the treeview */
-        gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
-        g_signal_handlers_block_by_func (bookmarks->array,
-            midori_bookmarks_remove_item_cb, bookmarks);
-        katze_array_remove_item (bookmarks->array, item);
-        g_signal_handlers_unblock_by_func (bookmarks->array,
-            midori_bookmarks_remove_item_cb, bookmarks);
+        midori_bookmarks_db_remove_item (bookmarks->bookmarks_db, item);
+
         g_object_unref (item);
     }
 }
@@ -518,8 +753,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
-        gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
         bookmarks->toolbar = toolbar;
         toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
         gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
@@ -547,6 +780,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         gtk_widget_show (GTK_WIDGET (toolitem));
         bookmarks->delete = GTK_WIDGET (toolitem);
         midori_bookmarks_toolbar_update (bookmarks);
+        midori_bookmarks_statusbar_update (bookmarks);
         toolitem = gtk_separator_tool_item_new ();
         gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE);
         gtk_tool_item_set_expand (toolitem, TRUE);
@@ -585,9 +819,9 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
     GtkTreeModel* model;
 
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
-    if (bookmarks->array)
+    if (bookmarks->bookmarks_db)
     {
-        g_object_unref (bookmarks->array);
+        g_object_unref (bookmarks->bookmarks_db);
         gtk_tree_store_clear (GTK_TREE_STORE (model));
     }
     katze_assign (bookmarks->app, app);
@@ -595,13 +829,15 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
         return;
 
     g_object_ref (app);
-    bookmarks->array = katze_object_get_object (app, "bookmarks");
+    bookmarks->bookmarks_db = 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",
-                      G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks);
-    g_signal_connect (bookmarks->array, "remove-item",
+    g_signal_connect_after (bookmarks->bookmarks_db, "add-item",
+                            G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks);
+    g_signal_connect_after (bookmarks->bookmarks_db, "update-item",
+                            G_CALLBACK (midori_bookmarks_update_item_cb), bookmarks);
+    g_signal_connect (bookmarks->bookmarks_db, "remove-item",
                       G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks);
-    g_signal_connect (bookmarks->array, "update",
+    g_signal_connect (bookmarks->bookmarks_db, "update",
                       G_CALLBACK (midori_bookmarks_update_cb), bookmarks);
     g_signal_connect_after (model, "row-changed",
                             G_CALLBACK (midori_bookmarks_row_changed_cb),
@@ -745,7 +981,10 @@ midori_bookmarks_popup_item (GtkWidget*       menu,
     else if (!KATZE_ITEM_IS_FOLDER (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks);
+    if (callback)
+        g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks);
+    else
+        gtk_widget_set_sensitive (menuitem, FALSE);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);
 }
@@ -780,7 +1019,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
         KatzeArray* array;
 
         array = midori_bookmarks_read_from_db (bookmarks,
-                katze_item_get_meta_integer (item, "parentid"), NULL);
+                katze_item_get_meta_integer (item, "id"), NULL);
 
         g_return_if_fail (KATZE_IS_ARRAY (array));
         KATZE_ARRAY_FOREACH_ITEM (child, array)
@@ -792,6 +1031,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
                 midori_browser_set_current_tab_smartly (browser, view);
             }
         }
+        g_object_unref (G_OBJECT (array));
     }
     else if ((uri = katze_item_get_uri (item)) && *uri)
     {
@@ -831,9 +1071,15 @@ midori_bookmarks_popup (GtkWidget*       widget,
 
     menu = gtk_menu_new ();
     if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        gint child_bookmarks_count = midori_bookmarks_db_count_recursive (bookmarks->bookmarks_db,
+            "uri <> ''", NULL, item, FALSE);
+
         midori_bookmarks_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
+            STOCK_TAB_NEW, _("Open all in _Tabs"), item, 
+            (!child_bookmarks_count ? NULL : midori_bookmarks_open_in_tab_activate_cb), 
+            bookmarks);
+    }
     else
     {
         midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
@@ -960,6 +1206,103 @@ midori_bookmarks_selection_changed_cb (GtkTreeSelection *treeview,
     midori_bookmarks_toolbar_update (bookmarks);
 }
 
+static KatzeItem*
+midori_bookmarks_get_item_at_pos (GtkTreeView *treeview,
+                                  gint x, gint y)
+{    
+    GtkTreeModel* model = gtk_tree_view_get_model (treeview);
+    GtkTreePath* path;
+    GtkTreeIter iter;
+    KatzeItem* item = NULL;
+
+    gtk_tree_view_get_path_at_pos (treeview, x, y,
+                                   &path, NULL, NULL, NULL);
+    
+    if (!path)
+        return NULL;
+    
+    if (gtk_tree_model_get_iter (model, &iter, path))
+        gtk_tree_model_get (model, &iter, 0, &item, -1);
+    
+    gtk_tree_path_free (path);
+
+    return item;
+}
+
+static gboolean
+midori_bookmarks_enter_notify_event_cb (GtkTreeView      *treeview,
+                                        GdkEventCrossing *event,
+                                        MidoriBookmarks  *bookmarks)
+{
+    KatzeItem* item = midori_bookmarks_get_item_at_pos (treeview, event->x, event->y);
+
+    if (bookmarks->hovering_item)
+        g_object_unref (bookmarks->hovering_item);
+
+    bookmarks->hovering_item = item;
+
+    midori_bookmarks_statusbar_update (bookmarks);
+
+    return FALSE;
+}
+
+static gboolean
+midori_bookmarks_motion_notify_event_cb (GtkTreeView     *treeview,
+                                         GdkEventMotion  *event,
+                                         MidoriBookmarks *bookmarks)
+{
+    gboolean item_changed;
+    KatzeItem* item;
+    gint x;
+    gint y;
+
+    if (event->is_hint)
+        gtk_widget_get_pointer (GTK_WIDGET (treeview), &x, &y);
+    else
+    {
+        x = event->x;
+        y = event->y;
+    }
+
+    item = midori_bookmarks_get_item_at_pos (treeview, x, y);
+
+    item_changed = (bookmarks->hovering_item != item) ? TRUE : FALSE;
+
+    if (!item_changed)
+    {
+        if (item)
+            g_object_unref (item);
+    }
+    else
+    {
+        if (bookmarks->hovering_item)
+            g_object_unref (bookmarks->hovering_item);
+
+        bookmarks->hovering_item = item;
+
+        midori_bookmarks_statusbar_update (bookmarks);
+    }
+
+    return FALSE;
+}
+
+static gboolean
+midori_bookmarks_leave_notify_event_cb (GtkTreeView      *treeview,
+                                        GdkEventCrossing *event,
+                                        MidoriBookmarks  *bookmarks)
+{
+    MidoriBrowser* browser = midori_browser_get_for_widget (bookmarks->treeview);
+
+    if (bookmarks->hovering_item)
+        g_object_unref (bookmarks->hovering_item);
+    
+    bookmarks->hovering_item = NULL;
+
+    g_object_set (browser, "statusbar-text", "", NULL);
+
+    return FALSE;
+}
+
 static gboolean
 midori_bookmarks_filter_timeout_cb (gpointer data)
 {
@@ -1047,7 +1390,17 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
                       midori_bookmarks_row_expanded_cb, bookmarks,
                       "signal::row-collapsed",
                       midori_bookmarks_row_collapsed_cb, bookmarks,
+                      "signal::enter-notify-event",
+                      midori_bookmarks_enter_notify_event_cb, bookmarks,
+                      "signal::motion-notify-event",
+                      midori_bookmarks_motion_notify_event_cb, bookmarks,
+                      "signal::leave-notify-event",
+                      midori_bookmarks_leave_notify_event_cb, bookmarks,
                       NULL);
+    gtk_widget_add_events (GTK_WIDGET (treeview), 
+                           GDK_POINTER_MOTION_MASK
+                           | GDK_POINTER_MOTION_HINT_MASK);
+
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (midori_bookmarks_selection_changed_cb),
@@ -1055,6 +1408,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
     gtk_widget_show (treeview);
     gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0);
     bookmarks->treeview = treeview;
+    bookmarks->hovering_item = NULL;
 }
 
 static void
@@ -1064,5 +1418,6 @@ midori_bookmarks_finalize (GObject* object)
 
     if (bookmarks->app)
         g_object_unref (bookmarks->app);
+    if (bookmarks->hovering_item)
+       g_object_unref (bookmarks->hovering_item);
 }
-
index d6f1d90bf8dfa0f6dc405412487c245bf91785e4..0c1609532878a820c24938ab3350ea1463727866 100644 (file)
@@ -37,20 +37,6 @@ typedef struct _MidoriBookmarksClass           MidoriBookmarksClass;
 GType
 midori_bookmarks_get_type               (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);
-
-gboolean
-midori_bookmarks_update_item_db (sqlite3*   db,
-                                 KatzeItem* item);
-
 G_END_DECLS
 
 #endif /* __MIDORI_BOOKMARKS_PANEL_H__ */
index c6e36a7e74fc0acb49d13d7b4d00bacb0bbabbb8..f0ab2c8bc75ae8e31a89a98a3887aa8ebed8283a 100644 (file)
@@ -104,8 +104,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions)
         GtkWidget* toolbar;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
-
         MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
     }
 
index e262d077fa90553d1631cc6db5f62aa3ddc885b6..5d6f2e656dfb28ad40d2ce9e2cdf4d4838d98a6c 100644 (file)
@@ -117,37 +117,12 @@ 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);
@@ -167,31 +142,7 @@ midori_history_format_date (KatzeItem *item)
         sdate = g_date_time_format (then, "%x");
     g_date_time_unref (now);
     g_date_time_unref (then);
-    #else
-    gchar token[50];
-    time_t current_time;
-
-    current_time = time (NULL);
-    age = sokoke_days_between ((time_t*)&day, &current_time);
 
-    /* A negative age is a date in the future, the clock is probably off */
-    if (age < -1)
-        sdate = g_strdup ("");
-    else if (age > 7 || age < 0)
-    {
-        strftime (token, sizeof (token), "%x", localtime ((time_t*)&day));
-        sdate = g_strdup (token);
-    }
-    else if (age > 6)
-        sdate = g_strdup (_("A week ago"));
-    else if (age > 1)
-        sdate = g_strdup_printf (ngettext ("%d day ago",
-            "%d days ago", (gint)age), (gint)age);
-    else if (age == 0)
-        sdate = g_strdup (_("Today"));
-    else
-        sdate = g_strdup (_("Yesterday"));
-    #endif
     return sdate;
 }
 
@@ -401,7 +352,6 @@ midori_history_get_toolbar (MidoriViewable* viewable)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         history->toolbar = toolbar;
         toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
@@ -467,7 +417,6 @@ 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 (
@@ -476,10 +425,8 @@ midori_history_add_item_cb (KatzeArray*    array,
             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, &current_time) == 0;
-        #endif
         g_object_unref (today);
+
         if (has_today)
         {
             gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item), -1);
@@ -715,7 +662,6 @@ midori_history_open_in_tab_activate_cb (GtkWidget*     menuitem,
 {
     KatzeItem* item;
     const gchar* uri;
-    guint n;
 
     item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
     if (KATZE_ITEM_IS_FOLDER (item))
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7420234
--- /dev/null
@@ -0,0 +1,24 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+include(FindGettext)
+if (GETTEXT_FOUND)
+    set(LANGUAGES $ENV{LINGUAS})
+    if (NOT LANGUAGES)
+        file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
+        string(REPLACE ".po" " " LANGUAGES ${POTFILES})
+    endif ()
+    message(STATUS "gettext found: ${LANGUAGES}")
+    string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
+    if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
+        GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/midori.pot" ALL ${POTFILES})
+    else()
+        foreach(LANG ${LANGUAGES})
+            GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
+                    DESTINATION "${CMAKE_INSTALL_FULL_LOCALEDIR}/${LANG}/LC_MESSAGES"
+                    RENAME "${GETTEXT_PACKAGE}.mo")
+            endforeach ()
+    endif()
+else ()
+    message(STATUS "gettext not found")
+endif ()
index d7021f331226b21c6688fcb27bb36d2e8a33b3e2..15ef7685d4ebac2e1b6875a11a41dd1012acc64c 100644 (file)
@@ -5,19 +5,23 @@ data/midori-private.desktop.in
 midori/main.c
 midori/midori-app.c
 midori/midori-array.c
+midori/midori-bookmarksdatabase.vala
 midori/midori-browser.c
+midori/midori-database.vala
 midori/midori-extension.c
 midori/midori-locationaction.c
 midori/midori-panel.c
 midori/midori-settings.vala
 midori/midori-websettings.c
 midori/midori-tab.vala
+midori/midori-notebook.vala
 midori/midori-view.c
 midori/midori-download.vala
 midori/midori-speeddial.vala
 midori/midori-preferences.c
 midori/midori-searchaction.c
 midori/midori-historycompletion.vala
+midori/midori-historydatabase.vala
 midori/midori-searchcompletion.vala
 midori/sokoke.c
 toolbars/midori-findbar.c
@@ -25,7 +29,6 @@ panels/midori-bookmarks.c
 panels/midori-extensions.c
 panels/midori-history.c
 katze/katze-http-auth.c
-katze/katze-throbber.c
 katze/katze-utils.c
 katze/katze-item.c
 katze/katze-array.c
@@ -33,7 +36,6 @@ 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
 extensions/cookie-manager/cookie-manager.c
@@ -41,40 +43,44 @@ extensions/cookie-manager/cookie-manager-page.c
 extensions/cookie-manager/main.c
 extensions/copy-tabs.c
 extensions/delayed-load.vala
+extensions/about.vala
+extensions/devpet.vala
 extensions/external-download-manager.vala
+extensions/open-with.vala
 extensions/feed-panel/feed-atom.c
 extensions/feed-panel/feed-panel.c
 extensions/feed-panel/feed-parse.c
 extensions/feed-panel/feed-rss.c
+extensions/feed-panel/katze-net.c
 extensions/feed-panel/main.c
 extensions/formhistory/formhistory.c
 extensions/formhistory/formhistory-gdom-frontend.c
-extensions/formhistory/formhistory-js-frontend.c
 extensions/history-list.vala
+extensions/nojs/nojs-preferences.c
+extensions/nojs/nojs-view.c
+extensions/nojs/nojs.c
 extensions/mouse-gestures.c
 extensions/shortcuts.c
 extensions/status-clock.c
 extensions/statusbar-features.c
 extensions/tab-panel.c
 extensions/tabs-minimized.c
+extensions/tabs2one.c
 extensions/toolbar-editor.c
-extensions/web-cache.c
-katze/katze-net.c
+katze/katze-cellrenderercomboboxtext.c
 katze/midori-hsts.vala
 katze/katze-separatoraction.vala
 katze/gtk3-compat.c
-katze/katze-http-cookies-sqlite.c
-katze/katze-http-cookies.c
-midori/socket.c
 midori/midori-panedaction.vala
 midori/midori-privatedata.c
 midori/midori-dialog.vala
 midori/midori-completion.vala
+midori/midori-contextaction.vala
 midori/midori-viewable.vala
 midori/midori-extensions-column.vala
 midori/midori-viewcompletion.vala
 midori/midori-history.c
-midori/midori-bookmarks.c
+midori/midori-bookmarks-db.c
 midori/midori-session.c
 extensions/nsplugin-manager.vala
 midori/midori-frontend.c
@@ -85,3 +91,19 @@ extensions/cookie-permissions/cookie-permission-manager.h
 extensions/cookie-permissions/main.c
 extensions/apps.vala
 extensions/transfers.vala
+extensions/tabby.vala
+extensions/flummi.vala
+extensions/notes.vala
+extensions/adblock/extension.vala
+extensions/adblock/filter.vala
+extensions/adblock/keys.vala
+extensions/adblock/pattern.vala
+extensions/adblock/options.vala
+extensions/adblock/whitelist.vala
+extensions/adblock/subscriptions.vala
+extensions/adblock/config.vala
+extensions/adblock/updater.vala
+extensions/adblock/element.vala
+extensions/adblock/widgets.vala
+extensions/domain-keys.vala
+extensions/webmedia-now-playing.vala
diff --git a/po/af.po b/po/af.po
new file mode 100644 (file)
index 0000000..578b73f
--- /dev/null
+++ b/po/af.po
@@ -0,0 +1,3427 @@
+# Afrikaans translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-10-07 15:00+0000\n"
+"Last-Translator: Deavmi <deavmi@gmail.com>\n"
+"Language-Team: Afrikaans <af@li.org>\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-Launchpad-Export-Date: 2014-11-26 05:58+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web Blaaier"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Blaaier"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Besoek die Web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Verkenner"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nuwe Blad"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nuwe Venster"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nuwe Privaat Blaaier Venster"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Privaat Blaaier"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privaat Blaaier"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Skep 'n nuwe private blaaivenster"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Momentopname gestoor na: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Begin ADRES as 'n web-program"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRES"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Gebruik GIDS as opset gids"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "GIDS"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Private blaai, geen veranderings word gestoor"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Draagbare wyse, alle looptyd lêers in een plek gestoor"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Gewone GTK + venster met WebKit, soortgelyk aan GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Wys 'n diagnostiese dialoog"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Begin binne gdb en stoor 'n sleepspoor op programsbreuk"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Voer die gespesifiseerde lêernaam uit as javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Neem 'n momentopname van die gespesifiseerde URI"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Voer die gespesifiseerde bevel uit"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Lys van beskikbare opdragte om uit te voer met -e / --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Vertoon program se weergawenommer"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adresse"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blok URIs volgens gewone uitdrukking PATTERN"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PATROON"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Herstel Midori ná SECONDS sekondes van onaktiwiteit"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKONDES"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Fout: \"gdb\" kan nie gevind word nie\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Meld asseblief kommentaar, voorstelle en foute na:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Kyk vir nuwe weergawes by:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "'n Onbekende fout het voorgekom"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Boekmerke"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Voeg Boe_kmerk by"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Uitbreidings"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Verlede"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Gebruikerskrifte"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Gebruiker_style"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Nuwe_Blad"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Oorplasings"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape_Inproppe"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Toegemaakte Blaaie"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nuwe_Venster"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Nuwe_Gids"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresse]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Lêer nie gevind nie."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Misvormde dokument."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Onherkenbare boekmerk formaat."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Gaan vorentoe na die volgende bladsy"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Gaan na die volgende sub-bladsy"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Web Soek..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Herlaai die huidige bladsy"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Stop laaiïng van die huidige bladsy"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Opdatering van titel het misluk: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Waarde '%s' is ongeldig vir %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Onverwagte instelling '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Onverwagte aksie '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Private Blaaier)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Kon nie nuwe geskiedenis item byvoeg nie: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Selekteer [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Boekmerke"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Nuwe Gids"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Wysig Gids"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nuwe Boekmerk"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Wysig Boekmerk"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Tik 'n naam vir hierdie boekmerk, en kies waar om dit te hou."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Tik 'n naam vir hierdie gids, en kies waar om dit te hou."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Vertoon in Boekmerk_Balk"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Voeg by _Spoed Bell"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Stoor lêer as"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Stoor verwante _hulpbronne"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "'N nuwe venster is oop"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "'N nuwe blad is oop"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Fout met die oopmaak van die beeld!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Kan nie die geselekteerde beeld in 'n standaard kyker oop maak nie."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Fout met die aflaai van die beeld!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Deavmi https://launchpad.net/~deavmi\n"
+"  Jacques Strydom https://launchpad.net/~jacquesafro\n"
+"  Jaycee Lock https://launchpad.net/~jaycee-lock"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/am.po b/po/am.po
new file mode 100644 (file)
index 0000000..1df6d9f
--- /dev/null
+++ b/po/am.po
@@ -0,0 +1,3426 @@
+# Amharic translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-01-26 11:04+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Amharic <am@li.org>\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-Launchpad-Export-Date: 2014-11-26 05:58+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Gebriel Abebe https://launchpad.net/~gabrielabebe\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 3d474f1bdd2b014ef66ed238e23386fe7ff5dc70..990819d069a8a680322384a914bda379d04fae09 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,338 +7,372 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-02 11:15+0000\n"
-"PO-Revision-Date: 2013-02-03 13:22+0000\n"
-"Last-Translator: كريم أولاد الشلحة <herr.linux88@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:47+0000\n"
+"Last-Translator: axlrose112 <axlrose112@gmail.com>\n"
 "Language-Team: Arabic <herr.linux88@gmail.com>\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 && n % 100 <= 99 ? 4 : 5;\n"
+"X-Launchpad-Export-Date: 2014-11-27 05:45+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
+"X-Poedit-Country: MOROCCO\n"
 "Language: ar\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-Poedit-Language: Arabic\n"
-"X-Poedit-Country: MOROCCO\n"
-"X-Generator: Lokalize 1.5\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "تصفّح الإنترنت"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "ميدوري"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "شبكة الإنترنت؛WWW؛إكسبلورر"
+msgid "Web Browser"
+msgstr "متصفح الويب"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:138 ../midori/main.c:151
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201
-msgid "Midori"
-msgstr "ميدوري"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "ميدورى مُتصفح الويب"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "مستعرض الويب ميدوري"
+msgid "Browse the Web"
+msgstr "تصفح الويب"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "نافذة التصفح الخاص الجديدة"
+msgid "Internet;WWW;Explorer"
+msgstr "شبكة الإنترنت؛WWW؛إكسبلورر"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
-msgstr "تبÙ\88Ù\8aب Ø¬Ø¯Ù\8aد"
+msgstr "صÙ\81حة Ø¬Ø¯Ù\8aدة"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
-msgstr "نافذة جديدة"
+msgstr "نافذه جديده"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ù\85تصÙ\81Ø­ Ø§Ù\84Ù\88ب"
+msgid "New Private Browsing Window"
+msgstr "Ù\86اÙ\81Ø°Ù\87 ØªØµÙ\81Ø­ Ø®Ø§ØµØ© Ø¬Ø¯Ù\8aدة"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
-msgstr "متصفح ميدوري الخاص"
+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:3925
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "التصفح الخاص"
 
-#: ../midori/main.c:62
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "فتح نافذه تصفح خاص جديده"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
-msgstr "Ø­Ù\81ظ Ù\84Ù\82طة Ù\81Ù\8a : %s\n"
+msgstr "Ø­Ù\8fÙ\81ظت Ø§Ù\84Ù\84Ù\82Ø·Ù\87 Ù\81Ù\89 : %s\n"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "شغل العنوان كتطبيق وب"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "ADDRESS"
-msgstr "عنوان"
+msgstr "اÙ\84عÙ\86Ù\88اÙ\86"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "إستعمل المجلد كمجلد إعدادات"
+msgstr "إستعمل المُجلد كـ مُجلد إعدادات"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "FOLDER"
-msgstr "مجلد"
+msgstr "المُجلد"
 
-#: ../midori/main.c:91
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
-msgstr "التصفح الخاص ، لا يتم حفظ أية تغييرات"
+msgstr "فى التصفح الخاص ، لا تُحفظ اى تغيرات"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "وضع المحمولة، كل ملفات وقت التشغيل يتم تخزينها في مكان واحد"
+msgstr ""
+"فى وضع الجولنه ، جميع الملفات التى تنشئ فى وقت التشغيل تُخزن فى مكان واحد"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
-msgstr "نافذة GTK+ خالية مع أدوات، أقرب إلى مطلق GTK"
+msgstr ""
 
-#: ../midori/main.c:99
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
-msgstr "عرض Ø­Ù\88ار التشخيص"
+msgstr "إظÙ\87ار ØµÙ\86دÙ\88Ù\82 التشخيص"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "تشغيل ملف جافا سكريبت على النحو المحدد"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "أخذ لقطة للعنوان المحدد"
 
-#: ../midori/main.c:105
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "تنفيذ الأمر المحدد"
 
-#: ../midori/main.c:107
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "قائمة الأوامر المتوفرة لتنفيذ مع -e/ --execute"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:103
 msgid "Display program version"
-msgstr "إظÙ\87ار Ù\86سخة البرنامج"
+msgstr "إظÙ\87ر Ø¥ØµØ¯Ø§Ø± البرنامج"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:105
 msgid "Addresses"
-msgstr "عناوين"
+msgstr "اÙ\84عÙ\86اÙ\88Ù\8aÙ\86"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "كتلة محددات وفقا للنمط التعبير العادي"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "نموذج"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "إرجاع ميدوري بعد ثوان من الخمول"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "ثواني"
 
-#: ../midori/main.c:152
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "خطأ: لايمكن العثور على \"gdb\"\n"
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "الرجاء الإبلاغ عن التعليقات والاقتراحات والعلل إلى:"
 
-#: ../midori/main.c:154
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "تحقق من توفر إصدار جديد عند:"
 
-#: ../midori/main.c:299
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "حدث خطأ مجهول"
 
-#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "حدث غير متوقع'%s'."
-
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6070
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_علامات"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "أضِف _علامة"
 
-#: ../midori/midori-app.c:1353
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_إمتدادات"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_سجل"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_النصوص البرمجية المستخدمة"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "أنماط المستخدم"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "تب_ويب جديد"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_النقل"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape _ملحقات"
 
-#: ../midori/midori-app.c:1360
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_التبويبات المغلقة"
 
-#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5209
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "نافذة جديدة"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "مج_لد جديد"
 
-#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420
-#: ../midori/midori-app.c:1423
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[عناوين]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "وثيقة مشوهة."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "علامات غير معتمدة الصيغة."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "فشل الكتابة."
-
-#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "المضي قدما إلى الصفحة التالية"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5353
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "انتقل إلى الصفحة الفرعية اللاحقة"
 
-#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5294
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "بحث انترنت"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "تحديث الصفحة الحالية"
 
-#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "إيقاف تحميل الصفحة الحالية"
 
-#: ../midori/midori-browser.c:509
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "فشل تحديث عنوان: %s\n"
 
-#: ../midori/midori-browser.c:604
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "القيمة '%s' غير صالحة ل %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "إعداد غير متوقع '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "حدث غير متوقع'%s'."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (التصفح الخاص)"
 
-#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "فشل في إدراج التاريخ : %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "اختر [النص]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "العلامات"
 
-#: ../midori/midori-browser.c:810
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "مجلد جديد"
 
-#: ../midori/midori-browser.c:810
-msgid "Edit folder"
-msgstr "تحرÙ\8aر المجلد"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "حرر المجلد"
 
-#: ../midori/midori-browser.c:812
-msgid "New bookmark"
-msgstr "علامة حديدة"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "مرجعية جديدة"
 
-#: ../midori/midori-browser.c:812
-msgid "Edit bookmark"
-msgstr "تحرÙ\8aر Ø§Ù\84عÙ\84اÙ\85ة"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "تعدÙ\8aÙ\84 Ø§Ù\84إشارة"
 
-#: ../midori/midori-browser.c:846
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "اكتب اسماً لهذه العلامة، وحدد مكان حفظها."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "كتب إسم لهذه العلامة, و حدد أين تريد الإحتفاظ بها."
 
-#: ../midori/midori-browser.c:902
-msgid "Add to _Speed Dial"
-msgstr "أضف إلى _الحوار السريع"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "كتب إسم لهذا المجلد,  و حدد أين تريد الإحتفاظ به."
 
-#: ../midori/midori-browser.c:908
-msgid "Show in the tool_bar"
-msgstr "أظÙ\87ر Ù\81Ù\8a Ø´Ø±Ù\8aØ· Ø§Ù\84أدÙ\88ات"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "عرض Ø§Ù\84عÙ\84اÙ\85ات Ù\81Ù\8a Ø§Ù\84_شرÙ\8aØ·"
 
-#: ../midori/midori-browser.c:916
-msgid "Run as _web application"
-msgstr "تشغÙ\8aÙ\84 Ù\83تطبÙ\8aÙ\82 Ø§Ù\86ترÙ\86ت"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "أضÙ\81 Ø¥Ù\84Ù\89 _اÙ\84Ø­Ù\88ار Ø§Ù\84سرÙ\8aع"
 
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4447
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "حفظ الملف في"
 
-#: ../midori/midori-browser.c:1036
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "حفظ الموارد المرتبطة بها"
 
-#: ../midori/midori-browser.c:1265
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "تم فتح نافذة جديدة"
 
-#: ../midori/midori-browser.c:1268
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "تم فتح علامة تبويب جديدة"
 
-#: ../midori/midori-browser.c:1285
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "حدث خطأ أثناء فتح الصورة!"
 
-#: ../midori/midori-browser.c:1286
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "لا يمكن فتح الصورة المحددة في العارض الافتراضي."
 
-#: ../midori/midori-browser.c:1292
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "خطأ في تحميل الصورة!"
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "لا يمكن تنزيل الصورة المحددة."
 
-#: ../midori/midori-browser.c:1350
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "حفظ الملف"
 
-#: ../midori/midori-browser.c:2318
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "تحديث الصفحة دون التخزين المؤقت"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "فتح الملف"
 
-#: ../midori/midori-browser.c:2444
+#: ../midori/midori-browser.c:2692
 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"
@@ -351,133 +385,123 @@ msgstr ""
 "ويمكنك أيضاً الذهاب الى تفضيلات، التطبيقات في ميدوري، وحدد مجمع الأخبار. "
 "المرة التالية التي تضغط فوق رمز الأخبار، ستضاف تلقائيا."
 
-#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "تغدية جديدة"
 
-#: ../midori/midori-browser.c:2485 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "أضف علامة جديدة"
 
-#: ../midori/midori-browser.c:3009 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "فارغ"
 
-#: ../midori/midori-browser.c:3404 ../midori/midori-browser.c:3405
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "تبديل نص مؤشر الملاحة"
 
-#: ../midori/midori-browser.c:3407
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
 "الضغط على F7 يفعل التصفح بالمؤشر. عند نشيطه، يظهر مؤشر نص في جميع المواقع."
 
-#: ../midori/midori-browser.c:3410
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_فعّل التصفح بالمؤشر"
 
-#: ../midori/midori-browser.c:3851 ../midori/midori-browser.c:5817
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "فشل في إدراج التاريخ : %s\n"
-
-#: ../midori/midori-browser.c:4179 ../panels/midori-bookmarks.c:840
-#: ../panels/midori-history.c:797
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "فتح الكل في تبويبات"
 
-#: ../midori/midori-browser.c:4186 ../panels/midori-bookmarks.c:846
-#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519
-msgid "Open in New _Tab"
-msgstr "فتح في تبو_يب جديد"
-
-#: ../midori/midori-browser.c:4189 ../midori/midori-view.c:2633
-#: ../midori/midori-view.c:4431 ../panels/midori-bookmarks.c:848
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "افتح في _نافذة جديدة"
 
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4279
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4280
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "أوبرا"
 
-#: ../midori/midori-browser.c:4281
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "كونكيورر"
 
-#: ../midori/midori-browser.c:4282
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "إبِفني"
 
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "فيَرفُكس (%s)"
 
-#: ../midori/midori-browser.c:4284
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "ميدوري 0.2.6"
 
-#: ../midori/midori-browser.c:4302
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "يتم الأن إستيراد العلامات…"
 
-#: ../midori/midori-browser.c:4305 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_إستورد العلامات"
 
-#: ../midori/midori-browser.c:4316
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_تطبيق:"
 
-#: ../midori/midori-browser.c:4381
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "استيراد من ملف HTML أو XBEL"
 
-#: ../midori/midori-browser.c:4409
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "استيراد من ملفّ"
 
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "فشل إستراد العلامات"
 
-#: ../midori/midori-browser.c:4452
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "العلامات XBEL"
 
-#: ../midori/midori-browser.c:4457
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "مفضلة نتسكيب"
 
-#: ../midori/midori-browser.c:4471
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "يمكن لميدوري تصدير فقط XBEL (*.xbel) ونتسكيب (*.html)"
 
-#: ../midori/midori-browser.c:4486
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "فشل تصدير العلامات"
 
-#: ../midori/midori-browser.c:4707
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "متصفح الويب الخفيف."
 
-#: ../midori/midori-browser.c:4708
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "انظر حول:لمعلومات نسخة الإصدار."
 
-#: ../midori/midori-browser.c:4710
+#: ../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 "
@@ -488,428 +512,438 @@ msgstr ""
 "العمومية الصغرى كما نشرت من قبل مؤسسة البرمجيات الحرة ؛ إما الإصدار 2.1 من "
 "الرخصة ، أو (باختيارك) أي إصدار لاحق."
 
-#: ../midori/midori-browser.c:4745
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
-"فريق تعريب إكسفس: "
-"كريم اولاد الشلحة "
-"محمد الحرقان"
+"فريق تعريب إكسفس: كريم اولاد الشلحة محمد الحرقان\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Abdallah Ali Hassan https://launchpad.net/~abdallah-ali-hassan\n"
+"  Fathallah Wael https://launchpad.net/~fathallahwael80\n"
+"  Julian James https://launchpad.net/~reallyhungryhippo\n"
+"  Karim Oulad Chalha https://launchpad.net/~herr-linux\n"
+"  Mohammed  Shammout https://launchpad.net/~fdsmohammed\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  abdXelrhman https://launchpad.net/~popo49-abdo\n"
+"  axlrose112 https://launchpad.net/~axlrose112\n"
+"  zguellit https://launchpad.net/~zguellit\n"
+"  محمد الحرقان https://launchpad.net/~malham1-gmail"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_مضاعفة التبويب الحالي"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_ملف"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "فتح نافذة جديدة"
 
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "فتح تبويب جديد"
 
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "نافذة تصفح جديدة خاصة"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "فتح ملف"
 
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_حفظ الصفحة باسم…"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "حفظ إلى ملف"
 
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "أضف إلى _الحوار السريع"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5228
-msgid "Create _Launcher"
-msgstr "إنشاء مطلق"
-
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "الاشتراك في مصدر أخبار"
 
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_غلق التبويب"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "إغلاق علامة التبويب الحالية"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "غلق التافذة"
 
-#: ../midori/midori-browser.c:5244
-msgid "_Share"
-msgstr "_شارِك"
-
-#: ../midori/midori-browser.c:5245
-msgid "Share this page"
-msgstr "شارك هذا الصفحة"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "اطبع الصفحة الحالية"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "إغلاق جميع النوافذ"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_تحرير"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_العثور على…"
 
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "العثور على كلمة أو عبارة في الصفحة"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "العثور على التالي"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "عث_ور على السابق"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "إعداد تفضيلات التطبيق"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_عرض"
 
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_شريط الأدوات"
 
-#: ../midori/midori-browser.c:5296
-msgid "Reload page without caching"
-msgstr "تحديث الصفحة دون التخزين المؤقت"
-
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "زيادة مستوى التكبير"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "انخفاض مستوى التكبير"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_تشفير"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "عرض المصدر"
 
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "مصدر View _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "إنشاء تصفح"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "تبديل لعرض ملء الشاشة"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "انتقل لليسار"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "انتقل إلى للاسفل"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "انتقل إلى للأعلى"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "انتقل إلى اليمين"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_قابل للقرائة"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_إذهب"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "العودة إلى الصفحة السابقة"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "انتقل إلى الصفحة الفرعية السابقة"
 
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "التالي أو إلى الأمام"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "انتقل إلى الصفحة الفرعية التالية أو الصفحة التالية في السجل"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_الصفحة الرئيسية"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "ذهاب إلى الصفحة الرئيسية"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "أفرغ المهملات"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "تراجع عن إ_غلاق التبويب"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "أضف مجلد جديد"
 
-#: ../midori/midori-browser.c:5377
-msgid "_Export bookmarks"
-msgstr "_صدّر العلامات"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "إستيراد العلامات ..."
 
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_إدارة محركات البحث"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "تصدير العلامات ..."
 
-#: ../midori/midori-browser.c:5383
-msgid "_Clear Private Data"
-msgstr "_حذف البيانات الخاصة"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "إدارة محركات البحث"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "ازالت الملفات الشخصية"
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_معاينة الصفحة"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_التبويب السابق"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_التبويب التالي"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "نقل اللسان إلى المكان الأو_ل"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "نقل علامة التبويب"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_حرك التبويب إلى الأمام"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "نقل اللسان إلى المكان الأ_خير"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "فصل التبويب ال_حالي"
 
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "عرض التركيز التالي"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "أظهر فقط أ_يقونة التبويب الحالي"
 
-#: ../midori/midori-browser.c:5413
-msgid "_Duplicate Current Tab"
-msgstr "_مضاعفة التبويب الحالي"
-
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "أغلق تبويبات أخر_ى"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "فتح آخر جلسة"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_أسئلة شائعة"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_بلغ عن عله…"
 
-#: ../midori/midori-browser.c:5432 ../midori/midori-browser.c:6089
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_أدوات"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_شريط القائمة"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_شريط التصفح"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "لوحة _جانبية"
 
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "لوحة جانبية"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_شريط العلامات"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_شريط الحالة"
 
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:200
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_تلقائي"
 
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "صيني تقليدي (Big5)"
 
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:125
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "صيني مبسّط (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "ياباني (_Shift-JIS)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "كوري (_EUC-KR)"
 
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "روسي (_KOI8-R)"
 
-#: ../midori/midori-browser.c:5483 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "يونيكود (UTF-_8)"
 
-#: ../midori/midori-browser.c:5486 ../midori/midori-websettings.c:130
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "غربي (_ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "مخصص…"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "فشل في تهيئة التاريخ: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_فاصل"
 
-#: ../midori/midori-browser.c:6002
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_موقع…"
 
-#: ../midori/midori-browser.c:6004
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "فتح موقع معين"
 
-#: ../midori/midori-browser.c:6026
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_بحث في الوِب…"
 
-#: ../midori/midori-browser.c:6028
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "شغل البحث في الوب"
 
-#: ../midori/midori-browser.c:6055
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "إعادة فتح تبويب مغلقة سابقا ، أو نافذة"
 
-#: ../midori/midori-browser.c:6072
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "عرض العلامات المحفوظة"
 
-#: ../midori/midori-browser.c:6105
-msgid "_Window"
-msgstr "_النافذة"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_التبويبات"
 
-#: ../midori/midori-browser.c:6107
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "أظهر قائمة كل التبويبات المفتوحة"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_قائمة"
 
-#: ../midori/midori-browser.c:6123
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "قائمة"
 
-#: ../midori/midori-browser.c:6903
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "إعداد غير متوقع '%s'"
-
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "إعدادات الامتداد '%s' لا يمكن تحميلها: %s\n"
 
-#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "إعدادات الامتداد '%s' لا يمكن حفظها: %s\n"
 
-#: ../midori/midori-locationaction.c:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "استورد الشهادة"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "مصدر الشهادات المُوقِّعة غير معروف."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "لا تطابق الشهادة هوية الموقع الذي يتم استردادها منه."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "وقت تفعيل الشهادة في المستقبل."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "الشهادة منتهية"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr "تم إبطال الشهادة وفقا لقائمة GTlsConnection's لإبطال الشهادات."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "خوارزمية الشهادة تعتبر غير آمنة."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "حدثت بعض الأخطاء عند التحقق من صحة الشهادة."
 
@@ -917,28 +951,28 @@ msgstr "حدثت بعض الأخطاء عند التحقق من صحة الشه
 msgid "_Export certificate"
 msgstr "_استورد الشهادة"
 
-#: ../midori/midori-locationaction.c:1434
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "وقّع ذاتيا"
 
-#: ../midori/midori-locationaction.c:1468
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "تفاصيل أمنية"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1555
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "ألصق ثم تابع"
 
-#: ../midori/midori-locationaction.c:1787
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "غير متحقق منه"
 
-#: ../midori/midori-locationaction.c:1795
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "التحقق من الاتصال وتشفيره"
 
-#: ../midori/midori-locationaction.c:1802
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "اتصال مفتوح وغير مشفر"
 
@@ -955,425 +989,432 @@ msgstr "أغلق الشريط"
 msgid "Align sidepanel to the left"
 msgstr "محاذاة اللوحة الجانبية إلى اليسار"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "عرض الطلب السريع"
 
-#: ../midori/midori-websettings.c:107
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "أظهر الصفحة الرئيسية"
 
-#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:339
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "أظهر اخر التبويبات المفتوحة"
 
-#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:338
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "أظهر أخر تبويب بدون تحميل"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "أظهر صفحة فارغة"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "أظهر محرك البحث الإفتراضي"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "ياباني (_Shift-JIS)"
 
-#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "خصص..."
-
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "تبويب جديد"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "نافذة جديدة"
 
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "التبويب الحالي"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "المبدئي"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "أيقونات"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "أيقونات الصغيرة"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "نص"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "أيقونات ونص"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "نص بجانب الأيقونات"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "تلقائي (جنوم أو environment)"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "خادم بروكسي HTTP"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "بدون خادم بروكسي"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "كروم"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "سافاري"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "أي فون"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "فيَرفُكس"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "إنترنت إكسبلورر"
 
-#: ../midori/midori-websettings.c:280
-msgid "Toolbar Style:"
-msgstr "نمط شريط الأدوات:"
-
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "نمط شريط الأدوات"
 
-#: ../midori/midori-websettings.c:290
-msgid "When Midori starts:"
-msgstr "عندما يبدأ ميدوري:"
-
-#: ../midori/midori-websettings.c:327
-msgid "Open new pages in:"
-msgstr "فتح صفحات جديدة في:"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:390
-msgid "Identify as"
-msgstr "تعرف كـ"
-
-#: ../midori/midori-websettings.c:391
-msgid "What to identify as to web pages"
-msgstr "ما اللذي تحديده كصفحات ويب"
-
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "دائماً استخدام الخطوط التي حددت"
 
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "استبدل خطوط المواقع بخطوط تفضيلات المستخدم"
 
-#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "لا يمكن تحميل الإعدادات: %s\n"
 
-#: ../midori/midori-websettings.c:1360
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "القيمة '%s' غير صالحة ل %s"
-
-#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "قيمة الإعدادات '%s' غبر صالحة"
 
-#: ../midori/midori-tab.vala:117
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "فشل في حقن ورقة الانماط: %s"
 
-#: ../midori/midori-view.c:725 ../midori/midori-view.c:866
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "عرض عنوان اللسان"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "عرض أيقونة اللسان فقط"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "إغلاق البوابة على اليمين"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "أغلق التبويب الآخر"
+msgstr[1] "أغلق التبويبان أخر_ان"
+msgstr[2] "أغلق التبويبات الأخر_ى"
+msgstr[3] "أغلق التبويبات الأخر_ى"
+msgstr[4] "أغلق التبويبات الأخر_ى"
+msgstr[5] "أغلق التبويبات الأخر_ى"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "ثق بموقع الويب هذا"
 
-#: ../midori/midori-view.c:864
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "الأمن غير معروف"
 
-#: ../midori/midori-view.c:1162
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s تريد حفظ قاعدة بيانات HTML5."
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_رفض"
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_سماح"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s يريد أن يعرف مكانك."
 
-#: ../midori/midori-view.c:1305
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "لا يمكن إيجاد '%s'"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "لا يمكن تحميل الصفحة '%s':"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "تأكد من عدم وجود الأخطاء الإملائية في العنوان"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"تأكد من ان كابل الشبكة المحلية موصول أو ان بطاقة الشبكة الاسلكية مفعلة"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "تأكد من ان إعدادات الشبكة صحبحة"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "أعِد المحاولة"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "خطأ - %s"
+msgid "Oops - %s"
+msgstr "Ø£Ù\88بس - %s"
 
-#: ../midori/midori-view.c:1306
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Ù\87Ø°Ù\87 Ø§Ù\84صÙ\81حة '%s' Ù\84ا Ù\8aÙ\85Ù\83Ù\86 ØªØ­Ù\85Ù\8aÙ\84Ù\87ا."
+msgid "Something went wrong with '%s'."
+msgstr "Ù\8aÙ\88جد Ø®Ø·Ø£ Ù\85ا Ù\81Ù\8a '%s'."
 
-#: ../midori/midori-view.c:1308
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "حاول مجددا"
 
-#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2574
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "ارسال رسالة إلى %s"
 
-#: ../midori/midori-view.c:2362
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "أضف محرك بحث..."
 
-#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2709
-msgid "Inspect _Element"
-msgstr "تÙ\81Ù\82د Ø¹Ù\86صر"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "اÙ\81تح Ø§Ù\84رابط"
 
-#: ../midori/midori-view.c:2457
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "فتح وصلة جديدة في لسان جديد"
 
-#: ../midori/midori-view.c:2461
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "فتح الرابط في لسان للأمام"
 
-#: ../midori/midori-view.c:2462
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "فتح الرابط في لسان في الخلف"
 
-#: ../midori/midori-view.c:2465
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "فتح الرابط في نافذة جديدة"
 
-#: ../midori/midori-view.c:2468
-msgid "Open Link as Web A_pplication"
-msgstr "فتح الرابط كتطبيق"
-
-#: ../midori/midori-view.c:2473
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "انسخ وجهة الرابط"
 
-#: ../midori/midori-view.c:2479
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "حفظ _ك..."
 
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "إفتح ال_صورة في نافذة جديدة"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "فتح الصورة في لسان جديد"
 
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "نسخ الصورة"
 
-#: ../midori/midori-view.c:2494
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "حفظ الصورة"
 
-#: ../midori/midori-view.c:2497
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "افتح في عارض الصور"
 
-#: ../midori/midori-view.c:2504
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "نسخ عنوان الفيديو"
 
-#: ../midori/midori-view.c:2507
-msgid "Save _Video"
-msgstr "حفظ الفيديو"
-
-#: ../midori/midori-view.c:2507
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "تحميل الفيديو"
 
-#: ../midori/midori-view.c:2533
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "فتح العنوان في لسان جديد"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "بحث باستخدام"
 
-#: ../midori/midori-view.c:2562
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_بحث في الانترنت"
 
-#: ../midori/midori-view.c:2582
-msgid "Open Address in New _Tab"
-msgstr "فتح العنوان في لسان جديد"
-
-#: ../midori/midori-view.c:2629
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "فتح في لسان جديد"
 
-#: ../midori/midori-view.c:2841
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "تفقد عنصر"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "فتح أو تحميل الملف من %s"
 
-#: ../midori/midori-view.c:2854
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "اسم الملف: %s"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "نوع الملف: '%s'"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "نوع الملف: %s ('%s')"
 
-#: ../midori/midori-view.c:2898
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "الحجم: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "فتح %s"
 
-#: ../midori/midori-view.c:3435
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "فحص الصفحة - %s"
 
-#: ../midori/midori-view.c:3850
-#, c-format
-msgid "No documentation installed"
-msgstr "لا توجد وثائق مثبتة"
-
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "لا يخزن ميدوري أي بيانات شخصية:"
 
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "لم يتم حفظ التاريخ أو كعكات الويب."
 
-#: ../midori/midori-view.c:3928
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "تعطيل الملحقات."
 
-#: ../midori/midori-view.c:3929
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "يتم تعطيل تخزين HTML5، قاعدة البيانات المحلية ومخابئ التطبيق."
 
-#: ../midori/midori-view.c:3930
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "ميدوري يمنع المواقع من تعقب المستخدم:"
 
-#: ../midori/midori-view.c:3931
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "تجريد إحالات URLs إلى اسم المضيف."
 
-#: ../midori/midori-view.c:3932
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "تعطيل الجلب المسبق DNS."
 
-#: ../midori/midori-view.c:3933
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "اللغة والمنطقة الزمنية لا يكشف عنها لمواقع ويب."
 
-#: ../midori/midori-view.c:3934
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "لا يمكن إدراج الفلاش وغيرها من إضافات Netscape بالمواقع."
 
-#: ../midori/midori-view.c:4013
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "أرقام إصدار في أقواس تظهر النسخة المستخدمة في التشغيل."
 
-#: ../midori/midori-view.c:4059
-msgid "Page loading delayed"
-msgstr "تأخÙ\8aر ØªØ­Ù\85Ù\8aÙ\84 الصفحة"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "تاخر Ù\81Ù\8a Ù\81تح الصفحة"
 
-#: ../midori/midori-view.c:4060
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "تأخر التحميل إما بسبب انهيار أو تفضيلات بدء التشغيل."
 
-#: ../midori/midori-view.c:4061
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "تحميل الصفحة"
 
-#: ../midori/midori-view.c:4225
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "صفحة فارغة"
 
-#: ../midori/midori-view.c:4435
-msgid "_Duplicate Tab"
-msgstr "_ضاعف اللسان"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Label"
-msgstr "عرض عنوان اللسان"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Icon Only"
-msgstr "عرض أيقونة اللسان فقط"
-
-#: ../midori/midori-view.c:4447
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "أغلق التبويب الآخر"
-msgstr[1] "أغلق التبويبان أخر_ان"
-msgstr[2] "أغلق التبويبات الأخر_ى"
-msgstr[3] "أغلق التبويبات الأخر_ى"
-msgstr[4] "أغلق التبويبات الأخر_ى"
-msgstr[5] "أغلق التبويبات الأخر_ى"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5122
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "السّابق"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5141
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "التّالي"
 
-#: ../midori/midori-view.c:5154
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "طباعة صورة الخلفية"
 
-#: ../midori/midori-view.c:5155
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "إذا كان ينبغي طباعة صور الخلفية"
 
-#: ../midori/midori-view.c:5179
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "الميزّات"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:54
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s لـ %s"
 
-#: ../midori/midori-download.vala:70
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1384,7 +1425,7 @@ msgstr[3] "%d ساعات"
 msgstr[4] "%d ساعات"
 msgstr[5] "%d ساعات"
 
-#: ../midori/midori-download.vala:71
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1395,7 +1436,7 @@ msgstr[3] "%d دقائق"
 msgstr[4] "%d دقائق"
 msgstr[5] "%d دقائق"
 
-#: ../midori/midori-download.vala:72
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1407,27 +1448,27 @@ msgstr[4] "%d ثوان"
 msgstr[5] "%d ثوان"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:87
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s متبقي"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:98
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "؟B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:100
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:197
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "الملف المحمل خاطئ."
 
-#: ../midori/midori-download.vala:198
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1435,164 +1476,152 @@ msgstr ""
 "ارتباط مزود المجموع الاختباري غير متطابق. هذا يعني أن الملف ربما ناقص أو تم "
 "تعديله."
 
-#: ../midori/midori-download.vala:312
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "الملف \"%s\" لا يمكن حفظه في هذا المجلد."
 
-#: ../midori/midori-download.vala:314
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "ليس لديك إذن الكتابة في هذا الموقع."
 
-#: ../midori/midori-download.vala:317
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "لا توجد مساحة حرة كافية لتحميل \"%s\"."
 
-#: ../midori/midori-download.vala:319
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "الملف يحتاج %s ولكن فقط %s مساحة حرة."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "الاتصال السريع"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "انقر لإضافة اختصار"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "أدخل عنوان الاختصار"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "أدخل وسم للاختصار"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "هل أنت متأكد أنك تريد حذف هذا الاختصار؟"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "بدء التشغيل"
 
-#: ../midori/midori-preferences.c:305
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "عندما يبدأ ميدوري:"
+
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "الصفحة الرئيسية:"
 
-#: ../midori/midori-preferences.c:313
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "استخدام الصفحة الحالية"
 
-#: ../midori/midori-preferences.c:317
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "استخدام الصفحة الحالية كصفحة بداية"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "الخطوط"
 
-#: ../midori/midori-preferences.c:328
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "مجموعة خطوط متناسبة"
 
-#: ../midori/midori-preferences.c:332
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "استخدم مجموعة الخط الافتراضي لعرض النص"
 
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "حجم الخط الافتراضي المستخدم لعرض النص"
 
-#: ../midori/midori-preferences.c:337
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "عرض مجموعة خط ثابتة"
 
-#: ../midori/midori-preferences.c:341
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "مجموعة الخطوط المستخدمة لعرض النص ثابت العرض"
 
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "حجم الخط المستخدم لعرض النص ثابت العرض"
 
-#: ../midori/midori-preferences.c:346
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "حجم الخط الأدنى"
 
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "حجم الخط الأدنى المستخدم لعرض النص"
 
-#: ../midori/midori-preferences.c:354
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "الترميز المفضل"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "السلوك"
 
-#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "تحميل الصور تلقائيا"
 
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "تمكين التدقيق الإملائي"
 
-#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "تمكين النصوص البرمجية"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال"
 
-#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "تمكين إضافات نتسكيب"
-
-#: ../midori/midori-preferences.c:393
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "تكبير النص والصور"
 
-#: ../midori/midori-preferences.c:396
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "السماح للنصول البرمجية بفتح النوافذ المنبثقة"
 
-#: ../midori/midori-preferences.c:397
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "حتى لو كان مسموحا للنصوص البرمجية لفتح النوافذ المنبثقة تلقائيا"
 
-#: ../midori/midori-preferences.c:403
-msgid "Kinetic scrolling"
-msgstr "حركية التمرير"
-
-#: ../midori/midori-preferences.c:404
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "على كل ألأحوال حركة التمرير تناسب سرعة التنقل"
-
-#: ../midori/midori-preferences.c:409
-msgid "Middle click opens Selection"
-msgstr "نقر الزر الأوسط يفتح التحديد"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "مستوى التكبير الافتراضي"
 
-#: ../midori/midori-preferences.c:410
-msgid "Load an address from the selection via middle click"
-msgstr "تحميل عنوان محدد بالنقر على الزر الاوسط"
-
-#: ../midori/midori-preferences.c:415
-msgid "Flash window on background tabs"
-msgstr "فتح الرابط في لسان في الخلف"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "اللغات المفضلة"
 
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1600,95 +1629,116 @@ msgstr ""
 "نقطة للفصل بين قائمة من اللغات المفضلة لجعل صفحات الوب متعددة اللغات, كمثال "
 "\"ar\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:426
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "حفظ الملفات التي تم تحميلها في:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "تصفح"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "موضوع:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "نمط شريط الأدوات:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "فتح صفحات جديدة في:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "أزرار الإغلاق على الألسنة"
 
-#: ../midori/midori-preferences.c:451
-msgid "Always Show Tabbar"
-msgstr "أظهر دائما شريط التبويب"
-
-#: ../midori/midori-preferences.c:455
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "فتح علامات بجانب الحالية"
 
-#: ../midori/midori-preferences.c:456
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "فتح علامات تبويب جديدة بجوار علامة التبويب الحالية أو بعد الأخيرة"
 
-#: ../midori/midori-preferences.c:459
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "فتح علامات التبويب في الخلفية"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "محرر المصوص"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "مجمع الأخبار"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:475
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "شبكة"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "خادم بروكسي"
 
-#: ../midori/midori-preferences.c:482
-msgid "Hostname"
-msgstr "اسم الجهاز"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "العنوان"
 
-#: ../midori/midori-preferences.c:490
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "المنفذ"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "قابلة لانواع الوحدة النائبة"
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "ملفات الوب المؤقتة"
 
-#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "المساحة القصوى المخصصة لحفظ الصفحات على القرص"
 
-#: ../midori/midori-preferences.c:507
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-preferences.c:526
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "تعرف كـ"
+
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "الخصوصية"
 
-#: ../midori/midori-preferences.c:528
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "حذف الكوكيز القديمة بعد:"
 
-#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "الحد الأقصى لعدد الأيام لحفظ الكوكيز"
 
-#: ../midori/midori-preferences.c:537
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "فقط قبول ملفات تعريف الارتباط من المواقع التي قمت بزيارتها"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "حظر ملفات تعريف الارتباط المرسلة من مواقع الطرف الثالث"
 
-#: ../midori/midori-preferences.c:543
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1696,53 +1746,57 @@ msgstr ""
 "الكوكيز تخزن بيانات تسجيل الدخول والألعاب المحفوظة ، أو تعريف المستخدم "
 "لأغراض الإعلان."
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "تمكين التخزين المؤقت لتطبيق ويب"
 
-#: ../midori/midori-preferences.c:553
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "تمكين دعم HTML5 التخزين المحلية"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:557
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "قطاع إحالة التفاصيل المرسلة إلى المواقع"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "ما إذا كان ينبغي تقصير مسار \"التجديد\" إلى اسم المضيف"
 
-#: ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "حذف الصفحات القديمة بعد:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "الحد الأقصى لعدد أيام حفظ تاريخ"
 
-#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "إمتدادات"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_إدارة محركات البحث"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "أضف أداة البحث"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "حرر أداة البحث"
 
-#: ../midori/midori-searchaction.c:1071
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_الإسم:"
 
-#: ../midori/midori-searchaction.c:1086
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_وصف:"
 
-#: ../midori/midori-searchaction.c:1099 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_عنوان:"
 
@@ -1768,49 +1822,49 @@ msgstr "فشل تحميل أدوات البحث. %s\n"
 msgid "The search engines couldn't be saved. %s"
 msgstr "لا يمكن حفظ أدوات البحث. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "السجل"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "اشارات مرجعية والسجل"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "فشل في تهيئة التاريخ: %s"
+msgid "Search for %s"
+msgstr "بحث عن %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "فشل الاختيار من التاريخ: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "بحث عن %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "بحث باستخدام…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "البحث بـ %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "إفتح بـ"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "إختر تطبيقا أو أمرا لفتح \"%s\":"
 
-#: ../midori/sokoke.c:366 ../midori/sokoke.c:380
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "لا يمكن تشغيل البرنامج الخارجي."
 
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "عنوان غير صحيح"
+
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
@@ -1832,71 +1886,103 @@ msgstr "حالة تطابق"
 msgid "Close Findbar"
 msgstr "إغلاق شريط المكتشف"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "الملف '<b>%s</b>' تم تحميله."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "إنتهاء النقل"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "محو الكل"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "مجلد فارغ"
 
-#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
-msgid "Some files are being downloaded"
-msgstr "يتم تحميل بعض الملفات"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:278
-msgid "_Quit Midori"
-msgstr "_خروج من ميدوري"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:280
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "سيتم إلغاء النقل اذا تم إنها ميدوري."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "فشل إضافة العلامة: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "فشل تجديد العلامة: %s\n"
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s و %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "حرر العلامة المحددة"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "حذف العلامة المحددة"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "أضف مجلد جديد"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>فاصل</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "فتح في تبو_يب جديد"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1017
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "بحث في العلامات"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "السجل"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "اليوم"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "البارحة"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1907,48 +1993,36 @@ msgstr[3] "%d سنوات مضت"
 msgstr[4] "%d سنوات مضت"
 msgstr[5] "%d سنوات مضت"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "قبل أسبوع"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "فشل حذف عنصر السجل: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "هل تريد حذف كل عناصر التاريخ؟"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "علم التاريخ المحدد"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "حذف كل عناصر التاريخ"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "مسح تاريخ الدخول"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:988
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "بحث في التأريخ"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "النقل"
-
-#: ../panels/midori-transfers.c:435
-msgid "Open Destination _Folder"
-msgstr "افتح المجلد الوجهة"
-
-#: ../panels/midori-transfers.c:438
-msgid "Copy Link Loc_ation"
-msgstr "انسخ موقع الرابط"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "مطلوب المصادقة"
@@ -1973,114 +2047,65 @@ msgstr "كلمة المرور"
 msgid "_Remember password"
 msgstr "_تذكّر كلمة المرور"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "الأيقونة المحددة '%s' لا يمكن تحميلها"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "الرمز المخزن '%s' لا يمكن تحميله"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "تعطل إطارات الصور المتحركة"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "لا شيء"
 
-#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "خصائص '%s' غير صالحة لـ %s"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "إختر ملف"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "إختر مجلد"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "لا شيء"
-
-#: ../katze/katze-utils.c:687
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 ساعة"
 
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 يوم"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 أسبوع"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 شهر"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 سنة"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "تفضيلات ل %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:484
-msgid "Configure Advertisement filters"
-msgstr "إعداد مرشح الإعلانات"
-
-#: ../extensions/adblock.c:515
-#, 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:929
-msgid "Edit rule"
-msgstr "تحرير قاعد"
-
-#: ../extensions/adblock.c:943
-msgid "_Rule:"
-msgstr "_قاعدة:"
-
-#: ../extensions/adblock.c:997
-msgid "Bl_ock image"
-msgstr "منع الصور"
-
-#: ../extensions/adblock.c:1002
-msgid "Bl_ock link"
-msgstr "منع الروابط"
-
-#: ../extensions/adblock.c:1928
-msgid "Advertisement blocker"
-msgstr "منع الإعلانات"
-
-#: ../extensions/adblock.c:1929
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "يبدو أن هذه الصفحة تحتوي على نصوص برمجية للمستخدم. هل ترغب في تثبيته؟"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"يبدو أن هذه الصفحة تحتوي على نصوص برمجية للمستخدم. هل ترغب في تثبيته؟"
 
 #: ../extensions/addons.c:223
 msgid "_Install user script"
@@ -2099,71 +2124,71 @@ msgstr "_تثبيت نمط المستخدم"
 msgid "Don't install"
 msgstr "لا تقم بتثبيت"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "النصوص البرمجية للمستعمل"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "أنماط المستعمل"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "خطأ"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "هل تريد حذف '%s'؟"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "حذف النصوص البرمجية المستخدمة"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "حذف نمط المستخدم"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "الملف <b>%s</b> سيحذف بشكل نهائي."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "فتح في محرر نص"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "فتح مجلد الهدف"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "إضافة ملحق جديد"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "إزالة الملحقات المختارة"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "إضافات المستخدم"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "لا تستطيع مراقبة المجلد '%s': %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "دعم النصوص البرمجية وأنماط المستخدم"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "الألسنة الملونة"
 
-#: ../extensions/colorful-tabs.c:204
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "لون كل علامة تبويب"
 
@@ -2172,11 +2197,11 @@ msgstr "لون كل علامة تبويب"
 msgid "Cookie Manager"
 msgstr "مدير الكعكات"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "حذف الكل"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2184,31 +2209,31 @@ msgstr ""
 "حذف جميع ملفات تعريف الارتباط. إذا تم تعيين عامل تصفية ، يتم حذف فقط تلك "
 "الملفات التي تطابق عامل التصفية."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "توسيع الكل"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "طوي الكل"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "سؤال"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "سيتم حذف الكوكيز التي تطابق عامل التصفية."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "في نهاية الدورة"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2226,15 +2251,15 @@ msgstr ""
 "<b>الإنتهاء</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "نعم"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "لا"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:699
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2243,19 +2268,20 @@ msgstr ""
 "<b>نطاق</b>: %s\n"
 "<b>كوكيز</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1022
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "إسم"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1074
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_توسيع الكل"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1082
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_طوي الكل"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1134
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "البحث عن ملفات تعريف الارتباط بالاسم أو المجال"
 
@@ -2275,24 +2301,38 @@ msgstr "نسخة من عناوين علامات الجدولة"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "نسخ عناوين كافة علامات التبويب إلى الحافظة"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "التحميل المتأخر"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "تأخير بالثوان حتى تحميل الصفحة:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "تأخير تحميل الصفحة حتى يمكنك فعلا استخدام علامة التبويب."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "حدث خطأ عند محاولة تحميل ملف مع البرنامج المساعد التالية:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2319,38 +2359,38 @@ msgstr "أمر:"
 msgid "Download files with \"%s\" or a custom command"
 msgstr "تحميل الملفات باستخدام \"%s\" أو أمر مخصص"
 
-#: ../extensions/external-download-manager.vala:318
+#: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
 msgstr "مدير تحميل خارجي - CommandLine"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "فشل العثور على Atom المطلوب \"entry\" عناصر في بيانات XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:378
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "آخر التحديثات: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:644
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "تغذيات"
 
-#: ../extensions/feed-panel/feed-panel.c:697
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "أضف تغذية جديدة"
 
-#: ../extensions/feed-panel/feed-panel.c:704
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "حذف التغذية"
 
-#: ../extensions/feed-panel/feed-panel.c:784
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_تغذية"
 
@@ -2359,47 +2399,47 @@ msgstr "_تغذية"
 msgid "Failed to find root element in feed XML data."
 msgstr "فشل العثور على عنصر الجذر في بيانات تغذية XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "صيغة الخدمة غير معتمدة."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "فشل تحليل تغذية XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "فشل العثور على \"channel\" عنصر في بيانات RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "العثور على إصدار RSS غير معتمد."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "فشل العثور على RSS المطلوب \"item\" عناصر في بيانات XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "فشل العثور على RSS المطلوب \"channel\" عناصر في بيانات XML."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "التغذية '%s' مدخلة مسبقاً"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "خطأ في تحميل التغذية '%s'"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "لوحة التغذية"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "قراءة التغذيات Atom/ RSS"
 
@@ -2420,124 +2460,402 @@ msgstr ""
 "كلمة المرور الرئيسية المطلوبة \n"
 "لفتح قاعدة بيانات كلمات المرور"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "تذكر كلمة المرور على هذه الصفحة؟"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "تذكّر"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "ليس الآن"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "ابدأ لهذه الصفحة"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "تبديل شكل التاريخ"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "تنشيط أو إلغاء تنشيط نموذج التاريخ لعلامة التبويب الحالية."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "فشل فتح قاعدة البيانات: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "فشل في تنفيذ بيان قاعدة البيانات: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "فقط تنشيط النموذج التاريخ عن طريق مفتاح التشغيل السريع (Ctrl + Shift + F) في "
 "علامة التبويب"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "ترشيح صيغة التاريخ"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "تخزين تاريخ بيانات الدخول"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "فشل في تحديد الاقتراحات\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "لا توجد تبويبات لم تسبق زيارتها"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "قائمة التاريخ"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "سلوك إغلاق التبويب"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "لا تفعل شيئا"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "التبديل إلى آخر تبويب تمت مشاهدته"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "التحول إلى احدث تبويب"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "فتح الرابط في لسان في الخلف"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "علامة التبويب الجديدة القادمة (قائمة التاريخ)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "التبويب الجديد من التاريخ"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "تبويب جديدة متقدمة (قائمة التاريخ)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "علامة تبويب جديدة من التاريخ السابق"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "عرض التبويب في الخلفية (قائمة التاريخ)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "عرض علامة التبويب الحالية المحددة في الخلفية"
 
-#: ../extensions/history-list.vala:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "سجل التاريخ"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "الانتقال إلى علامة التبويب الأخيرة عند إغلاق علامات التبويب"
 
-#: ../extensions/mouse-gestures.c:297
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "موافق"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "حظر"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "النطاق"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "سياسة"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "غير محدّد"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "السبب"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "إيماءات الفأرة"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "تحكم بميدوري عن طريق تحريك الفأرة"
 
@@ -2550,8 +2868,8 @@ msgid "Customize Keyboard shortcuts"
 msgstr "تخصيص اختصارات لوحة المفاتيح"
 
 #: ../extensions/shortcuts.c:275
-msgid "Customize Sh_ortcuts..."
-msgstr "تخصيص الاختصارات..."
+msgid "Customize Sh_ortcuts"
+msgstr ""
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2561,11 +2879,11 @@ msgstr "إختصارات"
 msgid "View and edit keyboard shortcuts"
 msgstr "عرض وتحرير إختصار لوحة المفاتيح"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "شريط حالة الساعة"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "عرض التاريخ والوقت في شريط الحالة"
 
@@ -2581,6 +2899,10 @@ msgstr "نصوص برمجية"
 msgid "Netscape plugins"
 msgstr "Netscape ملحقات"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "تمكين إضافات نتسكيب"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "سمات شريط الحالة"
@@ -2589,15 +2911,15 @@ msgstr "سمات شريط الحالة"
 msgid "Easily toggle features on web pages on and off"
 msgstr "تبديل ملامح بسهولة على صفحات الويب تشغيل وإيقاف"
 
-#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "لوحة التبويب"
 
-#: ../extensions/tab-panel.c:656
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "لوحة التبويب"
 
-#: ../extensions/tab-panel.c:674
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "عرض علامات التبويب في لوحة عمودية"
 
@@ -2609,11 +2931,11 @@ msgstr "فقط الرموز على علامات التبويب افتراضيا"
 msgid "New tabs have no label by default"
 msgstr "علامات التبويب الجديدة ليس لها تسمية افتراضيا"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "تخصيص شريط الأدوات"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2621,66 +2943,58 @@ msgstr ""
 "تحديد عناصر ليتم عرضها على شريط الأدوات. يمكن ترتيب العناصر عن طريق السحب "
 "والإفلات."
 
-#: ../extensions/toolbar-editor.c:427
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "العناصر المتوفرة"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "العناصر المعروضة"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_تخصيص شريط الادوات…"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "محرر شريط الادوات"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "تحرير شريط الادوات بسهولة"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "إخفاء اتصالات HTTP على القرص"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "فشل في تحميل الكعكات\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "حذف البيانات الخاصة"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_حذف البيانات الخاصة"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "حذف البيانات التالية:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "أظهر آخر التبويبات المفتوحة"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "مسح البيانات الخاصة عند الخروج من ميدوري"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:298
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "الحسابات و_كلمات المرور المحفوظة"
 
-#: ../midori/midori-privatedata.c:300
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "ملفات تعريف الارتباط وبيانات المواقع"
 
-#: ../midori/midori-privatedata.c:307
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "أيقونات الموقع"
 
@@ -2688,613 +3002,493 @@ msgstr "أيقونات الموقع"
 msgid "Open tabs"
 msgstr "افتح الألسنة"
 
-#: ../midori/midori-viewcompletion.vala:67
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "المزيد من التبويبات المفتوحة..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "فشل محو السجل: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "فشل حذف العناصر القديمة للسجل: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "فشل في ارفاق قاعدة البيانات القديمة"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "فشل في الاستيراد من قاعدة البيانات القديمة"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "فشل التراجع عن العملية"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "فشل الفصل"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "غير قادر على إنشاء جدول العلامات : %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "فشل إضافة العلامة: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "فشل في الاستيراد من قاعدة البيانات القديمة: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "لا يمكن حفظ العلامات. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#: ../midori/midori-session.c:187
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr "لا يوجد ملف شهادة جذر متاح. لا يمكن التحقق من شهادات SSL."
 
-#: ../midori/midori-session.c:355
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "لا يمكن حفظ الإعدادات. %s"
 
-#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:449
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "لا يمكن تحميل الجلسة: %s\n"
-
-#: ../midori/midori-session.c:406
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "لا يمكن حفظ الجلسة. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:126
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "لا يمكن حفظ المهملات. %s"
 
-#: ../midori/midori-frontend.c:309
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"يبدو أن ميدوري إنهار في المرة الأخيرة التي تم فتحه. إذا تكرر هذا، حاول أحد "
-"الخيارات التالية لحل المشكلة."
 
-#: ../midori/midori-frontend.c:319
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "تحرير ال_تفضيلات"
 
-#: ../midori/midori-frontend.c:323
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "تعطيل كل الإمتدادات"
 
-#: ../midori/midori-frontend.c:332
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "عرض الحوار بعد تحطم ميدوري"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "تجاهل العلامات القديمة"
 
-#: ../midori/midori-frontend.c:401
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "هناك مثيل لميدوري قيد التشغيل بالفعل ولكن لا يستجيب.\n"
 
-#: ../midori/midori-frontend.c:434
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "لا يمكن تحميل العلامات: %s\n"
 
-#: ../midori/midori-frontend.c:465
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "لا يمكن تحميل الجلسة: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "لا يمكن تحميل المهلملات: %s\n"
 
-#: ../midori/midori-frontend.c:473
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "لا يمكن تحميل التاريخ: %s\n"
 
-#: ../midori/midori-frontend.c:484
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "حدثت الأخطاء التالية:"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_تجاهل"
 
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "إعادة توجيه تحذيرات وحدة التحكم إلى اسم الملف المحدد"
-
-#~ msgid "FILENAME"
-#~ msgstr "إسم الملف"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "إضافة إلى اختصار سطح المكتب"
-
-#~ msgid "_Bookmark"
-#~ msgstr "_علامة"
-
-#~ msgid "_Console"
-#~ msgstr "_طرفية"
-
-#~ msgid "Toplevel folder"
-#~ msgstr "مجلد المستوي عالي"
-
-#~ msgid "_Title:"
-#~ msgstr "_عنوان:"
-
-#~ msgid "_Folder:"
-#~ msgstr "_مجلد:"
-
-#~ 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 "تمكين لغات البرمجة المضمنة في إضافات نتسكيب"
-
-#~ 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 "خادم proxy المستعمل لإتصالات 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 "Close ot_her Tabs"
-#~ msgstr "غلق ألألسنه الأخري"
-
-#~ msgid "_Icon:"
-#~ msgstr "_ايقونة:"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "ميّز المتشابهات"
-
-#~ msgid "Filter:"
-#~ msgstr "مرشح:"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr "ادخل سلسلة أسماء أو نطاقات فلاتر لتصفية الكوكيز"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "_Customize…"
-#~ msgstr "_تخصيص…"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "إعداد المجلد المحدد غير صالح."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "Cookies"
-#~ msgstr "كعكات"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'فلاش' كعكات"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 _قاعدة بيانات"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "ذاكرة التطبيقات بدون اتصال"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "منصفح الوب الخفيف"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "No filename specified"
-#~ msgstr "لم يتم تحديد إسم الملف"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "لا تقم بحفظ أي بيانات خاصة أثناء التصفح"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "إضافة اختصار لسرعة الاتصال الهاتفي"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "إضافة اختصار إلى سطح المكتب"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "Create a launcher"
-#~ msgstr "إنشاء مطلق"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "اشترك في هذا المصدر الإخباري"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "Close this window"
-#~ msgstr "غلق هذه التافذة"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Close all open windows"
-#~ msgstr "إغلاق جميع النوافذ المفتوحة"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "Undo the last modification"
-#~ msgstr "تراجع عن الإجراء الأخير"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_قبول"
 
-#~ msgid "Redo the last modification"
-#~ msgstr "أعِد آخر عملية متراجع عنها"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "Cut the selected text"
-#~ msgstr "قص النص المحدد"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "Copy the selected text"
-#~ msgstr "أنسخ النص المحدد"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "ألصق النص من الحافظة"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "المسار"
 
-#~ msgid "Delete the selected text"
-#~ msgstr "حذف النص المحدد"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "القيمة"
 
-#~ msgid "Select all text"
-#~ msgstr "حدد كل النص"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "العثور على التكرار التالي للكلمة أو جملة"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "العثور على التكرار السابقة من كلمة أو عبارة"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid "Reset the zoom level"
-#~ msgstr "إستعادة مستوى التكبير"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid "View the source code of the page"
-#~ msgstr "اعرض النص المصدري لهذه الصفحة"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "Scroll to the left"
-#~ msgstr "انتقل إلى اليسار"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "Scroll down"
-#~ msgstr "انتقل إلى للاسفل"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Scroll up"
-#~ msgstr "انتقل إلى للأعلى"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid "Scroll to the right"
-#~ msgstr "انتقل إلى اليمين"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "حذف محتويات سلة المهملات"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "فتح علامة التبويب المغلقة حديثاً"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "تطبيقات"
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "أضف مجلد علامات جديد"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "أضف, حرر و إحذف أدوات البحث…"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid "Clear private data…"
-#~ msgstr "حذف البيانات الخاصة …"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "معاينة تفاصيل الصفحة  أدوات وصول  المطورين …"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "التحول إلى التبويب السابق"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ msgid "Switch to the next tab"
-#~ msgstr "التحول إلى التبويب التالي"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "إنشاء مطلق"
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "حرك علامة التبويب السابقة للوراء"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "الانتقال للتبويب أمام علامة التبويب التالية"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "Focus the current tab"
-#~ msgstr "فصل التبويب الحالي"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "النقل"
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "حلقة التركيز بين طرق العرض"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "محو الكل"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "أظهر فقط أيقونة التبويب الحالي"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "تكرار التبويب الحالية"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "افتح المجلد الوجهة"
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "أغلق كل التبويبات بإستثناء التبويب الحالي"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "انسخ موقع الرابط"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "فتح العلامات المحفوظة في الدورة الماضية"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "الملف '<b>%s</b>' تم تحميله."
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "تظهر أسئلة شائعة وأجوبتها"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "تعقب العلل وفتح ميدوري"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "إنتهاء النقل"
 
-#~ msgid "Show information about the program"
-#~ msgstr "مزيد من المعلومات حول البرنامج"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "يتم تحميل بعض الملفات"
 
-#~ msgid "Show menubar"
-#~ msgstr "أظهر شريك القائمة"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_خروج من ميدوري"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "أظهر شريط التصفح"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "سيتم إلغاء النقل اذا تم إنها ميدوري."
 
-#~ msgid "Show sidepanel"
-#~ msgstr "أظهر لوحة الجانبية"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "أظهر شريط العلامات"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Show statusbar"
-#~ msgstr "عرض شريط الحالة"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "تعيين عدد الأعمدة والصفوف"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "أدخل عدد الأعمدة والصفوف :"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "المدخلات غير صالحة للطلب السريع"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Thumb size:"
-#~ msgstr "حجم المصغرات:"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Small"
-#~ msgstr "صغير"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Medium"
-#~ msgstr "متوسط"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Big"
-#~ msgstr "كبير"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Not available: %s"
-#~ msgstr "غبر متوفر: %s"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Resource files not installed"
-#~ msgstr "ملفات المصدر غبر مثبتة"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Reset the last _session"
-#~ msgstr "إستعادة أ_خر جلسة"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "%d%% loaded"
-#~ msgstr "تحميل %d%%"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Quit the application"
-#~ msgstr "الخروج من التطبيق"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "_Contents"
-#~ msgstr "الم_حتويات"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Show Blank page"
-#~ msgstr "أظهر صفحة فارغة"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "All cookies"
-#~ msgstr "كل كعكات"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Session cookies"
-#~ msgstr "جلسة الكعكات"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "General"
-#~ msgstr "عام"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Appearance"
-#~ msgstr "مظهر"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Font settings"
-#~ msgstr "إعدادات الخطوط"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "واجهة"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Applications"
-#~ msgstr "تطبيقات"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "منع الإعلانات"
 
-#~ msgid "External applications"
-#~ msgstr "تكبيقات خارجية"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "منع الإعلانات وفقا لقائمة التصفية"
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "التبويب التالي (السجل)"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "إعداد مرشح الإعلانات"
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "التبويب السابق (السجل)"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "منع الصور"
 
-#~ msgid "Previous tab from history"
-#~ msgstr "التبويب السابق من السجل"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "منع الروابط"
 
-#~ msgid "Pageholder"
-#~ msgstr "مالك الصفحة"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "تحرير قاعد"
 
-#~ msgid "_Pageholder"
-#~ msgstr "_مالك الصفحة"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_قاعدة:"
index 44b056314a8bebe2e6614b27bb07d90cb247979e..15afd44bae2d092d95ebf714b0173c442ac9d343 100644 (file)
--- a/po/ast.po
+++ b/po/ast.po
-# Asturian translations for midori package.\r
-# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER\r
-# This file is distributed under the same license as the midori package.\r
-# Astur <malditoastur@gmail.com> 2009\r
-#\r
-msgid ""\r
-msgstr ""\r
-"Project-Id-Version: midori 0.1.7\n"\r
-"Report-Msgid-Bugs-To: \n"\r
-"POT-Creation-Date: 2009-07-29 23:58+0200\n"\r
-"PO-Revision-Date: 2009-09-02 16:13+0100\n"\r
-"Last-Translator: astur <malditoastur@gmail.com>\n"\r
-"Language-Team: GALPon MiniNo <mbouzada@gmail.com>\n"\r
-"MIME-Version: 1.0\n"\r
-"Content-Type: text/plain; charset=UTF-8\n"\r
-"Content-Transfer-Encoding: 8bit\n"\r
-"Plural-Forms: nplurals=2; plural=n != 1;\n"\r
-\r
-#: ../data/midori.desktop.in.h:1\r
-msgid "Lightweight web browser"\r
-msgstr "Restolador llixeru"\r
-\r
-#: ../data/midori.desktop.in.h:2\r
-#: ../midori/main.c:1343\r
-#: ../midori/main.c:1517\r
-#: ../midori/main.c:1525\r
-#: ../midori/main.c:1536\r
-#: ../midori/midori-websettings.c:287\r
-msgid "Midori"\r
-msgstr "Midori"\r
-\r
-#: ../data/midori.desktop.in.h:3\r
-msgid "Web Browser"\r
-msgstr "Restolador"\r
-\r
-#: ../midori/main.c:96\r
-#, c-format\r
-msgid "The configuration couldn't be loaded: %s\n"\r
-msgstr "Nun pudo cargase la configuración: %s\n"\r
-\r
-#: ../midori/main.c:151\r
-#, c-format\r
-msgid "Value '%s' is invalid for %s"\r
-msgstr "El valor «%s» nun ye válidu pa %s"\r
-\r
-#: ../midori/main.c:158\r
-#: ../midori/main.c:238\r
-#, c-format\r
-msgid "Invalid configuration value '%s'"\r
-msgstr "Valor de configuración non válidu «%s»"\r
-\r
-#: ../midori/main.c:350\r
-#, c-format\r
-msgid "Failed to open database: %s\n"\r
-msgstr "Nun pudo abrise la base de datos: %s\n"\r
-\r
-#: ../midori/main.c:382\r
-#, c-format\r
-msgid "Failed to execute database statement: %s\n"\r
-msgstr "Nun pudo executase sentencia na base de datos: %s\n"\r
-\r
-#: ../midori/main.c:436\r
-#, c-format\r
-msgid "Failed to remove history item: %s\n"\r
-msgstr "Nun pudieron quitase los elementos del hestorial: %s\n"\r
-\r
-#: ../midori/main.c:460\r
-#, c-format\r
-msgid "Failed to clear history: %s\n"\r
-msgstr "Nun pudo vaciase l'hestorial: %s\n"\r
-\r
-#: ../midori/main.c:483\r
-#: ../midori/main.c:517\r
-#: ../midori/main.c:533\r
-#, c-format\r
-msgid "Failed to add history item: %s\n"\r
-msgstr "Nun pudo amestase un elementu al hestorial: %s\n"\r
-\r
-#. i18n: Couldn't remove items that are older than n days\r
-#: ../midori/main.c:712\r
-#, c-format\r
-msgid "Failed to remove old history items: %s\n"\r
-msgstr "Nun pudieron quitase elementos antiguos del hestorial: %s\n"\r
-\r
-#: ../midori/main.c:741\r
-#, c-format\r
-msgid "The configuration couldn't be saved. %s"\r
-msgstr "Nun pudo guardase la configuración. %s"\r
-\r
-#: ../midori/main.c:779\r
-#, c-format\r
-msgid "The search engines couldn't be saved. %s"\r
-msgstr "Nun pudieron guardase los motores de gueta. %s"\r
-\r
-#: ../midori/main.c:798\r
-#: ../midori/main.c:826\r
-#: ../midori/main.c:855\r
-#, c-format\r
-msgid "The bookmarks couldn't be saved. %s"\r
-msgstr "Nun pudieron guardase los marcadores. %s"\r
-\r
-#. i18n: Trash, or wastebin, containing closed tabs\r
-#: ../midori/main.c:878\r
-#: ../midori/main.c:901\r
-#, c-format\r
-msgid "The trash couldn't be saved. %s"\r
-msgstr "Nun pudo guardase la papelera. %s"\r
-\r
-#: ../midori/main.c:974\r
-#, c-format\r
-msgid "The session couldn't be saved. %s"\r
-msgstr "Nun pudo guardase la sesión. %s"\r
-\r
-#: ../midori/main.c:1101\r
-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."\r
-msgstr "Paez que Midori zarróse de sópitu la cabera vegada. Si esto asocede repetidamente, prebe una de les siguientes opciones pa iguar el problema."\r
-\r
-#: ../midori/main.c:1116\r
-msgid "Modify _preferences"\r
-msgstr "Camudar _preferencies"\r
-\r
-#: ../midori/main.c:1120\r
-msgid "Reset the last _session"\r
-msgstr "Restaurar la cabera _sesión"\r
-\r
-#: ../midori/main.c:1125\r
-msgid "Disable all _extensions"\r
-msgstr "Deshabilitar toles _estensiones"\r
-\r
-#: ../midori/main.c:1343\r
-msgid "No filename specified"\r
-msgstr "Nun s'especificó el nome del ficheru"\r
-\r
-#: ../midori/main.c:1366\r
-msgid "An unknown error occured."\r
-msgstr "Hebo un fallu desconocíu."\r
-\r
-#: ../midori/main.c:1398\r
-#, c-format\r
-msgid "Snapshot saved to: %s\n"\r
-msgstr "Captura guardada en: %s\n"\r
-\r
-#: ../midori/main.c:1447\r
-msgid "Run ADDRESS as a web application"\r
-msgstr "Executar DIRECCIÓN como una aplicación d'internet"\r
-\r
-#: ../midori/main.c:1447\r
-msgid "ADDRESS"\r
-msgstr "DIREICIÓN"\r
-\r
-#: ../midori/main.c:1449\r
-msgid "Use FOLDER as configuration folder"\r
-msgstr "Usar CARPETA como carpeta de configuración"\r
-\r
-#: ../midori/main.c:1449\r
-msgid "FOLDER"\r
-msgstr "CARPETA"\r
-\r
-#: ../midori/main.c:1451\r
-msgid "Run the specified filename as javascript"\r
-msgstr "Execute'l nome de ficheru especificáu como javascript"\r
-\r
-#: ../midori/main.c:1454\r
-msgid "Take a snapshot of the specified URI"\r
-msgstr "Tomar una captura de la URL especificada"\r
-\r
-#: ../midori/main.c:1457\r
-msgid "Execute the specified command"\r
-msgstr "Executar el comandu especificáu"\r
-\r
-#: ../midori/main.c:1459\r
-msgid "Display program version"\r
-msgstr "Amosar la versión del programa"\r
-\r
-#: ../midori/main.c:1461\r
-msgid "Addresses"\r
-msgstr "Direiciones"\r
-\r
-#: ../midori/main.c:1514\r
-msgid "[Addresses]"\r
-msgstr "[Direiciones]"\r
-\r
-#: ../midori/main.c:1537\r
-msgid "Please report comments, suggestions and bugs to:"\r
-msgstr "Por favor unvíe comentarios, suxerencies y fallos a:"\r
-\r
-#: ../midori/main.c:1539\r
-msgid "Check for new versions at:"\r
-msgstr "Guetar nueves versiones en:"\r
-\r
-#: ../midori/main.c:1619\r
-msgid "The specified configuration folder is invalid."\r
-msgstr "La carpeta de configuración especificada nun ye válida."\r
-\r
-#: ../midori/main.c:1655\r
-msgid "An instance of Midori is already running but not responding.\n"\r
-msgstr "Una instancia de Midori yá se ta executando pero nun respuende.\n"\r
-\r
-#: ../midori/main.c:1715\r
-#, c-format\r
-msgid "The search engines couldn't be loaded. %s\n"\r
-msgstr "Nun pudieron cargase los motores de gueta. %s\n"\r
-\r
-#: ../midori/main.c:1727\r
-#, c-format\r
-msgid "The bookmarks couldn't be loaded: %s\n"\r
-msgstr "Los marcadores nun pudieron cargase: %s\n"\r
-\r
-#: ../midori/main.c:1742\r
-#, c-format\r
-msgid "The session couldn't be loaded: %s\n"\r
-msgstr "Nun pudo cargase la sesión: %s\n"\r
-\r
-#: ../midori/main.c:1755\r
-#, c-format\r
-msgid "The trash couldn't be loaded: %s\n"\r
-msgstr "Nun pudo cargase la papelera: %s\n"\r
-\r
-#: ../midori/main.c:1768\r
-#, c-format\r
-msgid "The history couldn't be loaded: %s\n"\r
-msgstr "Nun pudo cargase l'hestorial: %s\n"\r
-\r
-#: ../midori/main.c:1780\r
-msgid "The following errors occured:"\r
-msgstr "Hebo los siguientes fallos:"\r
-\r
-#: ../midori/main.c:1796\r
-msgid "_Ignore"\r
-msgstr "_Inorar"\r
-\r
-#: ../midori/midori-array.c:250\r
-msgid "File not found."\r
-msgstr "Ficheru non alcontráu."\r
-\r
-#: ../midori/midori-array.c:258\r
-#: ../midori/midori-array.c:267\r
-msgid "Malformed document."\r
-msgstr "Documentu defectuosu."\r
-\r
-#: ../midori/midori-array.c:429\r
-#: ../midori/sokoke.c:694\r
-#, c-format\r
-msgid "Writing failed."\r
-msgstr "Falló la escritura."\r
-\r
-#: ../midori/midori-browser.c:307\r
-#: ../midori/midori-browser.c:4229\r
-#: ../midori/midori-browser.c:4235\r
-msgid "Reload the current page"\r
-msgstr "Recargar la páxina actual"\r
-\r
-#: ../midori/midori-browser.c:318\r
-#: ../midori/midori-browser.c:4232\r
-msgid "Stop loading the current page"\r
-msgstr "Detener la carga de la páxina"\r
-\r
-#: ../midori/midori-browser.c:409\r
-#, c-format\r
-msgid "%d%% loaded"\r
-msgstr "%d%% cargáu"\r
-\r
-#: ../midori/midori-browser.c:434\r
-#, c-format\r
-msgid "Unexpected action '%s'."\r
-msgstr "Aición inesperada «%s»."\r
-\r
-#: ../midori/midori-browser.c:616\r
-msgid "New folder"\r
-msgstr "Nueva carpeta"\r
-\r
-#: ../midori/midori-browser.c:616\r
-msgid "Edit folder"\r
-msgstr "Editar carpeta"\r
-\r
-#: ../midori/midori-browser.c:618\r
-msgid "New bookmark"\r
-msgstr "Nuevu marcador"\r
-\r
-#: ../midori/midori-browser.c:618\r
-msgid "Edit bookmark"\r
-msgstr "Editar marcador"\r
-\r
-#: ../midori/midori-browser.c:648\r
-msgid "_Title:"\r
-msgstr "_Títulu:"\r
-\r
-#: ../midori/midori-browser.c:661\r
-#: ../midori/midori-searchaction.c:952\r
-msgid "_Description:"\r
-msgstr "_Descripción:"\r
-\r
-#: ../midori/midori-browser.c:680\r
-#: ../midori/midori-searchaction.c:966\r
-#: ../extensions/feed-panel/main.c:343\r
-msgid "_Address:"\r
-msgstr "_Direición:"\r
-\r
-#: ../midori/midori-browser.c:699\r
-msgid "_Folder:"\r
-msgstr "_Carpeta:"\r
-\r
-#: ../midori/midori-browser.c:704\r
-#: ../midori/midori-browser.c:745\r
-msgid "Toplevel folder"\r
-msgstr "Carpeta de nivel superior"\r
-\r
-#: ../midori/midori-browser.c:821\r
-msgid "Save file as"\r
-msgstr "Guardar ficheru como"\r
-\r
-#: ../midori/midori-browser.c:1172\r
-#, c-format\r
-msgid "The file '<b>%s</b>' has been downloaded."\r
-msgstr "El ficheru '<b>%s</b>' descargóse."\r
-\r
-#: ../midori/midori-browser.c:1176\r
-msgid "Transfer completed"\r
-msgstr "Tresferencia completa"\r
-\r
-#: ../midori/midori-browser.c:1317\r
-msgid "Save file"\r
-msgstr "Guardar ficheru"\r
-\r
-#: ../midori/midori-browser.c:1984\r
-msgid "Open file"\r
-msgstr "Abrir ficheru"\r
-\r
-#: ../midori/midori-browser.c:3430\r
-#: ../panels/midori-bookmarks.c:781\r
-#: ../panels/midori-history.c:812\r
-msgid "Open all in _Tabs"\r
-msgstr "Abrir too en _llingüetes"\r
-\r
-#: ../midori/midori-browser.c:3437\r
-#: ../panels/midori-bookmarks.c:787\r
-#: ../panels/midori-history.c:818\r
-#: ../extensions/feed-panel/feed-panel.c:542\r
-msgid "Open in New _Tab"\r
-msgstr "Abrir nuna nueva _llingüeta "\r
-\r
-#: ../midori/midori-browser.c:3440\r
-#: ../panels/midori-bookmarks.c:789\r
-#: ../panels/midori-history.c:820\r
-#: ../extensions/feed-panel/feed-panel.c:544\r
-msgid "Open in New _Window"\r
-msgstr "Abrir nuna nueva _ventana"\r
-\r
-#: ../midori/midori-browser.c:3750\r
-msgid "Clear Private Data"\r
-msgstr "Desaniciar datos privaos"\r
-\r
-#: ../midori/midori-browser.c:3754\r
-msgid "_Clear private data"\r
-msgstr "_Desaniciar datos privaos"\r
-\r
-#: ../midori/midori-browser.c:3767\r
-msgid "Clear the following data:"\r
-msgstr "Desaniciar los siguientes datos:"\r
-\r
-#: ../midori/midori-browser.c:3777\r
-#: ../midori/midori-preferences.c:671\r
-#: ../panels/midori-history.c:108\r
-msgid "History"\r
-msgstr "Hestorial"\r
-\r
-#: ../midori/midori-browser.c:3782\r
-msgid "Cookies"\r
-msgstr "Buelgues / Cookies"\r
-\r
-#: ../midori/midori-browser.c:3787\r
-msgid "'Flash' Cookies"\r
-msgstr "'Flash' Cookies"\r
-\r
-#: ../midori/midori-browser.c:3792\r
-msgid "Website icons"\r
-msgstr "Iconos de sitios d'internet"\r
-\r
-#: ../midori/midori-browser.c:3797\r
-#: ../midori/sokoke.c:868\r
-msgid "_Closed Tabs"\r
-msgstr "_Llingüetes zarraes"\r
-\r
-#: ../midori/midori-browser.c:3805\r
-msgid "Clear private data when _quitting Midori"\r
-msgstr "Desaniciar datos privaos al _colar de Midori"\r
-\r
-#: ../midori/midori-browser.c:3889\r
-msgid "A lightweight web browser."\r
-msgstr "Un restolador enforma llixeru"\r
-\r
-#: ../midori/midori-browser.c:3897\r
-msgid "translator-credits"\r
-msgstr "Astur <malditoastur@gmail.com>"\r
-\r
-#: ../midori/midori-browser.c:4163\r
-msgid "_File"\r
-msgstr "_Ficheru"\r
-\r
-#: ../midori/midori-browser.c:4165\r
-#: ../midori/sokoke.c:869\r
-msgid "New _Window"\r
-msgstr "Nueva _ventana"\r
-\r
-#: ../midori/midori-browser.c:4166\r
-msgid "Open a new window"\r
-msgstr "Abrir una nueva ventana"\r
-\r
-#: ../midori/midori-browser.c:4169\r
-msgid "Open a new tab"\r
-msgstr "Abrir una nueva llingüeta"\r
-\r
-#: ../midori/midori-browser.c:4172\r
-msgid "Open a file"\r
-msgstr "Abrir un ficheru"\r
-\r
-#: ../midori/midori-browser.c:4175\r
-msgid "Save to a file"\r
-msgstr "Guardar nún ficheru"\r
-\r
-#: ../midori/midori-browser.c:4177\r
-msgid "Add to Speed _dial"\r
-msgstr "Amestar a marcación rápida"\r
-\r
-#: ../midori/midori-browser.c:4178\r
-msgid "Add shortcut to speed dial"\r
-msgstr "Amestar accesu direutu a marcación rápida"\r
-\r
-#: ../midori/midori-browser.c:4180\r
-msgid "_Close Tab"\r
-msgstr "_Zarrar llingüeta"\r
-\r
-#: ../midori/midori-browser.c:4181\r
-msgid "Close the current tab"\r
-msgstr "Zarrar la llingüeta actual"\r
-\r
-#: ../midori/midori-browser.c:4183\r
-msgid "C_lose Window"\r
-msgstr "_Zarrar ventana"\r
-\r
-#: ../midori/midori-browser.c:4184\r
-msgid "Close this window"\r
-msgstr "Zarrar ésta ventana"\r
-\r
-#: ../midori/midori-browser.c:4187\r
-msgid "Print the current page"\r
-msgstr "Imprentar la páxina actual"\r
-\r
-#: ../midori/midori-browser.c:4190\r
-msgid "Quit the application"\r
-msgstr "Colar de l'aplicación"\r
-\r
-#: ../midori/midori-browser.c:4192\r
-msgid "_Edit"\r
-msgstr "_Editar"\r
-\r
-#: ../midori/midori-browser.c:4195\r
-msgid "Cut the selected text"\r
-msgstr "Cortar el testu esbilláu"\r
-\r
-#: ../midori/midori-browser.c:4198\r
-#: ../midori/midori-browser.c:4201\r
-msgid "Copy the selected text"\r
-msgstr "Copiar el testu esbilláu"\r
-\r
-#: ../midori/midori-browser.c:4204\r
-msgid "Paste text from the clipboard"\r
-msgstr "Apegar testu del cartafueyu"\r
-\r
-#: ../midori/midori-browser.c:4207\r
-msgid "Delete the selected text"\r
-msgstr "Desaniciar el testu esbilláu"\r
-\r
-#: ../midori/midori-browser.c:4210\r
-msgid "Select all text"\r
-msgstr "Esbillar tol testu"\r
-\r
-#: ../midori/midori-browser.c:4213\r
-msgid "Find a word or phrase in the page"\r
-msgstr "Guetar una pallabra o fras na páxina"\r
-\r
-#: ../midori/midori-browser.c:4215\r
-msgid "Find _Next"\r
-msgstr "Guetar _siguiente"\r
-\r
-#: ../midori/midori-browser.c:4216\r
-msgid "Find the next occurrence of a word or phrase"\r
-msgstr "Guetar la siguiente aparición d'una pallabra o una frase"\r
-\r
-#: ../midori/midori-browser.c:4218\r
-msgid "Find _Previous"\r
-msgstr "Guetar _anterior"\r
-\r
-#: ../midori/midori-browser.c:4219\r
-msgid "Find the previous occurrence of a word or phrase"\r
-msgstr "Guetar l'anterior aparición d'una pallabra o una fras"\r
-\r
-#: ../midori/midori-browser.c:4223\r
-msgid "Configure the application preferences"\r
-msgstr "Configurar les preferencies de l'aplicación"\r
-\r
-#: ../midori/midori-browser.c:4225\r
-msgid "_View"\r
-msgstr "_Ver"\r
-\r
-#: ../midori/midori-browser.c:4226\r
-msgid "_Toolbars"\r
-msgstr "_Barra de ferramientes"\r
-\r
-#: ../midori/midori-browser.c:4238\r
-msgid "Increase the zoom level"\r
-msgstr "Aumentar el nivel de zoom"\r
-\r
-#: ../midori/midori-browser.c:4241\r
-msgid "Decrease the zoom level"\r
-msgstr "Amenorgar el nivel de zoom"\r
-\r
-#: ../midori/midori-browser.c:4244\r
-msgid "Reset the zoom level"\r
-msgstr "Restablecer el nivel de zoom"\r
-\r
-#: ../midori/midori-browser.c:4245\r
-msgid "_Encoding"\r
-msgstr "_Codificación"\r
-\r
-#: ../midori/midori-browser.c:4247\r
-msgid "View So_urce"\r
-msgstr "Ver _códigu fonte"\r
-\r
-#: ../midori/midori-browser.c:4248\r
-msgid "View the source code of the page"\r
-msgstr "Ver el códigu fonte de la páxina"\r
-\r
-#: ../midori/midori-browser.c:4250\r
-msgid "View Selection Source"\r
-msgstr "Ver códigu fonte de la Escoyeta"\r
-\r
-#: ../midori/midori-browser.c:4251\r
-msgid "View the source code of the selection"\r
-msgstr "Ver el códigu fonte de la Escoyeta"\r
-\r
-#: ../midori/midori-browser.c:4255\r
-msgid "Toggle fullscreen view"\r
-msgstr "Activar/desactivar pantalla completa"\r
-\r
-#: ../midori/midori-browser.c:4257\r
-msgid "_Go"\r
-msgstr "_Dir"\r
-\r
-#: ../midori/midori-browser.c:4260\r
-msgid "Go back to the previous page"\r
-msgstr "Retroceder una páxina"\r
-\r
-#: ../midori/midori-browser.c:4263\r
-msgid "Go forward to the next page"\r
-msgstr "Avanzar una páxina"\r
-\r
-#: ../midori/midori-browser.c:4266\r
-msgid "Go to your homepage"\r
-msgstr "Abrir páxina d'aniciu"\r
-\r
-#: ../midori/midori-browser.c:4268\r
-msgid "Empty Trash"\r
-msgstr "Vaciar la papelera"\r
-\r
-#: ../midori/midori-browser.c:4269\r
-msgid "Delete the contents of the trash"\r
-msgstr "Desaniciar el conteníu de la papelera"\r
-\r
-#: ../midori/midori-browser.c:4271\r
-msgid "Undo _Close Tab"\r
-msgstr "Des_facer el pieslle de llingüeta"\r
-\r
-#: ../midori/midori-browser.c:4272\r
-msgid "Open the last closed tab"\r
-msgstr "Abrir la cabera llingüeta zarrada"\r
-\r
-#: ../midori/midori-browser.c:4276\r
-#: ../panels/midori-bookmarks.c:231\r
-msgid "Add a new bookmark"\r
-msgstr "Amestar un nuevu marcador"\r
-\r
-#: ../midori/midori-browser.c:4278\r
-msgid "Add a new _folder"\r
-msgstr "Amestar una nueva _carpeta"\r
-\r
-#: ../midori/midori-browser.c:4279\r
-msgid "Add a new bookmark folder"\r
-msgstr "Amestar un nuevu marcador"\r
-\r
-#: ../midori/midori-browser.c:4281\r
-#: ../midori/midori-searchaction.c:497\r
-msgid "_Manage Search Engines"\r
-msgstr "_Alministrar motores de gueta"\r
-\r
-#: ../midori/midori-browser.c:4282\r
-msgid "Add, edit and remove search engines…"\r
-msgstr "Amestar, editar y quitar motores de gueta…"\r
-\r
-#: ../midori/midori-browser.c:4285\r
-msgid "_Clear Private Data"\r
-msgstr "_Desaniciar datos privaos"\r
-\r
-#: ../midori/midori-browser.c:4286\r
-msgid "Clear private data…"\r
-msgstr "Desaniciar datos privaos"\r
-\r
-#: ../midori/midori-browser.c:4290\r
-msgid "_Previous Tab"\r
-msgstr "_Llingüeta anterior"\r
-\r
-#: ../midori/midori-browser.c:4291\r
-msgid "Switch to the previous tab"\r
-msgstr "Camudar a la llingüeta anterior"\r
-\r
-#: ../midori/midori-browser.c:4293\r
-msgid "_Next Tab"\r
-msgstr "_Llingüeta siguiente"\r
-\r
-#: ../midori/midori-browser.c:4294\r
-msgid "Switch to the next tab"\r
-msgstr "Camudar a la llingüeta siguiente"\r
-\r
-#: ../midori/midori-browser.c:4296\r
-msgid "_Help"\r
-msgstr "_Aida"\r
-\r
-#: ../midori/midori-browser.c:4298\r
-msgid "_Contents"\r
-msgstr "_Conteníu"\r
-\r
-#: ../midori/midori-browser.c:4299\r
-msgid "Show the documentation"\r
-msgstr "Amosar la documentación"\r
-\r
-#: ../midori/midori-browser.c:4301\r
-msgid "_Frequent Questions"\r
-msgstr "_Entrugues frecuentes"\r
-\r
-#: ../midori/midori-browser.c:4302\r
-msgid "Show the Frequently Asked Questions"\r
-msgstr "Amosar les entrugues más avezaes"\r
-\r
-#: ../midori/midori-browser.c:4304\r
-msgid "_Report a Bug"\r
-msgstr "_Reportar un fallu"\r
-\r
-#: ../midori/midori-browser.c:4305\r
-msgid "Open Midori's bug tracker"\r
-msgstr "Abrir el rastreador de fallos de Midori"\r
-\r
-#: ../midori/midori-browser.c:4308\r
-msgid "Show information about the program"\r
-msgstr "Amosar información sobro'l programa"\r
-\r
-#: ../midori/midori-browser.c:4315\r
-msgid "P_rivate Browsing"\r
-msgstr "_Restolación privao"\r
-\r
-#: ../midori/midori-browser.c:4316\r
-msgid "Don't save any private data while browsing"\r
-msgstr "Nun guardar datos durante la restolación privao"\r
-\r
-#: ../midori/midori-browser.c:4321\r
-msgid "_Menubar"\r
-msgstr "_Barra de menú"\r
-\r
-#: ../midori/midori-browser.c:4322\r
-msgid "Show menubar"\r
-msgstr "Amosar la barra de menú"\r
-\r
-#: ../midori/midori-browser.c:4325\r
-msgid "_Navigationbar"\r
-msgstr "_Barra de restolar"\r
-\r
-#: ../midori/midori-browser.c:4326\r
-msgid "Show navigationbar"\r
-msgstr "Amosar la barra de restolar"\r
-\r
-#: ../midori/midori-browser.c:4329\r
-msgid "Side_panel"\r
-msgstr "_Panel llateral"\r
-\r
-#: ../midori/midori-browser.c:4330\r
-msgid "Show sidepanel"\r
-msgstr "Amosar el panel llateral"\r
-\r
-#: ../midori/midori-browser.c:4333\r
-msgid "_Bookmarkbar"\r
-msgstr "_Barra de marcadores"\r
-\r
-#: ../midori/midori-browser.c:4334\r
-msgid "Show bookmarkbar"\r
-msgstr "Amosar la barra de marcadores"\r
-\r
-#: ../midori/midori-browser.c:4337\r
-msgid "_Transferbar"\r
-msgstr "_Barra de tresferencies"\r
-\r
-#: ../midori/midori-browser.c:4338\r
-msgid "Show transferbar"\r
-msgstr "Amosar la barra de tresferencies"\r
-\r
-#: ../midori/midori-browser.c:4341\r
-msgid "_Statusbar"\r
-msgstr "_Barra d'estáu"\r
-\r
-#: ../midori/midori-browser.c:4342\r
-msgid "Show statusbar"\r
-msgstr "Amosar la barra d'estáu"\r
-\r
-#: ../midori/midori-browser.c:4349\r
-msgid "_Automatic"\r
-msgstr "_Automáticu"\r
-\r
-#: ../midori/midori-browser.c:4352\r
-#: ../midori/midori-websettings.c:214\r
-msgid "Chinese (BIG5)"\r
-msgstr "Chinu (BIG5)"\r
-\r
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic\r
-#: ../midori/midori-browser.c:4356\r
-msgid "Japanese (SHIFT__JIS)"\r
-msgstr "Xaponés (SHIFT__JIS)"\r
-\r
-#: ../midori/midori-browser.c:4359\r
-#: ../midori/midori-websettings.c:216\r
-msgid "Russian (KOI8-R)"\r
-msgstr "Rusu (KOI8-R)"\r
-\r
-#: ../midori/midori-browser.c:4362\r
-#: ../midori/midori-websettings.c:217\r
-msgid "Unicode (UTF-8)"\r
-msgstr "Unicode (UTF-8)"\r
-\r
-#: ../midori/midori-browser.c:4365\r
-#: ../midori/midori-websettings.c:218\r
-msgid "Western (ISO-8859-1)"\r
-msgstr "Occidental (ISO-8859-1)"\r
-\r
-#: ../midori/midori-browser.c:4368\r
-#: ../midori/midori-websettings.c:219\r
-#: ../midori/midori-websettings.c:291\r
-msgid "Custom…"\r
-msgstr "Personalizáu…"\r
-\r
-#: ../midori/midori-browser.c:4806\r
-msgid "_Separator"\r
-msgstr "_Separtador"\r
-\r
-#: ../midori/midori-browser.c:4813\r
-msgid "_Location…"\r
-msgstr "_Allugamientu…"\r
-\r
-#: ../midori/midori-browser.c:4815\r
-msgid "Open a particular location"\r
-msgstr "Abrir una direición en particular"\r
-\r
-#: ../midori/midori-browser.c:4839\r
-msgid "_Web Search…"\r
-msgstr "_Guetar n'internet…"\r
-\r
-#: ../midori/midori-browser.c:4841\r
-msgid "Run a web search"\r
-msgstr "Facer una gueta n'internet"\r
-\r
-#: ../midori/midori-browser.c:4862\r
-msgid "Reopen a previously closed tab or window"\r
-msgstr "Abrir ventanes o llingüetes zarraes"\r
-\r
-#: ../midori/midori-browser.c:4877\r
-msgid "_Recently visited pages"\r
-msgstr "_Caberes páxines visitaes"\r
-\r
-#: ../midori/midori-browser.c:4879\r
-msgid "Reopen pages that you visited earlier"\r
-msgstr "Abre les páxines que vusté visitó anteriormente"\r
-\r
-#: ../midori/midori-browser.c:4894\r
-#: ../midori/sokoke.c:857\r
-msgid "_Bookmarks"\r
-msgstr "_Marcadores"\r
-\r
-#: ../midori/midori-browser.c:4896\r
-msgid "Show the saved bookmarks"\r
-msgstr "Amosar los marcadores guardaos."\r
-\r
-#: ../midori/midori-browser.c:4911\r
-msgid "_Tools"\r
-msgstr "_Ferramientes"\r
-\r
-#: ../midori/midori-browser.c:4923\r
-msgid "_Window"\r
-msgstr "_Ventanes"\r
-\r
-#: ../midori/midori-browser.c:4925\r
-msgid "Show a list of all open tabs"\r
-msgstr "Amosar una llista de toles llingüetes abiertes"\r
-\r
-#: ../midori/midori-browser.c:4939\r
-msgid "_Menu"\r
-msgstr "_Menú"\r
-\r
-#: ../midori/midori-browser.c:4941\r
-msgid "Menu"\r
-msgstr "_Menú"\r
-\r
-#. i18n: A panel at the bottom, to search text in pages\r
-#: ../midori/midori-browser.c:5127\r
-msgid "_Inline Find:"\r
-msgstr "_Guetar:"\r
-\r
-#: ../midori/midori-browser.c:5152\r
-msgid "Previous"\r
-msgstr "Anterior"\r
-\r
-#: ../midori/midori-browser.c:5157\r
-msgid "Next"\r
-msgstr "Siguiente"\r
-\r
-#: ../midori/midori-browser.c:5162\r
-msgid "Match Case"\r
-msgstr "Concasar mayúscules "\r
-\r
-#: ../midori/midori-browser.c:5170\r
-msgid "Highlight Matches"\r
-msgstr "Destacar coincidencies"\r
-\r
-#: ../midori/midori-browser.c:5180\r
-msgid "Close Findbar"\r
-msgstr "Zarrar la barra de gueta"\r
-\r
-#: ../midori/midori-browser.c:5215\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:109\r
-msgid "Delete All"\r
-msgstr "Desaniciar too"\r
-\r
-#: ../midori/midori-browser.c:5552\r
-#, c-format\r
-msgid "Unexpected setting '%s'"\r
-msgstr "Axuste non esperáu «%s»"\r
-\r
-#: ../midori/midori-locationaction.c:901\r
-#, c-format\r
-msgid "Search with %s"\r
-msgstr "Guetar con %s"\r
-\r
-#: ../midori/midori-panel.c:382\r
-#: ../midori/midori-panel.c:384\r
-msgid "Detach chosen panel from the window"\r
-msgstr "Separtar el panel esbilláu de la ventana"\r
-\r
-#: ../midori/midori-panel.c:394\r
-#: ../midori/midori-panel.c:396\r
-#: ../midori/midori-panel.c:577\r
-#: ../midori/midori-panel.c:580\r
-msgid "Align sidepanel to the right"\r
-msgstr "Alliniar el panel a mandrecha"\r
-\r
-#: ../midori/midori-panel.c:406\r
-#: ../midori/midori-panel.c:407\r
-msgid "Close panel"\r
-msgstr "Zarrar panel"\r
-\r
-#: ../midori/midori-panel.c:578\r
-#: ../midori/midori-panel.c:581\r
-msgid "Align sidepanel to the left"\r
-msgstr "Alliniar el panel a manzorga"\r
-\r
-#: ../midori/midori-panel.c:704\r
-msgid "Show panel _titles"\r
-msgstr "Amosar el panel de _títulos"\r
-\r
-#: ../midori/midori-panel.c:712\r
-msgid "Show operating _controls"\r
-msgstr "Amosar los _controles d'operación"\r
-\r
-#: ../midori/midori-panel.c:783\r
-msgid "Options"\r
-msgstr "Opciones"\r
-\r
-#: ../midori/midori-websettings.c:197\r
-msgid "Show Blank page"\r
-msgstr "Amosar páxina en blanco"\r
-\r
-#: ../midori/midori-websettings.c:198\r
-msgid "Show Homepage"\r
-msgstr "Amosar páxina d'aniciu"\r
-\r
-#: ../midori/midori-websettings.c:199\r
-msgid "Show last open tabs"\r
-msgstr "Amosar les caberes llingüetes abiertes"\r
-\r
-#: ../midori/midori-websettings.c:215\r
-msgid "Japanese (SHIFT_JIS)"\r
-msgstr "Xaponés (SHIFT_JIS)"\r
-\r
-#: ../midori/midori-websettings.c:234\r
-msgid "New tab"\r
-msgstr "Nueva llingüeta"\r
-\r
-#: ../midori/midori-websettings.c:235\r
-msgid "New window"\r
-msgstr "Nueva ventana"\r
-\r
-#: ../midori/midori-websettings.c:236\r
-msgid "Current tab"\r
-msgstr "Llingüeta actual"\r
-\r
-#: ../midori/midori-websettings.c:251\r
-msgid "Default"\r
-msgstr "Predetermináu"\r
-\r
-#: ../midori/midori-websettings.c:252\r
-msgid "Icons"\r
-msgstr "Iconos"\r
-\r
-#: ../midori/midori-websettings.c:253\r
-msgid "Text"\r
-msgstr "Testu"\r
-\r
-#: ../midori/midori-websettings.c:254\r
-msgid "Icons and text"\r
-msgstr "Iconos y testu"\r
-\r
-#: ../midori/midori-websettings.c:255\r
-msgid "Text beside icons"\r
-msgstr "Testu al delláu de los iconos"\r
-\r
-#: ../midori/midori-websettings.c:270\r
-msgid "All cookies"\r
-msgstr "Toles cookies/buelgues"\r
-\r
-#: ../midori/midori-websettings.c:271\r
-msgid "Session cookies"\r
-msgstr "Cookies/Buelgues de la sesión"\r
-\r
-#: ../midori/midori-websettings.c:272\r
-#: ../panels/midori-addons.c:94\r
-#: ../extensions/shortcuts.c:93\r
-msgid "None"\r
-msgstr "Denguna"\r
-\r
-#: ../midori/midori-websettings.c:288\r
-msgid "Safari"\r
-msgstr "Safari"\r
-\r
-#: ../midori/midori-websettings.c:289\r
-msgid "Firefox"\r
-msgstr "Firefox"\r
-\r
-#: ../midori/midori-websettings.c:290\r
-msgid "Internet Explorer"\r
-msgstr "Internet Explorer"\r
-\r
-#: ../midori/midori-websettings.c:343\r
-msgid "Remember last window size"\r
-msgstr "Remembrar el tamañu de la cabera ventana"\r
-\r
-#: ../midori/midori-websettings.c:344\r
-msgid "Whether to save the last window size"\r
-msgstr "Si se quier remembrar el tamañu de la cabera ventana"\r
-\r
-#: ../midori/midori-websettings.c:352\r
-msgid "Last window width"\r
-msgstr "Caberu anchor de la ventana"\r
-\r
-#: ../midori/midori-websettings.c:353\r
-msgid "The last saved window width"\r
-msgstr "Caberu anchor guardáu de la ventana"\r
-\r
-#: ../midori/midori-websettings.c:361\r
-msgid "Last window height"\r
-msgstr "Caberu altor de la ventana"\r
-\r
-#: ../midori/midori-websettings.c:362\r
-msgid "The last saved window height"\r
-msgstr "Caberu altor guardáu de la ventana "\r
-\r
-#: ../midori/midori-websettings.c:387\r
-msgid "Last panel position"\r
-msgstr "Cabera posición del panel"\r
-\r
-#: ../midori/midori-websettings.c:388\r
-msgid "The last saved panel position"\r
-msgstr "Cabera posición guardada del panel"\r
-\r
-#. i18n: The internal index of the last opened panel\r
-#: ../midori/midori-websettings.c:397\r
-msgid "Last panel page"\r
-msgstr "Cabera páxina del panel"\r
-\r
-#: ../midori/midori-websettings.c:398\r
-msgid "The last saved panel page"\r
-msgstr "Cabera páxina guardada del panel"\r
-\r
-#: ../midori/midori-websettings.c:406\r
-msgid "Last Web search"\r
-msgstr "Cabera gueta n'internet"\r
-\r
-#: ../midori/midori-websettings.c:407\r
-msgid "The last saved Web search"\r
-msgstr "Cabera gueta d'internet guardada"\r
-\r
-#: ../midori/midori-websettings.c:416\r
-msgid "Show Menubar"\r
-msgstr "Amosar barra de menú"\r
-\r
-#: ../midori/midori-websettings.c:417\r
-msgid "Whether to show the menubar"\r
-msgstr "Si se quier amosar la barra de menú"\r
-\r
-#: ../midori/midori-websettings.c:425\r
-msgid "Show Navigationbar"\r
-msgstr "Amosar la barra de restolar"\r
-\r
-#: ../midori/midori-websettings.c:426\r
-msgid "Whether to show the navigationbar"\r
-msgstr "Si se quier amosar la barra de restolar"\r
-\r
-#: ../midori/midori-websettings.c:434\r
-msgid "Show Bookmarkbar"\r
-msgstr "Amosar la barra de marcadores"\r
-\r
-#: ../midori/midori-websettings.c:435\r
-msgid "Whether to show the bookmarkbar"\r
-msgstr "Si se quier amosar la barra de marcadores"\r
-\r
-#: ../midori/midori-websettings.c:443\r
-msgid "Show Panel"\r
-msgstr "Amosar el panel"\r
-\r
-#: ../midori/midori-websettings.c:444\r
-msgid "Whether to show the panel"\r
-msgstr "Si se quier amosar el panel"\r
-\r
-#: ../midori/midori-websettings.c:459\r
-msgid "Show Transferbar"\r
-msgstr "Amosar la barra de tresferencies"\r
-\r
-#: ../midori/midori-websettings.c:460\r
-msgid "Whether to show the transferbar"\r
-msgstr "Si se quier amosar la barra de tresferencies"\r
-\r
-#: ../midori/midori-websettings.c:468\r
-msgid "Show Statusbar"\r
-msgstr "Amosar la barra d'estáu"\r
-\r
-#: ../midori/midori-websettings.c:469\r
-msgid "Whether to show the statusbar"\r
-msgstr "Si se quier amosar la barra d'estáu"\r
-\r
-#: ../midori/midori-websettings.c:478\r
-msgid "Toolbar Style:"\r
-msgstr "Estilu de la barra de xeres:"\r
-\r
-#: ../midori/midori-websettings.c:479\r
-msgid "The style of the toolbar"\r
-msgstr "Estilu de la barra de ferramientes"\r
-\r
-#: ../midori/midori-websettings.c:495\r
-msgid "Show progress in location entry"\r
-msgstr "Amosar progresu na barra de direiciones"\r
-\r
-#: ../midori/midori-websettings.c:496\r
-msgid "Whether to show loading progress in the location entry"\r
-msgstr "Si se quier amosar el progresu de carga nel llugar d'entrada"\r
-\r
-#: ../midori/midori-websettings.c:511\r
-msgid "Search engines in location completion"\r
-msgstr "Motores de gueta en completamientu"\r
-\r
-#: ../midori/midori-websettings.c:512\r
-msgid "Whether to show search engines in the location completion"\r
-msgstr "Si se quier amosar los motores de gueta en completamentu de direición"\r
-\r
-#: ../midori/midori-websettings.c:520\r
-msgid "Toolbar Items"\r
-msgstr "Elementos de la barra de ferramientes"\r
-\r
-#: ../midori/midori-websettings.c:521\r
-msgid "The items to show on the toolbar"\r
-msgstr "Los elementos a amosar na barra de ferramientes"\r
-\r
-#: ../midori/midori-websettings.c:529\r
-msgid "Compact Sidepanel"\r
-msgstr "Panel llateral compautu"\r
-\r
-#: ../midori/midori-websettings.c:530\r
-msgid "Whether to make the sidepanel compact"\r
-msgstr "Si se quier facer compautu el panel llateral"\r
-\r
-#: ../midori/midori-websettings.c:545\r
-msgid "Show operating controls of the panel"\r
-msgstr "Amosar los controles d'operación nel panel"\r
-\r
-#: ../midori/midori-websettings.c:546\r
-msgid "Whether to show the operating controls of the panel"\r
-msgstr "Si se quier amosar los controles d'operación nel panel"\r
-\r
-#: ../midori/midori-websettings.c:561\r
-msgid "Align sidepanel on the right"\r
-msgstr "Alliniar el panel a mandrecha"\r
-\r
-#: ../midori/midori-websettings.c:562\r
-msgid "Whether to align the sidepanel on the right"\r
-msgstr "Alliniar el panel llateral a mandrecha"\r
-\r
-#: ../midori/midori-websettings.c:571\r
-msgid "When Midori starts:"\r
-msgstr "Cuando Midori entama:"\r
-\r
-#: ../midori/midori-websettings.c:572\r
-msgid "What to do when Midori starts"\r
-msgstr "Qué facer al aniciu de Midori"\r
-\r
-#: ../midori/midori-websettings.c:581\r
-msgid "Homepage:"\r
-msgstr "Páxina d'aniciu:"\r
-\r
-#: ../midori/midori-websettings.c:582\r
-msgid "The homepage"\r
-msgstr "Páxina d'aniciu"\r
-\r
-#: ../midori/midori-websettings.c:597\r
-msgid "Show crash dialog"\r
-msgstr "Amosar diálogu de colingue"\r
-\r
-#: ../midori/midori-websettings.c:598\r
-msgid "Show a dialog after Midori crashed"\r
-msgstr "Amosar un diálogu dempués de que Midori se colingue"\r
-\r
-#. i18n: Speed dial, webpage shortcuts, named for the phone function\r
-#: ../midori/midori-websettings.c:614\r
-msgid "Show speed dial in new tabs"\r
-msgstr "Amosar marcación rápida en nueves llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:615\r
-msgid "Show speed dial in newly opened tabs"\r
-msgstr "Amosar marcación rápida nes llingüetes recién abiertes"\r
-\r
-#: ../midori/midori-websettings.c:623\r
-msgid "Save downloaded files to:"\r
-msgstr "Guardar los ficheros descargaos en:"\r
-\r
-#: ../midori/midori-websettings.c:624\r
-msgid "The folder downloaded files are saved to"\r
-msgstr "Carpeta au s'atroxen los ficheros descargaos"\r
-\r
-#: ../midori/midori-websettings.c:643\r
-msgid "Ask for the destination folder"\r
-msgstr "Entrugar pola carpeta de destín"\r
-\r
-#: ../midori/midori-websettings.c:644\r
-msgid "Whether to ask for the destination folder when downloading a file"\r
-msgstr "Si se quier escoyer la carpeta de destín cuando se descarga un ficheru"\r
-\r
-#: ../midori/midori-websettings.c:663\r
-msgid "Notify when a transfer has been completed"\r
-msgstr "Notificaime sobro les tresferencies completes"\r
-\r
-#: ../midori/midori-websettings.c:664\r
-msgid "Whether to show a notification when a transfer has been completed"\r
-msgstr "Si se quier amosar una notificación cuando se completó la tresferencia"\r
-\r
-#: ../midori/midori-websettings.c:676\r
-msgid "Download Manager"\r
-msgstr "Xestor de descargues"\r
-\r
-#: ../midori/midori-websettings.c:677\r
-msgid "An external download manager"\r
-msgstr "Xestor de descargues esternu"\r
-\r
-#: ../midori/midori-websettings.c:685\r
-msgid "Text Editor"\r
-msgstr "Editor de testu"\r
-\r
-#: ../midori/midori-websettings.c:686\r
-msgid "An external text editor"\r
-msgstr "Editor de testos esternu"\r
-\r
-#: ../midori/midori-websettings.c:701\r
-msgid "News Aggregator"\r
-msgstr "Amestador de noticies"\r
-\r
-#: ../midori/midori-websettings.c:702\r
-msgid "An external news aggregator"\r
-msgstr "Un amestador de noticies esternu"\r
-\r
-#: ../midori/midori-websettings.c:710\r
-msgid "Location entry Search"\r
-msgstr "Gueta na barra"\r
-\r
-#: ../midori/midori-websettings.c:711\r
-msgid "The search to perform inside the location entry"\r
-msgstr "Facer una gueta a partir del conteníu de la barra de direiciones"\r
-\r
-#: ../midori/midori-websettings.c:719\r
-msgid "Preferred Encoding"\r
-msgstr "Codificación prefería"\r
-\r
-#: ../midori/midori-websettings.c:720\r
-msgid "The preferred character encoding"\r
-msgstr "Codificación de carauteres prefería"\r
-\r
-#: ../midori/midori-websettings.c:730\r
-msgid "Always Show Tabbar"\r
-msgstr "Siempre amosar la barra de llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:731\r
-msgid "Always show the tabbar"\r
-msgstr "Siempre amosar la barra de llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:739\r
-msgid "Close Buttons on Tabs"\r
-msgstr "Botón de zarrar nes llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:740\r
-msgid "Whether tabs have close buttons"\r
-msgstr "Si se quier que les llingüetes tengan el botón de zarrar"\r
-\r
-#: ../midori/midori-websettings.c:748\r
-msgid "Open new pages in:"\r
-msgstr "Abrir les páxines nueves en:"\r
-\r
-#: ../midori/midori-websettings.c:749\r
-msgid "Where to open new pages"\r
-msgstr "Au abrir les páxines nueves"\r
-\r
-#: ../midori/midori-websettings.c:758\r
-msgid "Open external pages in:"\r
-msgstr "Abrir les páxines esternes en:"\r
-\r
-#: ../midori/midori-websettings.c:759\r
-msgid "Where to open externally opened pages"\r
-msgstr "Au abrir les páxines esternes"\r
-\r
-#: ../midori/midori-websettings.c:768\r
-msgid "Middle click opens Selection"\r
-msgstr "Clic del mediu abre la Escoyeta"\r
-\r
-#: ../midori/midori-websettings.c:769\r
-msgid "Load an address from the selection via middle click"\r
-msgstr "Cargar una direición dende la Escoyeta a traviés del botón del mediu del mur"\r
-\r
-#: ../midori/midori-websettings.c:777\r
-msgid "Open tabs in the background"\r
-msgstr "Abrir llingüetes en segundu planu"\r
-\r
-#: ../midori/midori-websettings.c:778\r
-msgid "Whether to open new tabs in the background"\r
-msgstr "Si se quier que les nueves llingüetes s'abran en segundu planu"\r
-\r
-#: ../midori/midori-websettings.c:786\r
-msgid "Open Tabs next to Current"\r
-msgstr "Abrir llingüetes xunto a l'actual"\r
-\r
-#: ../midori/midori-websettings.c:787\r
-msgid "Whether to open new tabs next to the current tab or after the last one"\r
-msgstr "Si se quier que les nueves llingüetes s'abran al delláu de la llingüeta actual o dempués de la cabera"\r
-\r
-#: ../midori/midori-websettings.c:795\r
-msgid "Open popups in tabs"\r
-msgstr "Abrir emerxentes en llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:796\r
-msgid "Whether to open popup windows in tabs"\r
-msgstr "Si se quier abrir les ventanes emerxentes en llingüetes"\r
-\r
-#: ../midori/midori-websettings.c:812\r
-msgid "Zoom Text and Images"\r
-msgstr "Ampliar testos ya imáxenes"\r
-\r
-#: ../midori/midori-websettings.c:813\r
-msgid "Whether to zoom text and images"\r
-msgstr "Si se quier ampliar testu ya imáxenes"\r
-\r
-#: ../midori/midori-websettings.c:828\r
-msgid "Find inline while typing"\r
-msgstr "Guetar nel testu al escribir"\r
-\r
-#: ../midori/midori-websettings.c:829\r
-msgid "Whether to automatically find inline while typing"\r
-msgstr "Si se quier guetar automáticamente nel testu al entamar a escribir"\r
-\r
-#: ../midori/midori-websettings.c:837\r
-msgid "Accept cookies"\r
-msgstr "Aceutar cookies"\r
-\r
-#: ../midori/midori-websettings.c:838\r
-msgid "What type of cookies to accept"\r
-msgstr "Qué tribes de cookies van aceutase"\r
-\r
-#: ../midori/midori-websettings.c:847\r
-msgid "Original cookies only"\r
-msgstr "Namái cookies orixinales"\r
-\r
-#: ../midori/midori-websettings.c:848\r
-msgid "Accept cookies from the original website only"\r
-msgstr "Namái s'aceuten les cookies del sitiu d'internet orixinal"\r
-\r
-#: ../midori/midori-websettings.c:856\r
-msgid "Maximum cookie age"\r
-msgstr "Duración máxima de les cookies"\r
-\r
-#: ../midori/midori-websettings.c:857\r
-msgid "The maximum number of days to save cookies for"\r
-msgstr "Númberu máximu de díes pa caltener les cookies"\r
-\r
-#: ../midori/midori-websettings.c:867\r
-msgid "Remember last visited pages"\r
-msgstr "Remembrar les caberes páxines visitaes"\r
-\r
-#: ../midori/midori-websettings.c:868\r
-msgid "Whether the last visited pages are saved"\r
-msgstr "Si se quier que les caberes páxines visitaes se remembren"\r
-\r
-#: ../midori/midori-websettings.c:876\r
-msgid "Maximum history age"\r
-msgstr "Duración máxima del hestorial"\r
-\r
-#: ../midori/midori-websettings.c:877\r
-msgid "The maximum number of days to save the history for"\r
-msgstr "Númberu máximu de díes pa caltener l'hestorial"\r
-\r
-#: ../midori/midori-websettings.c:885\r
-msgid "Remember last form inputs"\r
-msgstr "Remembrar lo que s'heba ingresáu en formularios"\r
-\r
-#: ../midori/midori-websettings.c:886\r
-msgid "Whether the last form inputs are saved"\r
-msgstr "Si se quier que les caberes entraes de formulariu se remembren"\r
-\r
-#: ../midori/midori-websettings.c:894\r
-msgid "Remember last downloaded files"\r
-msgstr "Remembrar los caberos ficheros descargaos"\r
-\r
-#: ../midori/midori-websettings.c:895\r
-msgid "Whether the last downloaded files are saved"\r
-msgstr "Si se quier que los ficheros descargados se remembren"\r
-\r
-#: ../midori/midori-websettings.c:905\r
-msgid "Proxy Server"\r
-msgstr "Sirvidor proxy"\r
-\r
-#: ../midori/midori-websettings.c:906\r
-msgid "The proxy server used for HTTP connections"\r
-msgstr "Sirvidor proxy usáu pa conexones HTTP"\r
-\r
-#: ../midori/midori-websettings.c:921\r
-msgid "Detect proxy server automatically"\r
-msgstr "Deteutar automáticamente el sirvidor proxy"\r
-\r
-#: ../midori/midori-websettings.c:922\r
-msgid "Whether to detect the proxy server automatically from the environment"\r
-msgstr "Si se quier deteutar automáticamente el sirvidor proxy dende l'entornu"\r
-\r
-#. i18n: This refers to an application, not the 'user agent' string\r
-#: ../midori/midori-websettings.c:938\r
-msgid "Identify as"\r
-msgstr "Identificar como:"\r
-\r
-#: ../midori/midori-websettings.c:939\r
-msgid "What to identify as to web pages"\r
-msgstr "Identificar como páxines d'internet"\r
-\r
-#: ../midori/midori-websettings.c:955\r
-msgid "Identification string"\r
-msgstr "Cadena d'identificación"\r
-\r
-#: ../midori/midori-websettings.c:956\r
-msgid "The application identification string"\r
-msgstr "Aplicación d'identificación de cadenes"\r
-\r
-#: ../midori/midori-websettings.c:964\r
-msgid "Cache size"\r
-msgstr "Tamañu del caché"\r
-\r
-#: ../midori/midori-websettings.c:965\r
-msgid "The allowed size of the cache"\r
-msgstr "Tamañu asignáu a la memoria caché"\r
-\r
-#: ../midori/midori-websettings.c:980\r
-msgid "Clear private data"\r
-msgstr "Desaniciar datos privaos"\r
-\r
-#: ../midori/midori-websettings.c:981\r
-msgid "The private data selected for deletion"\r
-msgstr "Los datos privaos esbillaos pa desaniciar"\r
-\r
-#: ../midori/midori-view.c:781\r
-#, c-format\r
-msgid "The page '%s' couldn't be loaded."\r
-msgstr "Nun pudo cargase la páxina «%s»."\r
-\r
-#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,\r
-#. so reloading via Javascript works but not via API calls.\r
-#: ../midori/midori-view.c:783\r
-#: ../midori/midori-view.c:3013\r
-#: ../extensions/feed-panel/main.c:112\r
-msgid "Error"\r
-msgstr "Fallu"\r
-\r
-#: ../midori/midori-view.c:786\r
-msgid "Try again"\r
-msgstr "Inténtelo otra vegada"\r
-\r
-#. i18n: The title of the 404 - Not found error page\r
-#. Error pages are special, we want to try loading the destination\r
-#. again, not the error page which isn't even a proper page\r
-#: ../midori/midori-view.c:818\r
-#: ../midori/midori-view.c:3017\r
-#, c-format\r
-msgid "Not found - %s"\r
-msgstr "Nun s'alcontró - %s"\r
-\r
-#: ../midori/midori-view.c:1205\r
-msgid "Open _Link"\r
-msgstr "Abrir _enllaz"\r
-\r
-#: ../midori/midori-view.c:1207\r
-msgid "Open Link in New _Tab"\r
-msgstr "Abrir enllaz en nueva _llingüeta"\r
-\r
-#: ../midori/midori-view.c:1224\r
-msgid "Open Link in New _Window"\r
-msgstr "Abrir enllaz en nueva _ventana"\r
-\r
-#: ../midori/midori-view.c:1230\r
-msgid "_Download Link destination"\r
-msgstr "_Baxar enllaz"\r
-\r
-#: ../midori/midori-view.c:1236\r
-msgid "_Save Link destination"\r
-msgstr "_Guardar enllaz"\r
-\r
-#: ../midori/midori-view.c:1245\r
-msgid "Download with Download _Manager"\r
-msgstr "Baxar col xestor de descargues"\r
-\r
-#: ../midori/midori-view.c:1274\r
-msgid "Search _with"\r
-msgstr "Guetar _con"\r
-\r
-#: ../midori/midori-view.c:1306\r
-msgid "_Search the Web"\r
-msgstr "_Guetar n'internet"\r
-\r
-#: ../midori/midori-view.c:1316\r
-msgid "Open Address in New _Tab"\r
-msgstr "Abrir direición nuna nueva _llingüeta "\r
-\r
-#: ../midori/midori-view.c:1494\r
-msgid "Open or download file"\r
-msgstr "Abrir o baxar ficheru"\r
-\r
-#: ../midori/midori-view.c:1511\r
-#, c-format\r
-msgid "File Type: '%s'"\r
-msgstr "Triba de ficheru: '%s'"\r
-\r
-#: ../midori/midori-view.c:1514\r
-#, c-format\r
-msgid "File Type: %s ('%s')"\r
-msgstr "Triba de ficheru: %s ('%s')"\r
-\r
-#. i18n: A file open dialog title, ie. "Open http://filera.com/manual.tgz"\r
-#: ../midori/midori-view.c:1518\r
-#, c-format\r
-msgid "Open %s"\r
-msgstr "Abrir %s"\r
-\r
-#: ../midori/midori-view.c:1957\r
-#, c-format\r
-msgid "Inspect page - %s"\r
-msgstr "Inspeicionar la páxina - %s"\r
-\r
-#: ../midori/midori-view.c:2147\r
-msgid "Speed Dial"\r
-msgstr "Marcación rápida"\r
-\r
-#: ../midori/midori-view.c:2148\r
-msgid "Click to add a shortcut"\r
-msgstr "Fai clic equí p'amestar un accesu direutu"\r
-\r
-#: ../midori/midori-view.c:2149\r
-msgid "Enter shortcut address"\r
-msgstr "Introduza la direición del accesu direutu"\r
-\r
-#: ../midori/midori-view.c:2150\r
-msgid "Enter shortcut title"\r
-msgstr "Introduza'l títulu del accesu direutu"\r
-\r
-#: ../midori/midori-view.c:2151\r
-msgid "Are you sure you want to delete this shortcut?"\r
-msgstr "¿Daveres que quies desaniciar ésti accesu direutu?"\r
-\r
-#: ../midori/midori-view.c:2181\r
-#, c-format\r
-msgid "Document cannot be displayed"\r
-msgstr "Nun puede amosase'l documentu"\r
-\r
-#: ../midori/midori-view.c:2198\r
-#, c-format\r
-msgid "No documentation installed"\r
-msgstr "Nun se dispón de documentación instalada"\r
-\r
-#: ../midori/midori-view.c:2323\r
-msgid "Blank page"\r
-msgstr "Páxina en blancu"\r
-\r
-#: ../midori/midori-view.c:2551\r
-#: ../midori/sokoke.c:865\r
-msgid "New _Tab"\r
-msgstr "Nueva _llingüeta"\r
-\r
-#: ../midori/midori-view.c:2565\r
-msgid "_Duplicate Tab"\r
-msgstr "_Duplicar llingüeta"\r
-\r
-#: ../midori/midori-view.c:2570\r
-msgid "_Restore Tab"\r
-msgstr "_Restaurar llingüeta"\r
-\r
-#: ../midori/midori-view.c:2570\r
-msgid "_Minimize Tab"\r
-msgstr "_Minimizar llingüeta"\r
-\r
-#: ../midori/midori-preferences.c:91\r
-#, c-format\r
-msgid "Preferences for %s"\r
-msgstr "Preferencies de %s"\r
-\r
-#. Page "General"\r
-#: ../midori/midori-preferences.c:398\r
-msgid "General"\r
-msgstr "Xeneral"\r
-\r
-#: ../midori/midori-preferences.c:399\r
-msgid "Startup"\r
-msgstr "Aniciu"\r
-\r
-#: ../midori/midori-preferences.c:415\r
-msgid "Use current page as homepage"\r
-msgstr "Usar la páxina actual como páxina d'aniciu"\r
-\r
-#: ../midori/midori-preferences.c:425\r
-#: ../panels/midori-transfers.c:88\r
-msgid "Transfers"\r
-msgstr "Tresferencies"\r
-\r
-#. Page "Appearance"\r
-#: ../midori/midori-preferences.c:440\r
-msgid "Appearance"\r
-msgstr "Aspeutu"\r
-\r
-#: ../midori/midori-preferences.c:441\r
-msgid "Font settings"\r
-msgstr "Configuración de les fontes"\r
-\r
-#: ../midori/midori-preferences.c:443\r
-msgid "Default Font Family"\r
-msgstr "Fonte por defeutu"\r
-\r
-#: ../midori/midori-preferences.c:447\r
-msgid "The default font family used to display text"\r
-msgstr "Tamañu de fonte predetermináu utilizáu p'amosar testu"\r
-\r
-#: ../midori/midori-preferences.c:450\r
-msgid "The default font size used to display text"\r
-msgstr "Tamañu de fonte predetermináu utilizáu p'amosar testu"\r
-\r
-#: ../midori/midori-preferences.c:453\r
-msgid "Fixed-width Font Family"\r
-msgstr "Fonte d'anchor fixu"\r
-\r
-#: ../midori/midori-preferences.c:457\r
-msgid "The font family used to display fixed-width text"\r
-msgstr "Fonte usada p'amosar el testu d'anchor fixu"\r
-\r
-#: ../midori/midori-preferences.c:460\r
-msgid "The font size used to display fixed-width text"\r
-msgstr "Tamañu de fonte usada p'amosar el testu d'anchor fixu"\r
-\r
-#: ../midori/midori-preferences.c:463\r
-msgid "Minimum Font Size"\r
-msgstr "Tamañu mínimu de fonte"\r
-\r
-#: ../midori/midori-preferences.c:466\r
-msgid "The minimum font size used to display text"\r
-msgstr "Mínimu tamañu de fonte usáu p'amosar testu"\r
-\r
-#: ../midori/midori-preferences.c:473\r
-msgid "Encoding"\r
-msgstr "Codificación"\r
-\r
-#: ../midori/midori-preferences.c:476\r
-msgid "The character encoding to use by default"\r
-msgstr "Codificación de carauteres a usar por defeutu"\r
-\r
-#. Page "Behavior"\r
-#: ../midori/midori-preferences.c:483\r
-msgid "Behavior"\r
-msgstr "Comportamientu"\r
-\r
-#: ../midori/midori-preferences.c:484\r
-msgid "Features"\r
-msgstr "Carauterístiques"\r
-\r
-#: ../midori/midori-preferences.c:487\r
-#: ../extensions/statusbar-features.c:88\r
-msgid "Load images automatically"\r
-msgstr "Cargar imáxenes automáticamente"\r
-\r
-#: ../midori/midori-preferences.c:488\r
-msgid "Load and display images automatically"\r
-msgstr "Cargar y amosar imáxenes automáticamente"\r
-\r
-#: ../midori/midori-preferences.c:491\r
-msgid "Shrink images automatically"\r
-msgstr "Amenorgar imáxenes automáticamente"\r
-\r
-#: ../midori/midori-preferences.c:492\r
-msgid "Automatically shrink standalone images to fit"\r
-msgstr "Amenorgar imáxenes automáticamente independientemente si caben"\r
-\r
-#: ../midori/midori-preferences.c:495\r
-msgid "Print background images"\r
-msgstr "Imprentar imáxenes de fondu"\r
-\r
-#: ../midori/midori-preferences.c:496\r
-msgid "Whether background images should be printed"\r
-msgstr "Si se quier imprentar les imáxenes de fondu"\r
-\r
-#: ../midori/midori-preferences.c:499\r
-msgid "Resizable text areas"\r
-msgstr "Árees de testu dimensionables"\r
-\r
-#: ../midori/midori-preferences.c:500\r
-msgid "Whether text areas are resizable"\r
-msgstr "Si se quier que les árees de testu seyan dimensionables"\r
-\r
-#: ../midori/midori-preferences.c:503\r
-#: ../extensions/statusbar-features.c:100\r
-msgid "Enable scripts"\r
-msgstr "Habilitar scripts"\r
-\r
-#: ../midori/midori-preferences.c:504\r
-msgid "Enable embedded scripting languages"\r
-msgstr "Habilitar script de llinguaxes embebíos"\r
-\r
-#: ../midori/midori-preferences.c:507\r
-#: ../extensions/statusbar-features.c:112\r
-msgid "Enable Netscape plugins"\r
-msgstr "Habilitar complementos Netscape"\r
-\r
-#: ../midori/midori-preferences.c:508\r
-msgid "Enable embedded Netscape plugin objects"\r
-msgstr "Habilitar el complementu d'oxetos embebíos Netscape"\r
-\r
-#: ../midori/midori-preferences.c:511\r
-msgid "Enforce 96 dots per inch"\r
-msgstr "Aplicar 96 puntos por pulgada"\r
-\r
-#: ../midori/midori-preferences.c:512\r
-msgid "Enforce a video dot density of 96 DPI"\r
-msgstr "Aplicar una densidá de puntos de videu de 96 DPI"\r
-\r
-#: ../midori/midori-preferences.c:515\r
-msgid "Enable developer tools"\r
-msgstr "Habilitar ferramientes de desendolcu"\r
-\r
-#: ../midori/midori-preferences.c:516\r
-msgid "Enable special extensions for developers"\r
-msgstr "Habilitar estensiones especiales pa desendolcadores"\r
-\r
-#: ../midori/midori-preferences.c:523\r
-msgid "Spell Checking"\r
-msgstr "Correutor ortográficu"\r
-\r
-#: ../midori/midori-preferences.c:526\r
-msgid "Enable Spell Checking"\r
-msgstr "Habilitar el correutor ortográficu"\r
-\r
-#: ../midori/midori-preferences.c:527\r
-msgid "Enable spell checking while typing"\r
-msgstr "Habilitar el correutor ortográficu al escribir"\r
-\r
-#. i18n: The example should be adjusted to contain a good local default\r
-#: ../midori/midori-preferences.c:531\r
-msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""\r
-msgstr "Llista de llingües separtaes con comes que s'usarán pa la igua ortográfica, por exemplu \"en_GB,de_DE\""\r
-\r
-#. Page "Interface"\r
-#: ../midori/midori-preferences.c:536\r
-msgid "Interface"\r
-msgstr "Interface"\r
-\r
-#: ../midori/midori-preferences.c:537\r
-msgid "Navigationbar"\r
-msgstr "Barra de restolar"\r
-\r
-#: ../midori/midori-preferences.c:548\r
-msgid "Browsing"\r
-msgstr "Restolar"\r
-\r
-#. Page "Applications"\r
-#: ../midori/midori-preferences.c:574\r
-msgid "Applications"\r
-msgstr "Aplicaciones"\r
-\r
-#: ../midori/midori-preferences.c:575\r
-msgid "External applications"\r
-msgstr "Aplicaciones esternes"\r
-\r
-#. Page "Network"\r
-#: ../midori/midori-preferences.c:621\r
-#: ../midori/midori-preferences.c:622\r
-msgid "Network"\r
-msgstr "Rede"\r
-\r
-#: ../midori/midori-preferences.c:649\r
-msgid "MB"\r
-msgstr "MB"\r
-\r
-#. Page "Privacy"\r
-#: ../midori/midori-preferences.c:654\r
-msgid "Privacy"\r
-msgstr "Privacidá"\r
-\r
-#: ../midori/midori-preferences.c:655\r
-msgid "Web Cookies"\r
-msgstr "Cookies de Web"\r
-\r
-#: ../midori/midori-preferences.c:668\r
-#: ../midori/midori-preferences.c:678\r
-msgid "days"\r
-msgstr "díes"\r
-\r
-#: ../midori/midori-searchaction.c:488\r
-#: ../katze/katze-arrayaction.c:335\r
-msgid "Empty"\r
-msgstr "Baleru"\r
-\r
-#: ../midori/midori-searchaction.c:908\r
-msgid "Add search engine"\r
-msgstr "Amestar un motor de gueta"\r
-\r
-#: ../midori/midori-searchaction.c:908\r
-msgid "Edit search engine"\r
-msgstr "Editar motor de gueta"\r
-\r
-#: ../midori/midori-searchaction.c:936\r
-msgid "_Name:"\r
-msgstr "_Nome:"\r
-\r
-#: ../midori/midori-searchaction.c:980\r
-msgid "_Icon:"\r
-msgstr "_Iconu"\r
-\r
-#: ../midori/midori-searchaction.c:994\r
-msgid "_Token:"\r
-msgstr "_Abreviatura:"\r
-\r
-#: ../midori/midori-searchaction.c:1213\r
-msgid "Manage Search Engines"\r
-msgstr "Alministrar los motores de gueta"\r
-\r
-#: ../midori/midori-searchaction.c:1312\r
-msgid "Use as _default"\r
-msgstr "_Predetermináu"\r
-\r
-#: ../midori/sokoke.c:162\r
-#: ../midori/sokoke.c:174\r
-msgid "Could not run external program."\r
-msgstr "Nun pudo executar l'aplicación esterna."\r
-\r
-#: ../midori/sokoke.c:856\r
-msgid "_Bookmark"\r
-msgstr "_Marcador"\r
-\r
-#: ../midori/sokoke.c:858\r
-msgid "Add Boo_kmark"\r
-msgstr "Amestar _marcadores"\r
-\r
-#: ../midori/sokoke.c:859\r
-msgid "_Console"\r
-msgstr "_Consola"\r
-\r
-#: ../midori/sokoke.c:860\r
-msgid "_Extensions"\r
-msgstr "_Estensiones"\r
-\r
-#: ../midori/sokoke.c:861\r
-msgid "_History"\r
-msgstr "_Hestorial"\r
-\r
-#: ../midori/sokoke.c:862\r
-msgid "_Homepage"\r
-msgstr "_Páxina d'aniciu"\r
-\r
-#: ../midori/sokoke.c:863\r
-msgid "_Userscripts"\r
-msgstr "_Scripts d'usuariu"\r
-\r
-#: ../midori/sokoke.c:864\r
-msgid "User_styles"\r
-msgstr "_Estilos d'usuariu"\r
-\r
-#: ../midori/sokoke.c:866\r
-msgid "_Transfers"\r
-msgstr "_Tresferencies"\r
-\r
-#: ../midori/sokoke.c:867\r
-msgid "Netscape p_lugins"\r
-msgstr "C_omplementos Netscape"\r
-\r
-#: ../panels/midori-addons.c:95\r
-#: ../panels/midori-addons.c:141\r
-msgid "Userscripts"\r
-msgstr "Scripts d'usuariu"\r
-\r
-#: ../panels/midori-addons.c:96\r
-#: ../panels/midori-addons.c:143\r
-msgid "Userstyles"\r
-msgstr "Estilos d'usuariu"\r
-\r
-#: ../panels/midori-bookmarks.c:108\r
-msgid "Bookmarks"\r
-msgstr "Marcadores"\r
-\r
-#: ../panels/midori-bookmarks.c:239\r
-msgid "Edit the selected bookmark"\r
-msgstr "Editar el marcador escoyíu"\r
-\r
-#: ../panels/midori-bookmarks.c:247\r
-msgid "Delete the selected bookmark"\r
-msgstr "Desaniciar el marcador escoyíu"\r
-\r
-#: ../panels/midori-bookmarks.c:260\r
-msgid "Add a new folder"\r
-msgstr "Amestar una nueva carpeta"\r
-\r
-#: ../panels/midori-bookmarks.c:592\r
-msgid "<i>Separator</i>"\r
-msgstr "<i>Separtador</i>"\r
-\r
-#: ../panels/midori-console.c:87\r
-msgid "Console"\r
-msgstr "Consola"\r
-\r
-#: ../panels/midori-extensions.c:91\r
-msgid "Extensions"\r
-msgstr "Estensiones"\r
-\r
-#: ../panels/midori-history.c:162\r
-msgid "Are you sure you want to remove all history items?"\r
-msgstr "¿Daveres quies quitar tolos elementos del hestorial?"\r
-\r
-#: ../panels/midori-history.c:217\r
-msgid "Bookmark the selected history item"\r
-msgstr "Amestar a marcadores l'elementu escoyíu del hestorial"\r
-\r
-#: ../panels/midori-history.c:226\r
-msgid "Delete the selected history item"\r
-msgstr "Desaniciar del hestorial l'elementu escoyíu"\r
-\r
-#: ../panels/midori-history.c:234\r
-msgid "Clear the entire history"\r
-msgstr "Vaciar l'hestorial completu"\r
-\r
-#: ../panels/midori-history.c:601\r
-msgid "A week ago"\r
-msgstr "Fai una selmana"\r
-\r
-#: ../panels/midori-history.c:606\r
-#, c-format\r
-msgid "%d day ago"\r
-msgid_plural "%d days ago"\r
-msgstr[0] "Fai %d día"\r
-msgstr[1] "Fai %d díes"\r
-\r
-#: ../panels/midori-history.c:614\r
-msgid "Today"\r
-msgstr "Güei"\r
-\r
-#: ../panels/midori-history.c:616\r
-msgid "Yesterday"\r
-msgstr "Ayeri"\r
-\r
-#: ../panels/midori-plugins.c:87\r
-#: ../extensions/statusbar-features.c:108\r
-msgid "Netscape plugins"\r
-msgstr "Complementos Netscape"\r
-\r
-#: ../panels/midori-transfers.c:271\r
-#, c-format\r
-msgid "%s of %s"\r
-msgstr "%s de %s"\r
-\r
-#: ../panels/midori-transfers.c:479\r
-msgid "Open Destination _Folder"\r
-msgstr "Abrir la _carpeta de destín"\r
-\r
-#: ../panels/midori-transfers.c:482\r
-msgid "Copy Link Loc_ation"\r
-msgstr "Copiar _enllaz"\r
-\r
-#: ../katze/katze-http-auth.c:97\r
-msgid "Authentication Required"\r
-msgstr "Requierse autentificación"\r
-\r
-#: ../katze/katze-http-auth.c:113\r
-msgid ""\r
-"A username and a password are required\n"\r
-"to open this location:"\r
-msgstr ""\r
-"Nome d'usuariu y contraseña requeríos\n"\r
-"p'abrir ésti allugamientu:"\r
-\r
-#: ../katze/katze-http-auth.c:127\r
-msgid "Username"\r
-msgstr "Nome d'usuariu"\r
-\r
-#: ../katze/katze-http-auth.c:138\r
-msgid "Password"\r
-msgstr "Contraseña"\r
-\r
-#: ../katze/katze-throbber.c:828\r
-#, c-format\r
-msgid "Named icon '%s' couldn't be loaded"\r
-msgstr "Nun pudo cargase l'iconu denomáu «%s»"\r
-\r
-#: ../katze/katze-throbber.c:841\r
-#, c-format\r
-msgid "Stock icon '%s' couldn't be loaded"\r
-msgstr "Nun pudo cargase l'iconu stock «%s»"\r
-\r
-#: ../katze/katze-throbber.c:907\r
-msgid "Animation frames are broken"\r
-msgstr "Los cuadros d'animación tán frañaos"\r
-\r
-#: ../katze/katze-utils.c:200\r
-#: ../katze/katze-utils.c:407\r
-#, c-format\r
-msgid "Property '%s' is invalid for %s"\r
-msgstr "La propiedá «%s» nun ye válida pa %s"\r
-\r
-#: ../katze/katze-utils.c:235\r
-#: ../katze/katze-utils.c:264\r
-msgid "Choose file"\r
-msgstr "Escoyer ficheru"\r
-\r
-#: ../katze/katze-utils.c:250\r
-msgid "Choose folder"\r
-msgstr "Escoyer carpeta"\r
-\r
-#: ../extensions/adblock.c:167\r
-msgid "Configure Advertisement filters"\r
-msgstr "Configurar los filtros de publicidá"\r
-\r
-#: ../extensions/adblock.c:304\r
-msgid "Configure _Advertisement filters…"\r
-msgstr "Configurar filtros de p_ublicidá…"\r
-\r
-#: ../extensions/adblock.c:562\r
-msgid "Advertisement blocker"\r
-msgstr "Bloquiador de publicidá"\r
-\r
-#: ../extensions/adblock.c:563\r
-msgid "Block advertisements according to a filter list"\r
-msgstr "Bloquear publicidad de acuerdo a una llista de filtros"\r
-\r
-#: ../extensions/colorful-tabs.c:115\r
-msgid "Tint tabs distinctly"\r
-msgstr "Llingüetes de distintos colores"\r
-\r
-#: ../extensions/colorful-tabs.c:151\r
-msgid "Colorful Tabs"\r
-msgstr "Llingüetes de colores"\r
-\r
-#: ../extensions/colorful-tabs.c:152\r
-msgid "Tint each tab distinctly"\r
-msgstr "Colorear llingüetes de distintos colores"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:79\r
-#: ../extensions/cookie-manager/main.c:56\r
-msgid "Cookie Manager"\r
-msgstr "Xestor de cookies"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:111\r
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."\r
-msgstr "Desanicia toles cookies. Si s'afita un peñera, namái se desaniciarán les \"cookies\" que concasen cola peñera."\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:126\r
-msgid "Expand All"\r
-msgstr "Espander too"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:133\r
-msgid "Collapse All"\r
-msgstr "Contrayer too"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:460\r
-msgid "Do you really want to delete all cookies?"\r
-msgstr "¿Daveres quies desaniciar toles cookies?"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:462\r
-msgid "Question"\r
-msgstr "Entruga"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:471\r
-msgid "Only cookies which match the filter will be deleted."\r
-msgstr "Namái se desaniciarán les cookies visibles que concasen cola peñera."\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:539\r
-msgid "At the end of the session"\r
-msgstr "Al final de la sesión"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:542\r
-#, c-format\r
-msgid ""\r
-"<b>Host</b>: %s\n"\r
-"<b>Name</b>: %s\n"\r
-"<b>Value</b>: %s\n"\r
-"<b>Path</b>: %s\n"\r
-"<b>Secure</b>: %s\n"\r
-"<b>Expires</b>: %s"\r
-msgstr ""\r
-"<b>Sirvidor</b>: %s\n"\r
-"<b>Nome</b>: %s\n"\r
-"<b>Valor</b>: %s\n"\r
-"<b>Camín</b>: %s\n"\r
-"<b>Seguru</b>: %s\n"\r
-"<b>Caduca</b>: %s"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:548\r
-msgid "Yes"\r
-msgstr "Sí"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:548\r
-msgid "No"\r
-msgstr "Non"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:811\r
-msgid "Name"\r
-msgstr "Nome"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:862\r
-msgid "_Expand All"\r
-msgstr "_Espander too"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:870\r
-msgid "_Collapse All"\r
-msgstr "_Contrayer too"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:923\r
-msgid "Filter:"\r
-msgstr "Peñera:"\r
-\r
-#: ../extensions/cookie-manager/cookie-manager-page.c:928\r
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"\r
-msgstr "Introduza una cadena de peñera p'amosar namái les cookies cuyu nome o dominiu concasa cola peñera ingresada"\r
-\r
-#: ../extensions/cookie-manager/main.c:40\r
-msgid "_Cookie Manager"\r
-msgstr "_Xestor de cookies"\r
-\r
-#: ../extensions/cookie-manager/main.c:57\r
-msgid "List, view and delete cookies"\r
-msgstr "Llistar, ver y desaniciar cookies"\r
-\r
-#: ../extensions/feed-panel/feed-atom.c:242\r
-msgid "Failed to find required Atom \"entry\" elements in XML data."\r
-msgstr "Nun pudo atopar los elementos necesarios Atom \"entry\" nos datos XML."\r
-\r
-#: ../extensions/feed-panel/feed-atom.c:348\r
-msgid "Failed to find required Atom \"feed\" elements in XML data."\r
-msgstr "Nun pudo atopar los elementos necesarios Atom \"feed\" nos datos XML."\r
-\r
-#. i18n: The local date a feed was last updated\r
-#: ../extensions/feed-panel/feed-panel.c:399\r
-#, c-format\r
-msgctxt "Feed"\r
-msgid "Last updated: %s."\r
-msgstr "Caberu anovamientu: %s."\r
-\r
-#: ../extensions/feed-panel/feed-panel.c:664\r
-msgid "Feeds"\r
-msgstr "Canales"\r
-\r
-#: ../extensions/feed-panel/feed-panel.c:717\r
-msgid "Add new feed"\r
-msgstr "Amestar nueva canal"\r
-\r
-#: ../extensions/feed-panel/feed-panel.c:724\r
-msgid "Delete feed"\r
-msgstr "Desaniciar canal"\r
-\r
-#: ../extensions/feed-panel/feed-panel.c:807\r
-msgid "_Feeds"\r
-msgstr "_Canales"\r
-\r
-#: ../extensions/feed-panel/feed-pase.c:185\r
-#, c-format\r
-msgid "Failed to find root element in feed XML data."\r
-msgstr "Nun pudo atopase l'elementu raigañu na canal d'información XML."\r
-\r
-#: ../extensions/feed-panel/feed-pase.c:225\r
-#, c-format\r
-msgid "Unsupported feed format."\r
-msgstr "Formatu de canal non sofitáu."\r
-\r
-#: ../extensions/feed-panel/feed-pase.c:255\r
-#, c-format\r
-msgid "Failed to pase XML feed: %s"\r
-msgstr "Nun pudo analizase la canal XML: %s"\r
-\r
-#: ../extensions/feed-panel/feed-rss.c:46\r
-msgid "Failed to find \"channel\" element in RSS XML data."\r
-msgstr "Nun pudo atopase l'elementu \"channel\" nos datos XML del RSS"\r
-\r
-#: ../extensions/feed-panel/feed-rss.c:51\r
-msgid "Unsupported RSS version found."\r
-msgstr "Versión de RSS non soportada."\r
-\r
-#: ../extensions/feed-panel/feed-rss.c:148\r
-msgid "Failed to find required RSS \"item\" elements in XML data."\r
-msgstr "Nun pudo atopase los elementos necesarios RSS \"item\" nos datos XML."\r
-\r
-#: ../extensions/feed-panel/feed-rss.c:248\r
-msgid "Failed to find required RSS \"channel\" elements in XML data."\r
-msgstr "Nun pudo atopase los elementos necesarios RSS \"channel\" nos datos XML."\r
-\r
-#: ../extensions/feed-panel/main.c:114\r
-#, c-format\r
-msgid "Feed '%s' already exists"\r
-msgstr "La canal '%s' yá esiste"\r
-\r
-#: ../extensions/feed-panel/main.c:191\r
-#, c-format\r
-msgid "Error loading feed '%s'"\r
-msgstr "Error al cargar la canal '%s'"\r
-\r
-#: ../extensions/feed-panel/main.c:331\r
-msgid "New feed"\r
-msgstr "Nuevu canal"\r
-\r
-#: ../extensions/feed-panel/main.c:489\r
-msgid "Feed Panel"\r
-msgstr "Panel de canales"\r
-\r
-#: ../extensions/feed-panel/main.c:490\r
-msgid "Read Atom/ RSS feeds"\r
-msgstr "Llector de canales Atom/RSS"\r
-\r
-#: ../extensions/mouse-gestures/main.c:236\r
-msgid "Mouse Gestures"\r
-msgstr "Xestor de mur"\r
-\r
-#: ../extensions/mouse-gestures/main.c:237\r
-msgid "Control Midori by moving the mouse"\r
-msgstr "Controlar Midori moviendo'l mur"\r
-\r
-#. i18n: A panel showing a user specified web page\r
-#: ../extensions/page-holder.c:129\r
-#: ../extensions/page-holder.c:177\r
-msgid "Pageholder"\r
-msgstr "Anclar páxina"\r
-\r
-#: ../extensions/page-holder.c:161\r
-msgid "_Pageholder"\r
-msgstr "_Anclar páxina"\r
-\r
-#: ../extensions/shortcuts.c:172\r
-msgid "Customize Keyboard shortcuts"\r
-msgstr "Personalizar los atayos del tecláu"\r
-\r
-#: ../extensions/shortcuts.c:264\r
-msgid "Customize Sh_ortcuts…"\r
-msgstr "Personalizar los ac_cesos direutos…"\r
-\r
-#: ../extensions/shortcuts.c:303\r
-msgid "Shortcuts"\r
-msgstr "Accesos direutos"\r
-\r
-#: ../extensions/shortcuts.c:304\r
-msgid "View and edit keyboard shortcuts"\r
-msgstr "Ver y editar los atayos de tecláu"\r
-\r
-#: ../extensions/statusbar-features.c:84\r
-msgid "Images"\r
-msgstr "Imáxenes"\r
-\r
-#: ../extensions/statusbar-features.c:96\r
-msgid "Scripts"\r
-msgstr "Scripts"\r
-\r
-#: ../extensions/statusbar-features.c:149\r
-msgid "Statusbar Features"\r
-msgstr "Barra de funcionalidaes"\r
-\r
-#: ../extensions/statusbar-features.c:150\r
-msgid "Easily toggle features on web pages on and off"\r
-msgstr "Alternar cenciellamente les carauterístiques de páxines web dientro y fuera"\r
-\r
-#: ../extensions/tab-panel.c:383\r
-#: ../extensions/tab-panel.c:443\r
-msgid "Tab Panel"\r
-msgstr "Panel de llingüetes"\r
-\r
-#: ../extensions/tab-panel.c:427\r
-msgid "T_ab Panel"\r
-msgstr "Panel de llingüe_tes"\r
-\r
-#: ../extensions/tab-panel.c:444\r
-msgid "Show tabs in a vertical panel"\r
-msgstr "Amosar les llingüetes nún panel vertical"\r
-\r
-#: ../extensions/toolbar-editor.c:391\r
-msgid "Customize Toolbar"\r
-msgstr "Personalizar la barra de xeres"\r
-\r
-#: ../extensions/toolbar-editor.c:407\r
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."\r
-msgstr "Escueyi los elementos que s'amosarán na barra de ferramientes. Los elementos pueden reordenase arrastrando y soltando."\r
-\r
-#: ../extensions/toolbar-editor.c:423\r
-msgid "Available Items"\r
-msgstr "Elementos disponibles"\r
-\r
-#: ../extensions/toolbar-editor.c:444\r
-msgid "Displayed Items"\r
-msgstr "Elementos usaos"\r
-\r
-#: ../extensions/toolbar-editor.c:579\r
-msgid "Customize _Toolbar…"\r
-msgstr "Personalizar la barra de _xeres…"\r
-\r
-#: ../extensions/toolbar-editor.c:611\r
-msgid "Toolbar Editor"\r
-msgstr "Editor de la barra de ferramientes"\r
-\r
-#: ../extensions/toolbar-editor.c:612\r
-msgid "Easily edit the toolbar layout"\r
-msgstr "Editar cenciellamente el diseñu de la barra de herramienta"\r
-\r
-#~ msgid "_Closed Tabs and Windows"\r
-#~ msgstr "_Llingüetes y ventanes zarraes"\r
-#~ msgid "Last open pages"\r
-#~ msgstr "Caberes páxines visitaes"\r
-#~ msgid "Both"\r
-#~ msgstr "Dambos"\r
-#~ msgid "Both horizontal"\r
-#~ msgstr "Dambos n'horizontal"\r
-#~ msgid "Load on Startup"\r
-#~ msgstr "Al entamar Midori cargar:"\r
-#~ msgid "Download Folder"\r
-#~ msgstr "Carpeta de descargues"\r
-#~ msgid "Configure _Toolbar…"\r
-#~ msgstr "Configurar la _Barra de xeres"\r
-#~ msgid "_Quick Find"\r
-#~ msgstr "Gueta _rápida"\r
-#~ msgid "Quickly jump to a word or phrase"\r
-#~ msgstr "Saltar aína a una pallabra o una frase"\r
-#~ msgid "Whether to detach the chosen panel from the window"\r
-#~ msgstr "Separtar el panel de la ventana"\r
-#~ msgid "Search"\r
-#~ msgstr "Guetar"\r
-#~ msgid "Warning: You are using a superuser account!"\r
-#~ msgstr "Avisu: Vusté ta usando una cuenta de superusuariu!"\r
-#~ msgid "_Enable"\r
-#~ msgstr "_Activar"\r
-#~ msgid "Enable"\r
-#~ msgstr "Activar"\r
-#~ msgid "_Disable"\r
-#~ msgstr "_Desactivar"\r
-#~ msgid "Disable"\r
-#~ msgstr "Desactivar"\r
-#~ msgid "%d days ago"\r
-#~ msgstr "Fai %d díes"\r
-#~ msgid "P_lugins"\r
-#~ msgstr "C_omplementos"\r
-#~ msgid "Plugins"\r
-#~ msgstr "Complementos"\r
-#~ msgid "Source"\r
-#~ msgstr "Códigu fonte"\r
-#~ msgid "_Icon (name or file):"\r
-#~ msgstr "_Iconu (nome o ficheru):"\r
-#~ msgid "%s has no property '%s'"\r
-#~ msgstr "%s nun tien la propiedá «%s»"\r
-#~ msgid "%s cannot be assigned to %s.%s"\r
-#~ msgstr "%s nun puede asignase a %s.%s"\r
-#~ msgid "%s.%s cannot be accessed"\r
-#~ msgstr "%s.%s nun se puede acceder"\r
-#~ msgid "Manage search engines"\r
-#~ msgstr "Alministrar los motores de gueta"\r
-#~ msgid "URIs"\r
-#~ msgstr "URIs"\r
-#~ msgid "[URIs]"\r
-#~ msgstr "[URIs]"\r
-#~ msgid "_URL:"\r
-#~ msgstr "_URL "\r
-#~ msgid "Root"\r
-#~ msgstr "Raigañu"\r
-#~ msgid "HTTP Proxy"\r
-#~ msgstr "HTTP Proxy"\r
-#~ msgid "Open URL in New _Tab"\r
-#~ msgstr "Abrir URL nuna llingüeta _nueva"\r
-\r
+# Asturian translations for midori package.
+# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the midori package.
+# Astur <malditoastur@gmail.com> 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori 0.1.7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-06-02 11:55+0000\n"
+"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
+"Language-Team: GALPon MiniNo <mbouzada@gmail.com>\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-Launchpad-Export-Date: 2014-11-26 05:58+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Restolador"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Captura guardada en: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Executar DIRECCIÓN como una aplicación d'internet"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "DIREICIÓN"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Usar CARPETA como carpeta de configuración"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "CARPETA"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Execute'l nome de ficheru especificáu como javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Tomar una captura de la URL especificada"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Executar el comandu especificáu"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Amosar la versión del programa"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Direiciones"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Por favor unvíe comentarios, suxerencies y fallos a:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Guetar nueves versiones en:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Marcadores"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Amestar _marcadores"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Estensiones"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Hestorial"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Scripts d'usuariu"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Estilos d'usuariu"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Nueva _llingüeta"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Tresferencies"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "C_omplementos Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Llingüetes zarraes"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nueva _ventana"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Direiciones]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Ficheru non alcontráu."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Documentu defectuosu."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Avanzar una páxina"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Recargar la páxina actual"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Detener la carga de la páxina"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "El valor «%s» nun ye válidu pa %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Axuste non esperáu «%s»"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Aición inesperada «%s»."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Guardar ficheru como"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Guardar ficheru"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Abrir ficheru"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Nuevu canal"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Amestar un nuevu marcador"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Baleru"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Abrir too en _llingüetes"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Abrir nuna nueva _ventana"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Un restolador enforma llixeru"
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Astur <malditoastur@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  ivarela https://launchpad.net/~ivarela"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Ficheru"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Abrir una nueva ventana"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Abrir una nueva llingüeta"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Abrir un ficheru"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Guardar nún ficheru"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Amestar a marcación rápida"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Zarrar llingüeta"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Zarrar la llingüeta actual"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "_Zarrar ventana"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Imprentar la páxina actual"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Guetar una pallabra o fras na páxina"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Guetar _siguiente"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Guetar _anterior"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Configurar les preferencies de l'aplicación"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Ver"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Barra de ferramientes"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Aumentar el nivel de zoom"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Amenorgar el nivel de zoom"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Codificación"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Ver _códigu fonte"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Activar/desactivar pantalla completa"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Dir"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Retroceder una páxina"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Páxina d'aniciu"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Abrir páxina d'aniciu"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Vaciar la papelera"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Des_facer el pieslle de llingüeta"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Amestar una nueva _carpeta"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Llingüeta anterior"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Llingüeta siguiente"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Aida"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Entrugues frecuentes"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Ferramientes"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Barra de menú"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "_Barra de restolar"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "_Panel llateral"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "_Barra de marcadores"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "_Barra d'estáu"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automáticu"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Xaponés (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Rusu (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Occidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Personalizáu…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Separtador"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Allugamientu…"
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Abrir una direición en particular"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_Guetar n'internet…"
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Facer una gueta n'internet"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Abrir ventanes o llingüetes zarraes"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Amosar los marcadores guardaos."
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Amosar una llista de toles llingüetes abiertes"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Menú"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "_Menú"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Alliniar el panel a mandrecha"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Zarrar panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Alliniar el panel a manzorga"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Amosar páxina d'aniciu"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Amosar les caberes llingüetes abiertes"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Xaponés (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Nueva llingüeta"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Nueva ventana"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Llingüeta actual"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Predetermináu"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Iconos"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Testu"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Iconos y testu"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Testu al delláu de los iconos"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Estilu de la barra de ferramientes"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Nun pudo cargase la configuración: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Valor de configuración non válidu «%s»"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Inténtelo otra vegada"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Abrir enllaz en nueva _llingüeta"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Abrir enllaz en nueva _ventana"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Abrir direición nuna nueva _llingüeta"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Guetar _con"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Guetar n'internet"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Triba de ficheru: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Triba de ficheru: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Abrir %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspeicionar la páxina - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Páxina en blancu"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Imprentar imáxenes de fondu"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Si se quier imprentar les imáxenes de fondu"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Carauterístiques"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s de %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Marcación rápida"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Fai clic equí p'amestar un accesu direutu"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Introduza la direición del accesu direutu"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Introduza'l títulu del accesu direutu"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "¿Daveres que quies desaniciar ésti accesu direutu?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Aniciu"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Cuando Midori entama:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Páxina d'aniciu:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Usar la páxina actual como páxina d'aniciu"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Tamañu de fonte predetermináu utilizáu p'amosar testu"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Tamañu de fonte predetermináu utilizáu p'amosar testu"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Fonte d'anchor fixu"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "Fonte usada p'amosar el testu d'anchor fixu"
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "Tamañu de fonte usada p'amosar el testu d'anchor fixu"
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Tamañu mínimu de fonte"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Mínimu tamañu de fonte usáu p'amosar testu"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Codificación prefería"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Comportamientu"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Cargar imáxenes automáticamente"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Habilitar el correutor ortográficu"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Habilitar scripts"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Ampliar testos ya imáxenes"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Guardar los ficheros descargaos en:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Restolar"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Estilu de la barra de xeres:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Abrir les páxines nueves en:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Botón de zarrar nes llingüetes"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Abrir llingüetes xunto a l'actual"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Si se quier que les nueves llingüetes s'abran al delláu de la llingüeta "
+"actual o dempués de la cabera"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Abrir llingüetes en segundu planu"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Editor de testu"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Amestador de noticies"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Rede"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identificar como:"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privacidá"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Númberu máximu de díes pa caltener les cookies"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Númberu máximu de díes pa caltener l'hestorial"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Estensiones"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Alministrar motores de gueta"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Amestar un motor de gueta"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Editar motor de gueta"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Descripción:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Direición:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Abreviatura:"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Alministrar los motores de gueta"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "_Predetermináu"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Nun pudieron cargase los motores de gueta. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Nun pudieron guardase los motores de gueta. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Guetar con %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Nun pudo executar l'aplicación esterna."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Guetar:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Concasar mayúscules"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Zarrar la barra de gueta"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Editar el marcador escoyíu"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Desaniciar el marcador escoyíu"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Amestar una nueva carpeta"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Separtador</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Abrir nuna nueva _llingüeta"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Hestorial"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Güei"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Ayeri"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Fai %d día"
+msgstr[1] "Fai %d díes"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "Fai una selmana"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nun pudieron quitase los elementos del hestorial: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "¿Daveres quies quitar tolos elementos del hestorial?"
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Amestar a marcadores l'elementu escoyíu del hestorial"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Desaniciar del hestorial l'elementu escoyíu"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Vaciar l'hestorial completu"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Requierse autentificación"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"Nome d'usuariu y contraseña requeríos\n"
+"p'abrir ésti allugamientu:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Nome d'usuariu"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr ""
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Denguna"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "La propiedá «%s» nun ye válida pa %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Escoyer ficheru"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Escoyer carpeta"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Preferencies de %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Scripts d'usuariu"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Estilos d'usuariu"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Fallu"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Llingüetes de colores"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Colorear llingüetes de distintos colores"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Xestor de cookies"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Desaniciar too"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Desanicia toles cookies. Si s'afita un peñera, namái se desaniciarán les "
+"\"cookies\" que concasen cola peñera."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Espander too"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Contrayer too"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "¿Daveres quies desaniciar toles cookies?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Entruga"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Namái se desaniciarán les cookies visibles que concasen cola peñera."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr "Al final de la sesión"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Sirvidor</b>: %s\n"
+"<b>Nome</b>: %s\n"
+"<b>Valor</b>: %s\n"
+"<b>Camín</b>: %s\n"
+"<b>Seguru</b>: %s\n"
+"<b>Caduca</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Sí"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Non"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Nome"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Espander too"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Contrayer too"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr ""
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "Llistar, ver y desaniciar cookies"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+"Nun pudo atopar los elementos necesarios Atom \"entry\" nos datos XML."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr ""
+"Nun pudo atopar los elementos necesarios Atom \"feed\" nos datos XML."
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Caberu anovamientu: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Canales"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Amestar nueva canal"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Desaniciar canal"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Canales"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Nun pudo atopase l'elementu raigañu na canal d'información XML."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Formatu de canal non sofitáu."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Nun pudo atopase l'elementu \"channel\" nos datos XML del RSS"
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Versión de RSS non soportada."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+"Nun pudo atopase los elementos necesarios RSS \"item\" nos datos XML."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+"Nun pudo atopase los elementos necesarios RSS \"channel\" nos datos XML."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "La canal '%s' yá esiste"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Error al cargar la canal '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Panel de canales"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Llector de canales Atom/RSS"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Xestor de mur"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Controlar Midori moviendo'l mur"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Personalizar los atayos del tecláu"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Personalizar los ac_cesos direutos…"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Accesos direutos"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Ver y editar los atayos de tecláu"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Imáxenes"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Scripts"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Complementos Netscape"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Habilitar complementos Netscape"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Barra de funcionalidaes"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
+"Alternar cenciellamente les carauterístiques de páxines web dientro y fuera"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Panel de llingüetes"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Panel de llingüe_tes"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Amosar les llingüetes nún panel vertical"
+
+#: ../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:401
+msgid "Customize Toolbar"
+msgstr "Personalizar la barra de xeres"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Escueyi los elementos que s'amosarán na barra de ferramientes. Los elementos "
+"pueden reordenase arrastrando y soltando."
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Elementos disponibles"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Elementos usaos"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Editor de la barra de ferramientes"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Editar cenciellamente el diseñu de la barra de herramienta"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Desaniciar datos privaos"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Desaniciar datos privaos"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Desaniciar los siguientes datos:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Desaniciar datos privaos al _colar de Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Iconos de sitios d'internet"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Nun pudo vaciase l'hestorial: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Nun pudieron quitase elementos antiguos del hestorial: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Nun pudo guardase la configuración. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Nun pudo guardase la papelera. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Camudar _preferencies"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Deshabilitar toles _estensiones"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Amosar un diálogu dempués de que Midori se colingue"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Una instancia de Midori yá se ta executando pero nun respuende.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Nun pudo cargase la sesión: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Nun pudo cargase la papelera: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Nun pudo cargase l'hestorial: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Hebo los siguientes fallos:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Inorar"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Tresferencies"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Abrir la _carpeta de destín"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copiar _enllaz"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "El ficheru '<b>%s</b>' descargóse."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Tresferencia completa"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloquiador de publicidá"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquear publicidad de acuerdo a una llista de filtros"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurar los filtros de publicidá"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 6af162cacd9a3b9c127bdce2eae92d63186345db..5b5d9ad7ce5bfb658d6dad1381a8a43950fd010d 100644 (file)
--- a/po/be.po
+++ b/po/be.po
-# Belarussian traslation for Midori
-# Copyright (C) 2012 Midori team
-# This file is distributed under the same license as the Midori package.
-# Andrej Zakharevich <andrej@zahar.ws>, 2012.
-# Mikalai Udodau <crom-a@tut.by>, 2012.
+# Belarusian translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 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 <crom-a@tut.by>\n"
-"Language-Team: Belarusian <i18n@mova.org>\n"
-"Language: be\n"
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-05-31 20:37+0000\n"
+"Last-Translator: Mikalai Udodau <Unknown>\n"
+"Language-Team: Belarusian <be@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Launchpad-Export-Date: 2014-11-26 05:59+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Аглядаць Сеціва"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
+msgid "Web Browser"
+msgstr "Вэб-браўзер"
 
-#: ../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:3
+msgid "Midori Web Browser"
+msgstr "Вэб-браўзер Midori"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "Ð\92еб-бÑ\80аÑ\9eзеÑ\80 Midori"
+msgid "Browse the Web"
+msgstr "Ð\90глÑ\8fдаÑ\86Ñ\8c Ð¡ÐµÑ\86Ñ\96ва"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Акно прыватнага аглядання"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Новая картка"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Новае вакно"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ð\92Ñ\8dб-бÑ\80аÑ\9eзеÑ\80"
+msgid "New Private Browsing Window"
+msgstr "Ð\90кно Ð¿Ñ\80Ñ\8bваÑ\82нага Ð°Ð³Ð»Ñ\8fданнÑ\8f"
 
 #: ../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 ../midori/midori-view.c:3897
 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"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Адкрыць новае вакно прыватнага аглядання"
 
-#: ../midori/main.c:1517
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Здымак запісаны ў: %s\n"
 
-#: ../midori/main.c:1933
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr "Выканаць АДРАС як вэб-прыкладанне"
+msgstr "Выканаць АДРАС як вэб-праграму"
 
-#: ../midori/main.c:1933
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРАС"
 
-#: ../midori/main.c:1936
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Ужыць КАТАЛОГ як каталог канфігурацыі"
 
-#: ../midori/main.c:1936
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "КАТАЛОГ"
 
-#: ../midori/main.c:1939
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Прыватнае агляданне, ніякія змены не запісваюцца"
 
-#: ../midori/main.c:1941
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Пераносны рэжым, усе файлы выканання захоўваюцца ў адным месцы"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Звычайнае GTK+ акно з WebKit, аналагічна як GtkLauncher"
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Паказаць дыягнастычны дыялог"
 
-#: ../midori/main.c:1943
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Запусціць у gdb і запісваць бэктрэйс пры падзенні"
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Выканаць азначаны файл як скрыпт javascript"
 
-#: ../midori/main.c:1945
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Зрабіць здымак зададзенага адраса URI"
 
-#: ../midori/main.c:1947
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Выканаць азначаны загад"
 
-#: ../midori/main.c:1949
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Спіс даступных для выканання загадаў з -e/ --execute"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Паказаць версію праграмы"
 
-#: ../midori/main.c:1953
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адрасы"
 
-#: ../midori/main.c:1955
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Блакаваць URI спасылкі згодна з рэгулярным выразам ПРЫКЛАД"
 
-#: ../midori/main.c:1955
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "ПРЫКЛАД"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1959
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Скінуць Midori пасля СЕКУНД секундаў неактыўнасці"
 
-#: ../midori/main.c:1959
+#: ../midori/main.c:111
 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:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Памылка: немагчыма знайсці \"gdb\"\n"
 
-#: ../midori/main.c:2064
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 "Калі ласка, дасылайце каментарыі, прапановы і паведамленні пра памылкі на:"
 
-#: ../midori/main.c:2066
+#: ../midori/main.c:164
 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
+#: ../midori/main.c:358
 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
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Закладкі"
 
-#: ../midori/midori-app.c:1460
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Зак_ладку на гэту старонку"
 
-#: ../midori/midori-app.c:1461
+#: ../midori/midori-app.c:1155
 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:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Гісторыя"
 
-#: ../midori/midori-app.c:1463
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Карыстальніцкія скрыпты"
 
-#: ../midori/midori-app.c:1464
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Карыстальніцкія стылі"
 
-#: ../midori/midori-app.c:1465
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Новая _картка"
 
-#: ../midori/midori-app.c:1466
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "П_ерасыланні"
 
-#: ../midori/midori-app.c:1467
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "П_лагіны Netscape"
 
-#: ../midori/midori-app.c:1468
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Закрытыя карткі"
 
-#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5574
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Новае _вакно"
 
-#: ../midori/midori-app.c:1470
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Новы к_аталог"
 
-#: ../midori/midori-app.c:1499
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адрасы]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Памылковы дакумент."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Нераспазнаны фармат закладак."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Запісанне схібіла."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Перайсці да наступнай старонкі"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Ісці да наступнай падстаронкі"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Пошук у Вэбе"
 
-#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662
-#: ../midori/midori-browser.c:5671
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Перачытаць бягучую старонку"
 
-#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Спыніць чытанне бягучай старонкі"
 
-#: ../midori/midori-browser.c:530
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Памылка абнаўлення загалоўка: %s\n"
 
-#: ../midori/midori-browser.c:625
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Значэнне '%s' недапушчальнае ў %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Нечаканае настаўленне '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Нечаканае дзеянне '%s'."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Прыватнае агляданне)"
 
-#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Памылка дадання новага элемента гісторыі: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Вылучыць [тэкст]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Закладкі"
 
-#: ../midori/midori-browser.c:837
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Новы каталог"
 
-#: ../midori/midori-browser.c:837
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Рэдагаваць каталог"
 
-#: ../midori/midori-browser.c:839
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+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:1097
+msgid "Edit Bookmark"
+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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Упішыце назву гэтай закладкі, і выберыце, дзе яе захоўваць."
 
-#: ../midori/midori-browser.c:1021
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Вы не маеце дазволу на запіс у гэтым месцы."
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Упішыце назву гэтага каталога, і выберыце, дзе яго захоўваць."
 
-#: ../midori/midori-browser.c:1028
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Не хапае вольнага месца, каб сцягнуць \"%s\"."
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Паказваць на с_тужцы закладак"
 
-#: ../midori/midori-browser.c:1031
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Для файла трэба %s, але толькі %s засталося."
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Дадаць у хуткі в_ыбар"
 
-#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Запісаць файл як"
 
-#: ../midori/midori-browser.c:1173
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Запісаць звязаныя рэсурсы"
 
-#: ../midori/midori-browser.c:1476
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Адкрыта новае вакно"
 
-#: ../midori/midori-browser.c:1479
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Адкрыта новая картка"
 
-#: ../midori/midori-browser.c:1496
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Памылка адкрыцця выявы!"
 
-#: ../midori/midori-browser.c:1497
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Немагчыма адкрыць вылучаную выяву ў прадвызначаным праглядніку."
 
-#: ../midori/midori-browser.c:1503
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Памылка сцягвання выявы!"
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Немагчыма сцягнуць вылучаную выяву."
 
-#: ../midori/midori-browser.c:1625
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Запісаць файл"
 
-#: ../midori/midori-browser.c:2528
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Перачытаць старонку без кэшавання"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Адкрыць файл"
 
-#: ../midori/midori-browser.c:2660
+#: ../midori/midori-browser.c:2692
 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"
@@ -516,28 +379,28 @@ msgid ""
 msgstr ""
 "Каб скарыстацца URI-спасылкай вышэй, адкрыйце агрэгатар навін. Звычайна ў ім "
 "ёсць меню ці кнопка \"Дадаць падпіску\", \"Новы канал\" ці падобнае.\n"
-"Іначай, зайдзіце ў Настаўленні, Праграмы ў Midori, і выберыце Агрэгатар "
-"навÑ\96н. Ð\9aалÑ\96 Ñ\9e Ð½Ð°Ñ\81Ñ\82Ñ\83пнÑ\8b Ñ\80аз Ð²Ñ\8b Ð½Ð°Ñ\86Ñ\96Ñ\81нÑ\96Ñ\86е Ð½Ð° Ð·Ð½Ð°Ñ\87ок ÐºÐ°Ð½Ð°Ð» навін, ён дадасца "
+"Іначай, зайдзіце ў Настройкі, Праграмы ў Midori, і выберыце Агрэгатар навін. "
+"Ð\9aалÑ\96 Ñ\9e Ð½Ð°Ñ\81Ñ\82Ñ\83пнÑ\8b Ñ\80аз Ð²Ñ\8b Ð½Ð°Ñ\86Ñ\96Ñ\81неÑ\86е Ð½Ð° Ð·Ð½Ð°Ñ\87ок ÐºÐ°Ð½Ð°Ð»Ð° навін, ён дадасца "
 "аўтаматычна."
 
-#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Новы канал"
 
-#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Дадаць закладку"
 
-#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Пуста"
 
-#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Пераключыць навігацыю тэкставым курсорам"
 
-#: ../midori/midori-browser.c:3702
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -545,130 +408,100 @@ msgstr ""
 "Націсканне F7 пераключае рэжым навігацыі тэкставым курсорам. Калі ён "
 "актыўны, тэкставы курсор адлюстроўваецца на ўсіх вэб-старонках."
 
-#: ../midori/midori-browser.c:3705
+#: ../midori/midori-browser.c:3552
 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
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Адкры_ць у новым акне"
 
-#: ../midori/midori-browser.c:4520
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4521
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Казахеказэ"
 
-#: ../midori/midori-browser.c:4522
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4523
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4524
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4525
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4526
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4547
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Імпарт закладак…"
 
-#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Імпартаваць закладкі"
 
-#: ../midori/midori-browser.c:4561
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Праграма:"
 
-#: ../midori/midori-browser.c:4626
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Імпарт з XBEL ці HTML файла"
 
-#: ../midori/midori-browser.c:4654
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Імпартаваць з файла"
 
-#: ../midori/midori-browser.c:4666
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Памылка імпартавання закладак"
 
-#: ../midori/midori-browser.c:4700
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL-закладкі"
 
-#: ../midori/midori-browser.c:4705
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Закладкі Netscape"
 
-#: ../midori/midori-browser.c:4719
+#: ../midori/midori-browser.c:4546
 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:4558
 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
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Лёгкі вэб-браўзер."
 
-#: ../midori/midori-browser.c:5127
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Гл. about:version за звесткамі пра версію."
 
-#: ../midori/midori-browser.c:5129
+#: ../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 "
@@ -680,422 +513,407 @@ msgstr ""
 "GPL), выдадзенай Фондам Свабодных Праграм (FSF); як версіі 2.1, так і (на "
 "ваш выбар) якой-колечы пазнейшай версіі."
 
-#: ../midori/midori-browser.c:5159
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Мікалай Удодаў <crom-a@tut.by>"
+msgstr ""
+"Мікалай Удодаў <crom-a@tut.by>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Ilya Tsimokhin https://launchpad.net/~ilyats\n"
+"  Mikalai Udodau https://launchpad.net/~crom-a\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Прадубля_ваць бягучую картку"
 
-#: ../midori/midori-browser.c:5572
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "Ф_айл"
 
-#: ../midori/midori-browser.c:5575
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Адкрыць новае вакно"
 
-#: ../midori/midori-browser.c:5578
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Дадаць картку"
 
-#: ../midori/midori-browser.c:5580
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Новае ва_кно, прыватнае агляданне"
 
-#: ../midori/midori-browser.c:5584
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Адкрыць файл"
 
-#: ../midori/midori-browser.c:5586
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Запісаць старонку як…"
 
-#: ../midori/midori-browser.c:5587
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Запісаць у файл"
 
-#: ../midori/midori-browser.c:5589
+#: ../midori/midori-browser.c:5084
 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
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Падпісацца на к_анал навін"
 
-#: ../midori/midori-browser.c:5605
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Закрыць _картку"
 
-#: ../midori/midori-browser.c:5606
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Закрыць бягучую картку"
 
-#: ../midori/midori-browser.c:5608
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Закрыць акно"
 
-#: ../midori/midori-browser.c:5612
-msgid "_Share"
-msgstr "Падзяліцца"
-
-#: ../midori/midori-browser.c:5617
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Друкаваць бягучую старонку"
 
-#: ../midori/midori-browser.c:5620
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Закры_ць усе вокны"
 
-#: ../midori/midori-browser.c:5623
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Праца"
 
-#: ../midori/midori-browser.c:5646
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Зн_айсці…"
 
-#: ../midori/midori-browser.c:5647
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Шукаць слова ці выраз на старонцы"
 
-#: ../midori/midori-browser.c:5649
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Знайсці нас_тупнае"
 
-#: ../midori/midori-browser.c:5652
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "_Знайсці папярэдняе"
 
-#: ../midori/midori-browser.c:5656
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Наставіць праграмныя пераважанні"
 
-#: ../midori/midori-browser.c:5658
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Выгляд"
 
-#: ../midori/midori-browser.c:5659
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Стужкі прылад"
 
-#: ../midori/midori-browser.c:5664
-msgid "Reload page without caching"
-msgstr "Перачытаць старонку без кэшавання"
-
-#: ../midori/midori-browser.c:5674
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Павысіць узровень павелічэння"
 
-#: ../midori/midori-browser.c:5677
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Знізіць узровень павелічэння"
 
-#: ../midori/midori-browser.c:5681
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Знаказбор"
 
-#: ../midori/midori-browser.c:5683
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
-msgstr "_Ð\9fаказаÑ\86Ñ\8c Ð²Ñ\8bÑ\82оÑ\87ны тэкст"
+msgstr "_Ð\9fаказаÑ\86Ñ\8c Ð·Ñ\8bÑ\85одны тэкст"
 
-#: ../midori/midori-browser.c:5686
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Паказаць зыходнік _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Навігацыя тэкставым курсорам"
 
-#: ../midori/midori-browser.c:5690
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Пераключыць від на поўны экран"
 
-#: ../midori/midori-browser.c:5692
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Пракруціць у_лева"
 
-#: ../midori/midori-browser.c:5695
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Пракруціць у_ніз"
 
-#: ../midori/midori-browser.c:5698
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Пракруціць у_верх"
 
-#: ../midori/midori-browser.c:5701
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Пра_круціць управа"
 
-#: ../midori/midori-browser.c:5704
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Чытэльны"
 
-#: ../midori/midori-browser.c:5707
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Пераход"
 
-#: ../midori/midori-browser.c:5710
+#: ../midori/midori-browser.c:5195
 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
+#: ../midori/midori-browser.c:5202
 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:5208
+msgid "Next or Forward"
+msgstr "Наступны або Наперад"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Перайсці да наступнай падстаронкі ці наступнай старонкі гісторыі"
 
-#: ../midori/midori-browser.c:5723
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Хатняя старонка"
 
-#: ../midori/midori-browser.c:5724
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Перайсці да хатняй старонкі"
 
-#: ../midori/midori-browser.c:5726
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Ачысціць сметніцу"
 
-#: ../midori/midori-browser.c:5729
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Адкаціць закрыццё кар_ткі"
 
-#: ../midori/midori-browser.c:5736
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Стварыць к_аталог"
 
-#: ../midori/midori-browser.c:5742
-msgid "_Export bookmarks"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Імпартаваць закладкі"
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
 msgstr "_Экспартаваць закладкі"
 
-#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496
-msgid "_Manage Search Engines"
-msgstr "_Распараджацца пошукам"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines"
+msgstr "Кірава_ць пошукавымі рухавікамі"
 
-#: ../midori/midori-browser.c:5748
-msgid "_Clear Private Data"
-msgstr "_СÑ\86еÑ\80Ñ\86Ñ\96 Ð°Ñ\81абовыя звесткі"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_СÑ\86еÑ\80Ñ\86Ñ\96 Ð¿Ñ\80Ñ\8bваÑ\82ныя звесткі"
 
-#: ../midori/midori-browser.c:5751
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
-msgstr "Выточны тэкст старонкі"
+msgstr "_Зыходны тэкст старонкі"
 
-#: ../midori/midori-browser.c:5755
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Папярэдняя картка"
 
-#: ../midori/midori-browser.c:5758
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Наступная картка"
 
-#: ../midori/midori-browser.c:5760
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Перанесці картку на _першую пазіцыю"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Перамясціць картку назад"
 
-#: ../midori/midori-browser.c:5762
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Пасунуць картку наперад"
 
-#: ../midori/midori-browser.c:5765
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Перанесці картку на апо_шнюю пазіцыю"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Бягучая _картка"
 
-#: ../midori/midori-browser.c:5768
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "_Наступны від"
 
-#: ../midori/midori-browser.c:5771
+#: ../midori/midori-browser.c:5263
 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
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Закрыць усе іншыя ка_рткі"
 
-#: ../midori/midori-browser.c:5780
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Адкр_ыць апошні сеанс"
 
-#: ../midori/midori-browser.c:5783
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../midori/midori-browser.c:5785
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Частыя пытанні"
 
-#: ../midori/midori-browser.c:5788
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Паведаміць пра памыл_ку…"
 
-#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Прылады"
 
-#: ../midori/midori-browser.c:5800
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Стужка меню"
 
-#: ../midori/midori-browser.c:5804
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Стужка навігацыі"
 
-#: ../midori/midori-browser.c:5808
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Бакавая панэль"
 
-#: ../midori/midori-browser.c:5809
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Бакавая панэль"
 
-#: ../midori/midori-browser.c:5812
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Стужка закладак"
 
-#: ../midori/midori-browser.c:5816
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Стужка статусу"
 
-#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Аўтаматычна"
 
-#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Кітайскі традыцыйны (BIG5)"
 
-#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Кітайскі спрошчаны (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5835
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Японскі (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Карэйскі (EUC-KR)"
 
-#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Рускі (KOI8-R)"
 
-#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Унікод (UTF-8)"
 
-#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Заходні (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5850
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Адмысловы…"
 
-#: ../midori/midori-browser.c:6360
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Ініцыялізацыя гісторыі схібіла: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Раздзельнік"
 
-#: ../midori/midori-browser.c:6367
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "А_драс…"
 
-#: ../midori/midori-browser.c:6369
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Адкрыць пэўнае месцазнаходжанне"
 
-#: ../midori/midori-browser.c:6391
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Пошук у Се_ціве…"
 
-#: ../midori/midori-browser.c:6393
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Запусціць сеціўны пошук"
 
-#: ../midori/midori-browser.c:6420
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Адкрыць раней закрытыя карткі ці вокны"
 
-#: ../midori/midori-browser.c:6437
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Паказаць запісаныя закладкі"
 
-#: ../midori/midori-browser.c:6470
-msgid "_Window"
-msgstr "_Ð\92окнÑ\8b"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Ð\9aаÑ\80Ñ\82кÑ\96"
 
-#: ../midori/midori-browser.c:6472
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Паказаць спіс усіх адкрытых картак"
 
-#: ../midori/midori-browser.c:6486
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Меню"
 
-#: ../midori/midori-browser.c:6488
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Меню"
 
-#: ../midori/midori-browser.c:7313
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Нечаканае настаўленне '%s'"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Экспартаваць сертыфікаты"
 
-#: ../midori/midori-locationaction.c:1259
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Сертыфікат падпісаны невядомай установай."
 
-#: ../midori/midori-locationaction.c:1261
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -1103,15 +921,15 @@ msgstr ""
 "Сертыфікат не супадае з меркаванай ідэнтыфікацыяй пляцоўкі, з якой ён "
 "атрыманы."
 
-#: ../midori/midori-locationaction.c:1263
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Час актывацыі сертыфіката ўсё яшчэ ў будучыні."
 
-#: ../midori/midori-locationaction.c:1265
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Сертыфікат пратэрмінаваны"
 
-#: ../midori/midori-locationaction.c:1267
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -1119,1145 +937,1029 @@ msgstr ""
 "Сертыфікат быў перагледжаны, згодна з спісам перагледжаных сертыфікатаў "
 "GTlsConnection."
 
-#: ../midori/midori-locationaction.c:1269
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгарытм сертыфіката меркаваны небяспечным."
 
-#: ../midori/midori-locationaction.c:1271
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Нейкія памылкі здарыліся падчас спраўджвання сертыфіката."
 
-#: ../midori/midori-locationaction.c:1318
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Экспартаваць сертыфікаты"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Самападпісаны"
 
-#: ../midori/midori-locationaction.c:1367
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Падрабязнасці прыватнасці"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1650
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Уставіць і перайсці"
 
-#: ../midori/midori-locationaction.c:1974
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Не пацверджана"
 
-#: ../midori/midori-locationaction.c:1982
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Пацверджанае і зашыфраванае злучэнне"
 
-#: ../midori/midori-locationaction.c:1989
+#: ../midori/midori-locationaction.c:1814
 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:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Трымаць бакавую панэль справа"
 
-#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Закрыць панэль"
 
-#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Трымаць бакавую панэль злева"
 
-#: ../midori/midori-websettings.c:220
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Паказаць панэль хуткага запуску"
 
-#: ../midori/midori-websettings.c:221
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Паказаць хатнюю старонку"
 
-#: ../midori/midori-websettings.c:240
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Паказаць апошнія адкрытыя карткі"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Паказаць апошнія карткі без адкрыцця"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Паказаць пустую старонку"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Паказаць прадвызначаны пошукавы рухавік"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Паказаць карыстальніцкую старонку"
+
+#: ../midori/midori-websettings.c:152
 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:172
 msgid "New tab"
 msgstr "Новая картка"
 
-#: ../midori/midori-websettings.c:261
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Новае вакно"
 
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Бягучая картка"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Прадвызначаны"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Значкі"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Малыя значкі"
 
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Тэкст"
 
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Значкі і тэкст"
 
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Тэкст побач са значкамі"
 
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Аўтаматычна (GNOME ці асяроддзе)"
 
-#: ../midori/midori-websettings.c:298
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Проксі-сервер HTTP"
 
-#: ../midori/midori-websettings.c:299
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Без проксі-сервера"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:318
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:319
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:320
+#: ../midori/midori-websettings.c:232
 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
+#: ../midori/midori-websettings.c:307
 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:491
+msgid "Always use my font choices"
+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\""
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
 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:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Немагчыма прачытаць канфігурацыю: %s\n"
 
-#: ../midori/midori-websettings.c:1104
-msgid "Clear data"
-msgstr "Сцерці звесткі"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Недапушчальнае значэнне канфігурацыі '%s'"
 
-#: ../midori/midori-websettings.c:1105
-msgid "The data selected for deletion"
-msgstr "Звесткі, вылучаныя для сцірання"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Убудаванне стылю схібіла: %s"
 
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1154
-msgid "Strip referrer details sent to websites"
-msgstr "Выразаць дэталі рэферэра"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+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-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Паказваць толькі _значок карткі"
 
-#: ../midori/midori-websettings.c:1170
-msgid "Always use my font choices"
-msgstr "Заўжды ўжываць выбраныя шрыфты"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Закрыць _картку справа"
+msgstr[1] "Закрыць _карткі справа"
+msgstr[2] "Закрыць _карткі справа"
 
-#: ../midori/midori-websettings.c:1171
-msgid "Override fonts picked by websites with user preferences"
-msgstr ""
-"Перасягаць шрыфты, пададзеныя вэб-пляцоўкай, пераважнымі карыстальніцкімі"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Закрыць іншую ка_ртку"
+msgstr[1] "Закрыць іншыя ка_рткі"
+msgstr[2] "Закрыць іншыя ка_рткі"
 
-#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Давяраць гэтай пляцоўцы"
 
-#: ../midori/midori-view.c:1138
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Прыватнасць невядомая"
 
-#: ../midori/midori-view.c:1436
+#: ../midori/midori-view.c:1025
 #, 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:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Забараніць"
 
-#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Дазволіць"
 
-#: ../midori/midori-view.c:1469
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s хоча ведаць ваша месцазнаходжанне."
 
-#: ../midori/midori-view.c:1565
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Памылка - %s"
+msgid "'%s' can't be found"
+msgstr "немагчыма знайсці '%s'"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Нельга прачытаць старонку '%s':"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Праверце адрас на памылкі"
 
-#: ../midori/midori-view.c:1566
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Упэўніцеся, што сеткавы кабель падключаны, ці бесправадная карта актыўная"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Праверце настройкі сеткі на правільнасць"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Паўтарыць спробу"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Ð\9dемагÑ\87Ñ\8bма Ð¿Ñ\80аÑ\87Ñ\8bÑ\82аÑ\86Ñ\8c Ñ\81Ñ\82аÑ\80онкÑ\83 '%s'."
+msgid "Oops - %s"
+msgstr "Ð\9eй - %s"
 
-#: ../midori/midori-view.c:1568
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Штось пайшло не так з '%s'."
+
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Паспрабаваць ізноў"
 
-#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Даслаць паведамленне да %s"
 
-#: ../midori/midori-view.c:2665
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Дадаць пошукав_ы рухавік..."
 
-#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035
-msgid "Inspect _Element"
-msgstr "Ð\86нÑ\81пекÑ\82аваÑ\86Ñ\8c Ñ\8dл_еменÑ\82"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ð\90_дкÑ\80Ñ\8bÑ\86Ñ\8c Ñ\81паÑ\81Ñ\8bлкÑ\83"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Адкрыць у новай _картцы"
 
-#: ../midori/midori-view.c:2765
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Адкрыць у _бягучай картцы"
 
-#: ../midori/midori-view.c:2766
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Адкрыць у фонавай кар_тцы"
 
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2332
 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
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Капіраваць адрас спас_ылкі"
 
-#: ../midori/midori-view.c:2793
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Запісаць як"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Адкрыць відарыс у новым акне"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Адкрыць _выяву ў новай картцы"
 
-#: ../midori/midori-view.c:2796
-msgid "Copy Image _Address"
-msgstr "Капіраваць адрас _выявы"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Капірава_ць відарыс"
 
-#: ../midori/midori-view.c:2799
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Запісац_ь выяву"
 
-#: ../midori/midori-view.c:2802
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Адкрыць у праглядніку _выяў"
 
-#: ../midori/midori-view.c:2809
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Капіраваць _адрас відэа"
 
-#: ../midori/midori-view.c:2812
-msgid "Save _Video"
-msgstr "Запісаць в_ідэа"
-
-#: ../midori/midori-view.c:2812
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Сцягнуць _відэа"
 
-#: ../midori/midori-view.c:2838
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Адкрыць адрас у новай _картцы"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Шукаць _на"
 
-#: ../midori/midori-view.c:2870
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "Шука_ць у Сеціве"
 
-#: ../midori/midori-view.c:2887
-msgid "Open Address in New _Tab"
-msgstr "Адкрыць адрас у новай _картцы"
-
-#: ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "_Адкрыць фрэйм у новай картцы"
 
-#: ../midori/midori-view.c:3201
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Інспектаваць эл_емент"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Адкрыць ці сцягнуць файл з %s"
 
-#: ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Назва файла: %s"
 
-#: ../midori/midori-view.c:3230
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Тып файла: '%s'"
 
-#: ../midori/midori-view.c:3232
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Тып файла: %s ('%s')"
 
-#: ../midori/midori-view.c:3267
+#: ../midori/midori-view.c:2778
 #, 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:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Адкрыць %s"
 
-#: ../midori/midori-view.c:3897
+#: ../midori/midori-view.c:3313
 #, 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
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori не запісвае ніякіх асабовых звестак:"
 
-#: ../midori/midori-view.c:4507
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
-msgstr "Не запісваюцца кукісы і гісторыя."
+msgstr "Не запісваюцца кукі і гісторыя."
 
-#: ../midori/midori-view.c:4508
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Прыстаўкі адключаны."
 
-#: ../midori/midori-view.c:4509
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "HTML5-сховішчы, лакальныя базы звестак і праграмныя кэшы адключаны."
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori забараняе вэб-пляцоўкам асочваць карыстальніка:"
 
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "URL-спасылкі рэферэра скарачаюцца да назвы хоста."
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Папярэдняе атрыманне звестак DNS адключана."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Вэб-пляцоўкі не могуць высветліць мову і часавы пояс."
 
-#: ../midori/midori-view.c:4514
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Вэб-пляцоўкі не могуць атрымаць спіс флэш і іншых плагінаў Netscape"
 
-#: ../midori/midori-view.c:4603
+#: ../midori/midori-view.c:3949
 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:3999
+msgid "Page loading delayed:"
+msgstr "Чытанне старонкі адкладзена:"
 
-#: ../midori/midori-view.c:4654
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 "Чытанне адкладзена з-за нядаўняга падзення ці з-за настаўленняў запуску"
 
-#: ../midori/midori-view.c:4655
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Чытаць старонку"
 
-#: ../midori/midori-view.c:4822
+#: ../midori/midori-view.c:4167
 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
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "папярэдняя"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5953
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "наступная"
 
-#: ../midori/midori-view.c:5966
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Друкаваць фонавыя выявы"
 
-#: ../midori/midori-view.c:5967
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Друкаваць, ці не, фонавыя выявы старонак"
 
-#: ../midori/midori-view.c:5999
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Магчымасці"
 
-#: ../midori/midori-preferences.c:298
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s з %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d гадзіна"
+msgstr[1] "%d гадзіны"
+msgstr[2] "%d гадзін"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d хвіліна"
+msgstr[1] "%d хвіліны"
+msgstr[2] "%d хвілін"
+
+#: ../midori/midori-download.vala:77
+#, 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:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s засталося"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?Б"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Атрыманы файл - памылковы."
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Файл \"%s\" нельга запісаць у гэтым каталогу."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Вы не маеце дазволу на запіс у гэтым месцы."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Не хапае вольнага месца, каб сцягнуць \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Для файла трэба %s, але толькі %s засталося."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Хуткі выбар"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Націсніце, каб дадаць цэтлік"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Увядзіце адрас цэтліка"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Увядзіце назву цэтліка"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Вы ўпэўнены, што хочаце сцерці гэты цэтлік?"
+
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Запуск"
 
-#: ../midori/midori-preferences.c:311
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Па запуску Midori:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Хатняя старонка:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Ужыць бягучую _старонку"
 
-#: ../midori/midori-preferences.c:315
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Ужыць бягучую старонку як хатнюю"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:324
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Шрыфты"
 
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Прапарцыянальны шрыфт"
 
-#: ../midori/midori-preferences.c:331
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Прадвызначаны шрыфт для адлюстравання тэксту"
 
-#: ../midori/midori-preferences.c:334
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
-msgstr "Ð\9cонаÑ\88Ñ\8bÑ\80Ñ\8bннÑ\8b шрыфт"
+msgstr "РоÑ\9eнаÑ\88Ñ\8bÑ\80окÑ\96 шрыфт"
 
-#: ../midori/midori-preferences.c:340
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Прадвызначаны шрыфт для адлюстравання тэксту фіксаванай шырыні"
 
-#: ../midori/midori-preferences.c:343
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
-msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту фіксаванай шырыні"
+msgstr ""
+"Прадвызначаны памер шрыфту для адлюстравання тэксту фіксаванай шырыні"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Мінімальны памер шрыфту"
 
-#: ../midori/midori-preferences.c:349
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Мінімальны памер шрыфту для адлюстравання тэксту"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Пераважны знаказбор"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:360
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Паводзіны"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Аўтаматычна паказваць выявы"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Уключыць праверку правапісу"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Дазволіць скрыпты"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Уключыць падтрымку WebGL"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Павялічваць тэкст і выявы"
+
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Дазволіць скрыптам адкрываць вокны"
 
-#: ../midori/midori-preferences.c:387
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Дазваляць, ці не, скрыптам адкрываць усплыўныя вокны аўтаматычна"
 
-#. Page "Interface"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Базавы ўзровень павелічэння"
+
 #: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Пачатковы множнік для павелічэння новых адкрытых картак"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Пераважныя мовы"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Запісваць сцягнутыя файлы ў:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Навігацыя"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Тэма:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Стыль стужкі прылад:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Адкрываць новыя старонкі ў:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Паводзіны новай карткі:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Кнопкі закрыцця на картках"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Адкрываць карткі следам за бягучай"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "Ці адкрываць новыя карткі побач з бягучай карткай або пасля апошняй"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Адкрываць карткі ў фоне"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Тэкставы рэдактар"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Агрэгатар навін"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:458
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Сетка"
 
-#: ../midori/midori-preferences.c:465
-msgid "Hostname"
-msgstr "Назва хоста"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Проксі-сервер"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI-адрас"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Порт"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Падтрыманыя тыпы проксі:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Вэб-кэш"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Максімальны памер кэшаваных старонак на дыску"
 
-#: ../midori/midori-preferences.c:489
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "МБ"
 
-#: ../midori/midori-searchaction.c:957
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Ідэнтыфікавацца як"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Прыватнасць"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Сціраць старыя кукі праз:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Максімальная працягласць захоўвання кукаў у днях"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Прымаць кукі толькі з наведаных пляцовак"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Блакаваць кукі, дасланыя пляцоўкамі трэцяга боку"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Кукі захоўваюць звесткі пра ўваходы, запісы гульняў, ці профіль "
+"карыстальніка, у мэтах рэкламы."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Пазасеткавы кэш вэб-праграм"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Падтрымка лакальных сховішчаў HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Выразаць дэталі рэферэра"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Скарачаць, ці не, загаловак \"Referer\" да назвы хоста"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Сціраць старонкі з гісторыі праз:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Максімальная колькасць дзён, цягам якіх захоўваць гісторыю"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Прыстаўкі"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Распараджацца пошукам"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Дадаць пошукавы рухавік"
 
-#: ../midori/midori-searchaction.c:957
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Рэдагаваць пошукавыя рухавікі"
 
-#: ../midori/midori-searchaction.c:985
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: ../midori/midori-searchaction.c:1000
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Апісанне:"
 
-#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адрас:"
 
-#: ../midori/midori-searchaction.c:1032
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Токен:"
 
-#: ../midori/midori-searchaction.c:1330
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Кіраванне пошукавымі рухавікамі"
 
-#: ../midori/midori-searchaction.c:1432
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Ужыць як база_вы"
 
-#: ../midori/sokoke.c:346
-msgid "Open with"
-msgstr "Адкрыць з"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Немагчыма адчытаць пошукавыя рухавікі. %s\n"
 
-#: ../midori/sokoke.c:354
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Ð\92Ñ\8bбеÑ\80Ñ\8bÑ\86е Ð¿Ñ\80агÑ\80амÑ\83 Ñ\86Ñ\96 Ð·Ð°Ð³Ð°Ð´ Ð´Ð»Ñ\8f Ð°Ð´ÐºÑ\80Ñ\8bÑ\86Ñ\86Ñ\8f \"%s\":"
+msgid "The search engines couldn't be saved. %s"
+msgstr "Ð\9dемагÑ\87Ñ\8bма Ð·Ð°Ð¿Ñ\96Ñ\81аÑ\86Ñ\8c Ð¿Ð¾Ñ\88Ñ\83кавÑ\8bÑ\8f Ñ\80Ñ\83Ñ\85авÑ\96кÑ\96. %s"
 
-#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
-msgid "Could not run external program."
-msgstr "Ð\9dемагÑ\87Ñ\8bма Ð·Ð°Ð¿Ñ\83Ñ\81Ñ\86Ñ\96Ñ\86Ñ\8c Ð²Ð¾Ð½ÐºÐ°Ð²Ñ\83Ñ\8e Ð¿Ñ\80агÑ\80амÑ\83."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Ð\97акладкÑ\96 Ñ\96 Ð³Ñ\96Ñ\81Ñ\82оÑ\80Ñ\8bÑ\8f"
 
-#: ../midori/sokoke.c:1529
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d гадзіна"
-msgstr[1] "%d гадзіны"
-msgstr[2] "%d гадзін"
+msgid "Search for %s"
+msgstr "Шукаць %s"
 
-#: ../midori/sokoke.c:1530
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d хвіліна"
-msgstr[1] "%d хвіліны"
-msgstr[2] "%d хвілін"
+msgid "Failed to select from history: %s"
+msgstr "Выбранне з гісторыі схібіла: %s"
 
-#: ../midori/sokoke.c:1531
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%'d секунда"
-msgstr[1] "%'d секунды"
-msgstr[2] "%'d секунд"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Шукаць на…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:268
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s з %s"
+msgid "Search with %s"
+msgstr "Шукаць на %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1548
-msgid "?B"
-msgstr "?Б"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Адкрыць з"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1551
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Выберыце праграму ці загад для адкрыцця \"%s\":"
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1568
-#, c-format
-msgid " - %s remaining"
-msgstr " - %s засталося"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Немагчыма запусціць вонкавую праграму."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Хібны URI-адрас"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:265
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "_Шукаць:"
 
-#: ../toolbars/midori-findbar.c:287
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Папярэдняе"
 
-#: ../toolbars/midori-findbar.c:293
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Наступнае"
 
-#: ../toolbars/midori-findbar.c:297
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "З улікам рэгістру"
 
-#: ../toolbars/midori-findbar.c:306
-msgid "Highlight Matches"
-msgstr "Вылучыць супадзенні"
-
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Закрыць форму пошуку"
 
-#: ../toolbars/midori-transferbar.c:124
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Перасыланне файла '<b>%s</b>' скончана."
-
-#: ../toolbars/midori-transferbar.c:129
-msgid "Transfer completed"
-msgstr "Перасыланне скончана"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d закладка"
+msgstr[1] "%d закладкі"
+msgstr[2] "%d закладак"
 
-#: ../toolbars/midori-transferbar.c:201
-msgid "The downloaded file is erroneous."
-msgstr "Атрыманы файл - памылковы."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d падкаталог"
+msgstr[1] "%d падкаталогі"
+msgstr[2] "%d падкаталогаў"
 
-#: ../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 ""
-"Кантрольная сума, пададзеная спасылкай, не супадае. Гэта азначае, што файл "
-"магчыма няпоўны, ці быў зменены пасля атрымання."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Пусты каталог"
 
-#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
-msgid "Clear All"
-msgstr "Ачысціць усё"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Каталог утрымлівае %s і ніводнай закладкі"
 
-#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
-msgid "Some files are being downloaded"
-msgstr "Некаторыя файлы яшчэ цягнуцца"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Каталог утрымлівае %s"
 
-#: ../toolbars/midori-transferbar.c:388
-msgid "_Quit Midori"
-msgstr "Вы_йсці з Midori"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Каталог утрымлівае %s і %s"
 
-#: ../toolbars/midori-transferbar.c:390
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Перасыланні будуць скасаваныя, калі выйсці з Midori."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Закладка спасылаецца на: %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Не ўдалося дадаць закладку: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s і ніводнай закладкі"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Не ўдалося абнавіць закладку: %s\n"
+msgid "%s and %s"
+msgstr "%s і %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Рэдагаваць вылучаную закладку"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Сцерці вылучаную закладку"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Дадаць каталог"
 
-#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Раздзяляльнік</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Адкрыць у новай _картцы"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1027
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Шукаць у закладках"
 
@@ -2265,15 +1967,15 @@ msgstr "Шукаць у закладках"
 msgid "History"
 msgstr "Гісторыя"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Сёння"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Учора"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2281,48 +1983,36 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Тыдзень таму"
 
-#: ../panels/midori-history.c:232
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Памылка сцірання элемента гісторыі: %s\n"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Вы ўпэўнены, што хочаце сцерці ўсе запісы з гісторыі?"
 
-#: ../panels/midori-history.c:407
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Зрабіць закладку на вылучаны элемент гісторыі"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Сцерці вылучаны запіс гісторыі"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Сцерці ўсю гісторыю"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:997
+#: ../panels/midori-history.c:926
 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 "Патрэбна аўтарызацыя"
@@ -2347,134 +2037,94 @@ msgstr "Пароль"
 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:386
+msgid "None"
+msgstr "Няма"
 
-#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
+#: ../katze/katze-utils.c:529
 #, 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:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Выберыце файл"
 
-#: ../katze/katze-utils.c:504
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Выберыце каталог"
 
-#: ../katze/katze-utils.c:602
-msgid "None"
-msgstr "Няма"
-
-#: ../katze/katze-utils.c:717
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 гадзіну"
 
-#: ../katze/katze-utils.c:718
+#: ../katze/katze-utils.c:747
 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."
+msgstr "1 дзень"
 
-#: ../extensions/adblock.c:917
-msgid "Edit rule"
-msgstr "Рэдагаваць правіла"
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 тыдзень"
 
-#: ../extensions/adblock.c:931
-msgid "_Rule:"
-msgstr "_Правіла:"
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 месяц"
 
-#: ../extensions/adblock.c:985
-msgid "Bl_ock image"
-msgstr "Блакаванне выя_ў"
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 год"
 
-#: ../extensions/adblock.c:990
-msgid "Bl_ock link"
-msgstr "Блакаван_не спасылак"
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Настаўленні %s"
 
-#: ../extensions/adblock.c:1689
-msgid "Advertisement blocker"
-msgstr "Ð\91лакавалÑ\8cнÑ\96к Ñ\80Ñ\8dкламÑ\8b"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "Ð\9aанÑ\82Ñ\80олÑ\8cнаÑ\8f Ñ\81Ñ\83ма MD5:"
 
-#: ../extensions/adblock.c:1690
-msgid "Block advertisements according to a filter list"
-msgstr "Ð\91лакаванне Ñ\80Ñ\8dкламÑ\8b Ð·Ð³Ð¾Ð´Ð½Ð° Ð· Ñ\81пÑ\96Ñ\81ам Ñ\84Ñ\96лÑ\8cÑ\82Ñ\80аваннÑ\8f"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "Ð\9aанÑ\82Ñ\80олÑ\8cнаÑ\8f Ñ\81Ñ\83ма SHA1:"
 
 #. 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?"
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Гэта старонка ўтрымлівае карыстальніцкі скрыпт. Ці хочаце ўстанавіць яго?"
 
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "_Устанавіць карыстальніцкі скрыпт"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr ""
 "Гэта старонка ўтрымлівае карыстальніцкі стыль. Ці хочаце ўстанавіць яго?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Устанавіць карыстальніцкі стыль"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Не ўстанаўляць"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:677
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Карыстальніцкія скрыпты"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:679
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Карыстальніцкія стылі"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Памылка"
 
@@ -2496,85 +2146,85 @@ msgstr "Сцерці карыстальніцкі стыль"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Файл <b>%s</b> будзе сцёрты без магчымасці ўзнаўлення."
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:643
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Адкрыць у тэкставым рэдактары"
 
-#: ../extensions/addons.c:568 ../extensions/addons.c:652
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Адкрыць мэтавы каталог"
 
-#: ../extensions/addons.c:634
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Дадаць прыстаўку"
 
-#: ../extensions/addons.c:660
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Сцерці вылучаную прыстаўку"
 
-#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Карыстальніцкія прыстаўкі"
 
-#: ../extensions/addons.c:1819
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Нельга назіраць за каталогам '%s': %s"
 
-#: ../extensions/addons.c:1908
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Падтрымка карыстальніцкіх скрыптаў і стыляў"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Каляровыя карткі"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Асобная афарбоўка для кожнай карткі"
 
 #: ../extensions/cookie-manager/cookie-manager-page.c:73
 #: ../extensions/cookie-manager/main.c:35
 msgid "Cookie Manager"
-msgstr "Распараднік кукісаў"
+msgstr "Распараднік кукаў"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Сцерці ўсё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 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:116
 msgid "Expand All"
 msgstr "Разгарнуць усё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Згарнуць усё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Пытанне"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 msgid "At the end of the session"
 msgstr "У канцы сеанса"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2591,83 +2241,155 @@ msgstr ""
 "<b>Бяспека</b>: %s\n"
 "<b>Згасае</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Так"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Не"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
 "<b>Cookies</b>: %d"
 msgstr ""
 "<b>Дамен</b>: %s\n"
-"<b>Кукісы</b>: %d"
+"<b>Кукі</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1017
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Назва"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1069
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Расцягн_уць усё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Згарну_ць усё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
-msgstr "Шукаць кукісы па назве ці дамену"
+msgstr "Шукаць кукі па назве ці дамену"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
-msgstr "Вывад, прагляд і сціранне кукісаў"
+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 "Капіраваць адрасы картак"
 
-#: ../extensions/copy-tabs.c:96
+#: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Капіраваць адрасы ўсіх картак у буфер абмену"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Адкладзенае чытанне"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Адкладваць чытанне старонкі да непасрэднага выкарыстання карткі"
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Падвойны клік для падрабязных звестак"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Гэта прыстаўка паказвае паведамленні пра памылкі glib у сістэмным трэі."
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Здарылася памылка пры спробе сцягнуць файл з наступным плагінам:\n"
+"%s\n"
+"\n"
+"Памылка:\n"
+"%s\n"
+"\n"
+"Паспрабуйце далей без гэтага плагіна."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Вонкавы менеджар перасыланняў - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Сцягваць файлы з Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Вонкавы менеджар перасыланняў - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Сцягваць файлы са SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Каманда:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Сцягваць файлы з \"%s\" ці з уласнай камандай"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Вонкавы менеджар перасыланняў - CommandLine"
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Не ўдалося знайсці \"channel\"-элемент у звестках XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Апошняе абнаўленне: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:653
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Каналы"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Дадаць канал"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Сцерці канал"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "К_аналы"
 
@@ -2676,60 +2398,61 @@ msgstr "К_аналы"
 msgid "Failed to find root element in feed XML data."
 msgstr "Не ўдалося знайсці каранёвы элемент у звестках XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Фармат канала не падтрымліваецца."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Памылка разбору XML канала: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Не ўдалося знайсці \"channel\"-элемент у звестках XML канала."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Знойдзеная версія RSS не падтрымліваецца."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Не ўдалося знайсці неабходны элемент RSS \"item\" у звестках  XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 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
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Канал '%s' ужо існуе"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Памылка чытання канала '%s'"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Панэль каналаў"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Чытаць Atom-/ RSS-каналы (feeds)"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "Не ўдалося дадаць значэнне формы: %s\n"
 
-#: ../extensions/formhistory/formhistory.c:95
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "Гісторыя формаў"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
@@ -2737,116 +2460,411 @@ msgstr ""
 "Трэба ўвесці майстар-пароль,\n"
 "каб адкрыць базу пароляў"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Захаваць пароль на гэтай старонцы?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Захаваць"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Не зараз"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Ніколі на гэтай старонцы"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Пераключэнне стану гісторыі формаў"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 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
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "Уключаць гісторыю форм кнопкамі (Ctrl+Shift+F) у кожнай картцы"
 
-#: ../extensions/formhistory/formhistory.c:668
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Гісторыя запаўнення формаў"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Захоўваць звесткі па запаўненню формаў"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
-#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Не ўдалося выбраць прапановы\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Няма ненаведаных картак"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Спіс гісторыі"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Па закрыцці карткі"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Нічога не рабіць"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Перайсці да апошняй прагляданай карткі"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Перайсці да найноўшай карткі"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Мігценне па адкрыцці карткі ў фоне"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Наступная новая картка (Спіс гісторыі)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Наступная новая картка з гісторыі"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Папярэдняя новая картка (Спіс гісторыі)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Папярэдняя новая картка з гісторыі"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Паказваць картку ў фоне (Спіс гісторы)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Паказваць бягучую вылучаную картку ў фоне"
 
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Спіс гісторыі"
 
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Ісці да апошняй ужытай карткі па пераключэнні ці закрыцці"
 
-#: ../extensions/mouse-gestures.c:301
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL схібіла: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Прыняць"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Прыняць на сеанс"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Блакаваць"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Немагчыма адкрыць базу звестак па прыстаўках: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Выкананне запыту базы звестак схібіла: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Сапраўды хочаце выдаліць усе дазваленні JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Выдаліць усе дазваленні JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Гэта дзеянне выдаліць усе дазваленні JavaScript. Будзе запытаны дазвол ізноў "
+"для кожнага наведанага вэб-сайта."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Экзэмпляр менеджара"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Экзэмпляр глабальнага менеджара NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Настройка NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Ніжэй прыведзены спіс усіх вэб-сайтаў і палітык для іх. Вы можаце сцерці "
+"палітыкі, выбраўшы запісы і націнуўшы на <i>Сцерці</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Дамен"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Палітыка"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "С_церці ўсе"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Дазволіць скрыпты на ўсіх сайтах"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Б_лакаваць скрыпты на невядомых даменах як звычайна"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Наставіць дазволы для даменаў др_угога ўзроўню"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Забараніць %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Дазволіць %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Дазволць %s на гэты сеанс"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Акно браўзера"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Экзэмпляр браўзера Midori, якому належыць гэты від"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Від"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Экзэмпляр віда Midori, якому належыць гэты від"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Стан значка меню"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Стан значка меню, які паказваецца ў стужцы статусу"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Нявызначаны"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Дазволены"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Розны"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Адхілены"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Здарылася непапраўная памылка, якая перашкаджае прыстаўцы NoJS надалей. Вы "
+"мусіце выключыць яе."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Памылка ў прыстаўцы NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Прычына"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Немагчыма стварыць каталог канфігурацыі для прыстаўкі: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Немагчыма стварыць каталог канфігурацыі для прыстаўкі."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Немагчыма адкрыць базу звестак аб прыстаўках."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Немагчыма ўстанавіць структуру базы даных для прыстаўкі."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Экзэмпляр прыстаўкі"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Экзэмпляр прыстаўкі Midori для гэтай прыстаўкі"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Экзэмпляр праграмы"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Экзэмпляр праграмы Midori, якой належыць гэта прыстаўка"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Экзэмпляр базы звестак"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Указальнік на экзэмпляр базы даных sqlite, які выкарыстоўвае гэта прыстаўка"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Шлях да базы звестак"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Шлях да экзэмпляра базы даных, ужыванай гэтай прыстаўкай"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Дазволіць усе сайты"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Калі true, гэта прыстаўка не будзе правяраць палітыку для кожнага сайта, а "
+"будзе дазваляць."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Толькі другі ўзровень"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Калі true, гэта прыстаўка будзе абразаць кожны дамен да другога ўзроўню "
+"(www.example.org будзе зведзена да example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Палітыка невядомых даменаў"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Палітыка да ўжывання к невядомым даменам"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Прымаць часова"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Жэсты мышшу"
 
-#: ../extensions/mouse-gestures.c:302
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Кіраванне Midori рухамі мышы"
 
@@ -2854,27 +2872,27 @@ msgstr "Кіраванне Midori рухамі мышы"
 msgid "Reload page or stop loading"
 msgstr "Перачытаць старонку або спыніць чытанне"
 
-#: ../extensions/shortcuts.c:176
+#: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
 msgstr "Наставіць клавіятурныя скароты"
 
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Ð\9dаÑ\81Ñ\82а_Ñ\9eленне Ñ\81каÑ\80оÑ\82аÑ\9e..."
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts"
+msgstr "Ð\97мÑ\8fнÑ\96Ñ\86Ñ\8c Ñ\81каÑ\80а_Ñ\87Ñ\8dннÑ\96..."
 
-#: ../extensions/shortcuts.c:320
+#: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
 msgstr "Скарачэнні"
 
-#: ../extensions/shortcuts.c:321
+#: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
 msgstr "Глядзець і рэдагаваць клавіятурныя скароты"
 
-#: ../extensions/status-clock.c:174
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Гадзіннік на стужцы статусу"
 
-#: ../extensions/status-clock.c:175
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Паказваць дату і час у стужцы статусу"
 
@@ -2890,6 +2908,10 @@ msgstr "Скрыпты"
 msgid "Netscape plugins"
 msgstr "Плагіны Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Уключыць плагіны Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Магчымасці стужкі статусу"
@@ -2898,15 +2920,15 @@ msgstr "Магчымасці стужкі статусу"
 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:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Панэль картак"
 
-#: ../extensions/tab-panel.c:659
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Панэль к_артак"
 
-#: ../extensions/tab-panel.c:677
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Паказваць карткі ў вертыкальнай панэлі"
 
@@ -2918,11 +2940,11 @@ msgstr "Толькі значкі на новых картках"
 msgid "New tabs have no label by default"
 msgstr "Новыя карткі не падпісаныя"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Наставіць стужку прылад"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2930,345 +2952,566 @@ msgstr ""
 "Выберыце элементы, якія трэба паказваць на стужцы прылад. Элементы можна "
 "парадкаваць перацягваннем."
 
-#: ../extensions/toolbar-editor.c:427
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Даступныя элементы"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Паказаныя элементы"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "На_ставіць стужку прылад…"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Рэдактар стужкі прылад"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Зручнае рэдагаванне выкладу стужкі прылад"
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Запісваць HTTP-перасыланні ў дыскавы кэш"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Сцерці асабовыя звесткі"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "Сц_ерці"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Сцерці наступныя звесткі:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Апошнія адкрытыя карткі"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "С_ціраць асабовыя звесткі пры выхадзе з Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Запісаныя ўліковыя _запісы і паролі"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Кукі і звесткі вэб-сайтаў"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Значкі вэб-сайтаў"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "Зак_рыць іншыя карткі"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Адкрытыя карткі"
 
-#~ msgid "Filter:"
-#~ msgstr "Фільтр:"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Больш адкрытых картак"
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Не ўдалося ачысціць гісторыю: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Памылка сцірання старых элементаў гісторыі: %s\n"
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr ""
-#~ "Увядзіце радок фільтра, каб паказваць толькі тыя кукісы, дзе назва ці "
-#~ "дамен адпавядаюць фільтру"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Не ўдалося дадаць закладку: %s\n"
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "«Flash» Кукісы"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Абнаўленне закладак схібіла: %s\n"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Прымаць кукі"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Выдаленне закладкі схібіла: %s\n"
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Дадаць каталог закладак"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Не знойдзены файл каранёвага сертыфіката. SSL-сертыфікаты нельга спраўдзіць."
 
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Дадаць цэтлік хуткага запуску"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Немагчыма запісаць канфігурацыю. %s"
 
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Дадаць цэтлік на працоўную прастору"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Немагчыма запісаць гэту сметніцу. %s"
 
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Даданне, змяненне і выдаленне пошукавых рухавікоў..."
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori ўпаў падчас апошняга адкрыцця. Вы можаце паведаміць пра памылку на %s."
 
-#~ msgid "All cookies"
-#~ msgstr "Усе кукісы"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "_Правіць настаўленні"
 
-#~ msgid "An external download manager"
-#~ msgstr "Вонкавы распараднік перасыланняў"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Выключыць _усе прыстаўкі"
 
-#~ msgid "Appearance"
-#~ msgstr "Выгляд"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Паказваць гэты дыялог пасля аварыйнага завяршэння Midori"
 
-#~ msgid "Big"
-#~ msgstr "Вялікі"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Адкінуць старыя карткі"
 
-#~ msgid "Clear private data..."
-#~ msgstr "Сціранне асабовых звестак..."
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Паказаць апошні лог па_дзення"
 
-#~ msgid "Close all open windows"
-#~ msgstr "Закрыць усе адкрытыя вокны"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "З_апусціць у дэбагеры"
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Закрыць усе карткі, акрамя бягучай"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Экзэмпляр Midori ўжо запушчаны, але не адказвае.\n"
 
-#~ msgid "Close this window"
-#~ msgstr "Закрыць гэта вакно"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Немагчыма прачытаць закладкі: %s\n"
 
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Настаўленне _фільтра рэкламы..."
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Немагчыма прачытаць сеанс: %s\n"
 
-#~ msgid "Cookies"
-#~ msgstr "Кукісы/Cookies"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Немагчыма прачытаць сметніцу: %s\n"
 
-#~ msgid "Copy the selected text"
-#~ msgstr "Капіраваць вылучаны тэкст"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Немагчыма прачытаць гісторыю: %s\n"
 
-#~ msgid "Create a launcher"
-#~ msgstr "Стварыць пускальнік"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Здарылася наступная памылка:"
 
-#~ msgid "Customize _Toolbar..."
-#~ msgstr "_Настаўленне стужкі прылад..."
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ігнараваць"
 
-#~ msgid "Cut the selected text"
-#~ msgstr "Выразаць вылучаны тэкст"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Немагчыма адкрыць базу звестак прыстаўкі: %s"
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "Цыклічнае пераключэнне відаў"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Вы праўда хочаце сцерці ўсе дазволы для кукаў?"
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Сціраць старыя кукісы праз 1 гадзіну"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Сцерці ўсе дазволы для кукаў?"
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Сціраць старыя кукісы пасля 1 месяца"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Гэта дзеянне выдаліць усе дазволы кукаў. Будуць выдавацца запыты ізноў для "
+"кожнага наведанага вэб-сайта."
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Сціраць старыя кукісы пасля 1 тыдня"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Менеджар дазволаў для кукаў"
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Сціраць старыя кукісы пасля 1 года"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Экзэмпляр бягучага менеджара дазволаў для кукаў"
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Сцерці змест сметніцы"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Наставіць дазволы для кукаў"
 
-#~ msgid "Delete the selected text"
-#~ msgstr "Сцерці вылучаны тэкст"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Ніжэй прыведзены спіс усіх вэб-сайтаў і палітык для іх. Вы можаце выдаліць "
+"палітыкі, вылучыўшы запіс і націснуўшы <i>Сцерці</i>. Таксама вы можаце "
+"дадаць палітыку для дамена, увайшоўшы ў дамен ніжэй, выбраўшы палітыку і "
+"націснуўшы <i>Дадаць</i>."
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Дакумент не можа быць паказаны"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Палітыка для кукаў для даменаў па-за спісам: "
 
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Не запісваць ніякіх асабовых звестак падчас аглядання"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Пытацца"
 
-#~ msgid "Download Manager"
-#~ msgstr "Менеджар перасыланняў"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"Здарылася непапраўная памылка, якая перашкаджае прыстаўцы менеджара дазволаў "
+"для кукаў працягваць працу. Вы мусіце адключыць яе."
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Прадубліраваць бягучую картку"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Памылка ў прыстаўцы менеджара дазволаў для кукаў"
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Прымусова выставіць 96 кропак на цалю"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+"Немагчыма вызначыць глабальную палітыку кукаў, каб ужыць да дамена: %s"
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Прымусова выставіць шчыльнасць відэа 96 DPI"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Да канца сеанса"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Увесці колькасць слупкоў і радкоў:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Вэб-сайт %s хоча захаваць %d кукаў."
 
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Знайсці наступнае ўваходжанне слова ці выразу"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Вэб-сайт %s хоча захаваць кукі."
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Знайсці папярэдняе ўваходжанне слова ці выразу"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Некалькі вэб-сайтаў хочуць захаваць %d кукаў агулам."
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Бягучая картка"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "Прын_яць"
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "База з_вестак HTML5"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Пр_ыняць на гэты сеанс"
 
-#~ msgid "Import bookmarks..."
-#~ msgstr "Імпартаванне закладак..."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "Адхі_ліць"
 
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Інспектаванне дэталяў старонкі, прылады распрацоўніка..."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Адхіліць гэтым _разам"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Недапушчальны ўвод для памераў хуткага выбару"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Шлях"
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "Лёгкі вэб-браўзер"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Значэнне"
 
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Кантрольная сума MD5:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Прыдатны да"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Максімальны узрост кукісаў"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"Палітыка для несканфігураваных індывідуальна даменаў. Дзейнічае толькі як "
+"узмацненне строгасці глабальнай палітыкі для кукаў у настройках Midori."
 
-#~ msgid "Maximum history age"
-#~ msgstr "Максімальная даўжыня гісторыі"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Менеджар бяспекі кукаў"
 
-#~ msgid "Medium"
-#~ msgstr "Сярэдні"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Кіраванне дазволамі кукаў для кожнага сайта"
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Перамясціць картку за папярэднюю"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Атрыманне значка праграмы схібіла ў %s: %s"
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Перамясціць картку перад наступнай"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "No filename specified"
-#~ msgstr "Не уведзена назва файла"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Стварэнне новага запускальніка схібіла (%s): %s"
 
-#~ msgid "Not available: %s"
-#~ msgstr "Недаступна: %s"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Запускальнік створаны"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Не знойдзена - %s"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Цяпер вы можаце запускаць <b>%s</b> са свайго пускальніка ці меню"
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "Пазасеткавы кэш прыкладанняў"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Памылка стварэння запускальніка"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Паказваць толькі значок на бягучай картцы"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Праграмы"
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Адкрыць баг-трэкер Midori"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Новы _профіль"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Адкрываць вонкавыя старонкі ў:"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Стварае новы, незалежны профіль і запускальнік"
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Адкрыць апошнюю закрытую картку"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Новая _праграма"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Адкрываць карткі, запісаныя ў апошнім сеансе"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Стварае новую праграму для асобнага сайта"
 
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Уставіць тэкст з буфера абмену"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Памылка запуску"
 
-#~ msgid "Redo the last modification"
-#~ msgstr "Узнавіць апошняе змяненне"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Зрабіць цэт_лік"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Памятаваць апошнія сцягнутыя файлы"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Менеджар вэб-праграм"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "Скінуць апошні се_анс"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Кіраванне вэб-сайтамі, што ўстаноўлены як праграмы"
 
-#~ msgid "Reset the zoom level"
-#~ msgstr "Скінуць узровень павелічэння"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Перасыланні"
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Файлы рэсурсаў не ўстаноўлены"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Ачысціць усё"
 
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Кантрольная сума SHA1:"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Адкрыццё перасылання схібіла: %s"
 
-#~ msgid "Scroll down"
-#~ msgstr "Пракруціць уніз"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Адкрыць к_аталог прызначэння"
 
-#~ msgid "Scroll to the left"
-#~ msgstr "Пракруціць улева"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Капіраваць мес_цазнаходжанне спасылкі"
 
-#~ msgid "Scroll to the right"
-#~ msgstr "Пракруціць управа"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Перасыланне файла '<b>%s</b>' скончана."
 
-#~ msgid "Scroll up"
-#~ msgstr "Пракруціць уверх"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' і %d іншых файлаў атрымана."
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Пошукавыя рухавікі ў дапаўненні адрасоў"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Перасыланне скончана"
 
-#~ msgid "Select all text"
-#~ msgstr "Вылучыць увесь тэкст"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Некаторыя файлы яшчэ цягнуцца"
 
-#~ msgid "Session cookies"
-#~ msgstr "Кукі сеанса"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "Вы_йсці з Midori"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Задаць колькасць слупкоў і радкоў"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Перасыланні будуць скасаваныя, калі выйсці з Midori."
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Паказваць стужку перасыланняў"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Менеджар перасыланняў"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Паказваць панэль закладак"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Глядзець атрыманыя файлы"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Паказваць звесткі пра праграму"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Абнаўленне базы звестак схібіла: %s"
 
-#~ msgid "Show menubar"
-#~ msgstr "Паказаць радок меню"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Выбранне з базы звестак схібіла: %s"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Паказаць панэль навігацыі"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Імпарт спадчыннага сеанса схібіў: %s"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Паказваць аперацыйныя кантрольнікі панэлі"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Паказаць бакавую панэль"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Кіраванне карткамі і сеансамі"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Паказваць хуткі выбар у новай картцы"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Паказваць хуткі выбар у наноў адкрытых картках"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Гэта прыстаўка прадстаўляе чаргу задач для абнаўленняў і перыядычных падзей."
 
-#~ msgid "Show statusbar"
-#~ msgstr "Паказваць стужку статусу"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Памылка пры даданні новага запісу ў базу звестак: %s\n"
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Паказаць Частыя Пытанні"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Сціранне нататкі з базы звестак схібіла: %s\n"
 
-#~ msgid "Small"
-#~ msgstr "Малы"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Перайменаванне нататкі схібіла: %s\n"
 
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Падпісацца на гэты канал навін"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Абнаўленне нататкі схібіла: %s\n"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Пераключаць карткі па Strg+Tab парадкуючы па апошнім ужыванні"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Нататкі"
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Перайсці да папярэдняй карткі"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Новая нататка"
 
-#~ msgid "The bookmarks couldn't be saved. %s"
-#~ msgstr "Немагчыма захаваць закладкі. %s"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Стварае новую пустую нататку, не звязаную з адкрытымі старонкамі"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Памер значкоў:"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Новая нататка"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "Верхні ўзровень"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Выбранне з базы даных нататак схібіла: %s\n"
 
-#~ msgid "View the source code of the page"
-#~ msgstr "Глядзець выточны тэкст старонкі"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Перайменаваць нататку"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Ці запісваць апошнія сцягнутыя файлы"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Капіяваць нататку ў буфер абмену"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Ці паказваць пошукавыя рухавікі ў дапаўненні адрасоў"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Сцерці нататку"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Ці паказваць аперацыйныя кантрольнікі на панэлі"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Капіяваць вылучанае ў нататку"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Ці паказваць стужку перасыланняў"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Запісаць кавалкі тэксту з вэб-сайтаў як нататкі"
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Закладка"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Блакавальнік рэкламы"
 
-#~ msgid "_Console"
-#~ msgstr "_Сonsole"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Блакаванне рэкламы згодна з спісам фільтравання"
 
-#~ msgid "_Customize..."
-#~ msgstr "_Наставіць…"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Наставіць фільтры рэкламы"
 
-#~ msgid "_Folder:"
-#~ msgstr "К_аталог:"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Блакаванне выя_ў"
 
-#~ msgid "_Icon:"
-#~ msgstr "_Значок:"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Блакаван_не спасылак"
 
-#~ msgid "_Title:"
-#~ msgstr "_Загаловак:"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Рэдагаваць правіла"
 
-#~ msgid "days"
-#~ msgstr "дні"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Правіла:"
index 0b4e1adc6ff196456d7c35e5a0ad0c07d8650ad2..a58e765db541a71ddd27f450f5eb4b83c2939d7c 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,220 +7,213 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-27 10:45+0000\n"
-"PO-Revision-Date: 2013-04-27 15:17+0200\n"
-"Last-Translator: Kiril Kirilov (Cybercop) <cybercop_montana@abv.bg>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-04-20 17:09+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Launchpad-Export-Date: 2014-11-26 05:59+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: bg\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Търсене в Интернет"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82;WWW;ТÑ\8aÑ\80Ñ\81аÑ\87ка"
+msgid "Web Browser"
+msgstr "Уеб Ð±Ñ\80аÑ\83зÑ\8aÑ\80"
 
 #: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:162
-#: ../midori/midori-app.c:1459
-#: ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
-msgid "Midori"
-msgstr "Midori"
-
-#: ../data/midori.desktop.in.h:4
 msgid "Midori Web Browser"
 msgstr "Уеб браузър Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Търсене в Интернет"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Ð\9dов Ð¿Ñ\80озоÑ\80еÑ\86 Ð·Ð° Ð¿Ð¾Ð²ÐµÑ\80иÑ\82елно Ñ\81Ñ\8aÑ\80Ñ\84иÑ\80ане"
+msgid "Internet;WWW;Explorer"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82;WWW;ТÑ\8aÑ\80Ñ\81аÑ\87ка"
 
-#: ../data/midori.desktop.in.h:6
-#: ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Нов раздел"
 
-#: ../data/midori.desktop.in.h:7
-#: ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Нов прозорец"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Уеб Ð±Ñ\80аÑ\83зÑ\8aÑ\80"
+msgid "New Private Browsing Window"
+msgstr "Ð\9dов Ð¿Ñ\80озоÑ\80еÑ\86 Ð·Ð° Ð¿Ð¾Ð²ÐµÑ\80иÑ\82елно Ñ\81Ñ\8aÑ\80Ñ\84иÑ\80ане"
 
 #: ../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:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Поверителен режим на сърфиране"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Отваряне на нов прозорец за поверително сърфиране"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Снимките са съхранени в: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Стартиране на АДРЕС като уеб приложение"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРЕС"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Използвай ПАПКА като лична папка"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ПАПКА"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Поверителен режим, промените не могат да бъдат запазени"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "Мобилен режим. Всички изпълними файлове се съхраняват на едно място."
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Обикновен GTK+ прозорец с WebKit, от рода на GtkСтартер"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Показване на диалог за диагностика"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Стартирай без gdb и запази доклад за грешка"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Изпълнение на зададеният файл като javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Направете снимка на посочения URI"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Изпълнение на зададената команда"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Показване на списък с наличните команди за -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Показване на версията на програмата"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Блокиране на URI по ШАБЛОН (регулярен израз)"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "ШАБЛОН"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Рестартиране на Midori след СЕКУНДИ секунди бездействие"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "СЕКУНДИ"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Грешка: \"gdb\" не може да бъде намерен\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Моля, докладвайте коментари, съобщения и грешки на:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Проверка за нова версия на:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Неизвестна грешка"
 
-#: ../midori/midori-app.c:1360
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "Отметки"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Добавяне на отметка"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "Разширения"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363
-#: ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "История"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Потребителски скриптове"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Потребителски стилове"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Нов раздел"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "Трансфери"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Плъгини за Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Затваряне на раздел"
 
-#: ../midori/midori-app.c:1370
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Нов прозорец"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Нова папка"
 
-#: ../midori/midori-app.c:1426
-#: ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адреси]"
 
@@ -228,10 +221,8 @@ msgstr "[Адреси]"
 msgid "File not found."
 msgstr "Файлът не е намерен."
 
-#: ../midori/midori-array.c:574
-#: ../midori/midori-array.c:613
-#: ../midori/midori-array.c:637
-#: ../midori/midori-array.c:647
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Лошо оформен документ."
 
@@ -239,669 +230,676 @@ msgstr "Лошо оформен документ."
 msgid "Unrecognized bookmark format."
 msgstr "Неизвестен формат на отметката."
 
-#: ../midori/midori-browser.c:324
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Напред към следващата страница"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331
-#: ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Напред към следващата подстраница"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Търсене в мрежата..."
 
-#: ../midori/midori-browser.c:445
-#: ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Обновяване на текущата страница"
 
-#: ../midori/midori-browser.c:453
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Прекратяване на зареждането на текущата страница"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Не може да бъде обновено заглавие: %s\n"
 
-#: ../midori/midori-browser.c:562
-#: ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621
-#: ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Стойността '%s' не е валидна за %s"
 
-#: ../midori/midori-browser.c:570
-#: ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Неочаквана настройка '%s'"
 
-#: ../midori/midori-browser.c:578
-#: ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Неочаквано действие '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Сърфиране в поверителен режим)"
 
-#: ../midori/midori-browser.c:841
-#: ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Не може да бъде добавена нова история за елемент: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Избери [текст]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Ð\9dова Ð¿апка"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Ð\9dова Ð\9fапка"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "РедакÑ\82иÑ\80ане Ð½Ð° Ð¿апка"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "РедакÑ\82иÑ\80ане Ð½Ð° Ð\9fапка"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Нова отметка"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Редактиране на отметка"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Редактиране на отметката"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Ð\98збеÑ\80еÑ\82е Ð¸Ð¼ÐµÑ\82о Ð½Ð° Ð¾Ñ\82меÑ\82каÑ\82а Ð¸ Ð¼Ñ\8fÑ\81Ñ\82оÑ\82о, ÐºÑ\8aдеÑ\82о Ð´Ð° Ñ\81е Ñ\81Ñ\8aÑ\85Ñ\80анÑ\8fва."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Ð\97адайÑ\82е Ð¸Ð¼Ðµ Ð½Ð° Ñ\82ази Ð¾Ñ\82меÑ\82ка Ð¸ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е ÐºÑ\8aде Ð´Ð° Ñ\8f Ð·Ð°Ð¿Ð°Ð·Ð¸Ñ\82е"
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Ð\94обавÑ\8fне Ð² Ð±Ñ\8aÑ\80зиÑ\8fÑ\82 Ð¸Ð·Ð±Ð¾Ñ\80"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Ð\97адайÑ\82е Ð¸Ð¼Ðµ Ð½Ð° Ñ\82ази Ð¿Ð°Ð¿ÐºÐ° Ð¸ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е ÐºÑ\8aде Ð´Ð° Ñ\8f Ð·Ð°Ð¿Ð°Ð·Ð¸Ñ\82е"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Ð\9fоказване Ð² Ð»ÐµÐ½Ñ\82аÑ\82а Ñ\81 Ð¸Ð½Ñ\81Ñ\82Ñ\80Ñ\83менÑ\82и"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Ð\9fоказване Ð² Ð»ÐµÐ½Ñ\82аÑ\82а Ñ\81 Ð¾Ñ\82меÑ\82ки"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "СÑ\82аÑ\80Ñ\82иÑ\80ане ÐºÐ°Ñ\82о Ñ\83еб Ð¿Ñ\80иложение"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Ð\94обавÑ\8fне Ð² Ð±Ñ\8aÑ\80зиÑ\8fÑ\82 Ð¸Ð·Ð±Ð¾Ñ\80"
 
-#: ../midori/midori-browser.c:1158
-#: ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Запазване на файла като"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Запазване на асоциираните ресурси"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Отворен е нов прозорец"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Отворен е нов раздел"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Грешка при отварянена изображението!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
-msgstr "Не може да бъде отворено избраното изображение с програмата за преглед по подразбиране."
+msgstr ""
+"Не може да бъде отворено избраното изображение с програмата за преглед по "
+"подразбиране."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Грешка при сваляне на изображението!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Не може да бъде свалено избраното изображение."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Запазване на файл"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Обновяване на страницата без кеширане"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Отваряне на файл"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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 също можете да зададете програма за четене на новини. В такъв случай, следващият път, когато кликнете въру иконата за емисия новини, тя ще бъде добавена автоматично."
-
-#: ../midori/midori-browser.c:2565
-#: ../extensions/feed-panel/main.c:349
+"За да използвате данните от URI, отворете програмата за четене на новини. "
+"Това обикновено е лента от менюто или бутон с име \"Нов абонамент\", \"Нова "
+"емисия новини\" или нещо подобно.\n"
+"От настройките на Midori също можете да зададете програма за четене на "
+"новини. В такъв случай, следващият път, когато кликнете въру иконата за "
+"емисия новини, тя ще бъде добавена автоматично."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Нова емисия"
 
-#: ../midori/midori-browser.c:2596
-#: ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Добавяне на нова отметка"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645
-#: ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Споделяне на тази страница"
-
-#: ../midori/midori-browser.c:3121
-#: ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Празно"
 
-#: ../midori/midori-browser.c:3497
-#: ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Режим на превключване на текста  с помощта на показалеца"
 
-#: ../midori/midori-browser.c:3500
-msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."
-msgstr "Натиснете F7 за да превключи преместването на показалеца при сърфиране. Когато е включен, показалецът ще се вижда във всички страници."
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Натиснете F7 за да превключи преместването на показалеца при сърфиране. "
+"Когато е включен, показалецът ще се вижда във всички страници."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Преместване на показалеца."
 
-#: ../midori/midori-browser.c:3924
-#: ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Не може да бъде добавена нова история за елемент: %s\n"
-
-#: ../midori/midori-browser.c:4238
-#: ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Отваряне на всички в раздели"
 
-#: ../midori/midori-browser.c:4245
-#: ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798
-#: ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Отваряне в нов раздел"
-
-#: ../midori/midori-browser.c:4248
-#: ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888
-#: ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800
-#: ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Отваряне в нов прозорец"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Внасяне на отметки…"
 
-#: ../midori/midori-browser.c:4364
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "Внасяне на отметки"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "Програма:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Внасяне от файл XBEL или HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Внасяне от файл"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Не може да бъде внесена отметка"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Отметки XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Отметки Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Не могат да бъдат изнесени отметки"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Лек Уеб браузър."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
-msgstr "Вижте:version за получаване на информация за текущата версия."
+msgstr ""
+"Посетете about:version, за да получите подробна информация за версията"
 
-#: ../midori/midori-browser.c:4764
-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: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 ""
+"Тези библиотеки са свободен софтуер. Вие може да ги разпространявате или "
+"променяте при условията на GNU Lesser General Public License побликуван от "
+"Free Software Foundation; версия от 2.1 или (по ваша преценка), всяка по- "
+"късна версия."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Kiril Kirilov (Cybercop) <cybercop_montana@abv.bg>"
+msgstr ""
+"Kiril Kirilov (Cybercop) <cybercop_montana@abv.bg>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  ITPROJECTS https://launchpad.net/~itprojects\n"
+"  Ivan https://launchpad.net/~i-kazandjiev\n"
+"  Radoslav Petrov https://launchpad.net/~zloster12\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  cybercop https://launchpad.net/~cybercop-montana"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Създаване на копие на текущият раздел"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Файл"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Отваряне в нов прозорец"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Отваряне в нов раздел"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Нов прозорец за поверително сърфиране"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Отваряне на файл"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Запази страницата като…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Запазване във файл"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Добавяне в Бързо стартиране"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Абониране за получаване на новини"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Затваряне на раздел"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Затваряне на текущият раздел"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Затваряне на прозореца"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "Споделяне"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Отпечатване на текущата страница"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Затваряне на всички прозорци"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "Редактиране"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Намери…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Намиране на дума или фраза в страницата"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Намери следващата"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Намери предишната"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Конфигуриране на настройките на програмите"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "Преглед"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Лента с инструменти"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Обновяване на страницата без кеширане"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Увеличаване на мащаба"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Намаляване на мащаба"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "Кодировка"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Изходен код на страницата"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Прегледай _DOM Източник"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Преместване на курсора"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Превключване в режим на цял екран"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Превъртане наляво"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Превъртане надолу"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Превъртане нагоре"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Превъртане надясно"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "За четене"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "Отиване"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Връщане на предишната страница"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Отиване на следващата страница"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Напред или Следващото"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+"Отиди на следващата под-страница или на следващата страница от историята"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Домашна страница"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Отиване в домашната страница"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Изпразване на кошчето"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Отмяна на затварянето на раздела"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Добавяне на нова папка"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "Ð\98знаÑ\81Ñ\8fне Ð½Ð° Ð¾Ñ\82меÑ\82ка"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "Ð\92наÑ\81Ñ\8fне Ð½Ð° Ð¾Ñ\82меÑ\82ки..."
 
-#: ../midori/midori-browser.c:5430
-#: ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "Управление на търсачките"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "Изнасяне на отметки..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "Ð\98зÑ\87иÑ\81Ñ\82ване Ð½Ð° Ð»Ð¸Ñ\87ниÑ\82е Ð´Ð°Ð½Ð½Ð¸"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "УпÑ\80авление Ð½Ð° Ñ\82Ñ\8aÑ\80Ñ\81аÑ\87киÑ\82е..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "Изчистване на личните данни..."
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Преглед на страницата"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Предишен раздел"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Следващ раздел"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Преместване на раздела на първа позиция"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Преместване на раздела назад"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Преместване на раздела напред"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Преместване на раздела на последна позиция"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Фокусиране на текущият раздел"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Фокусиране на следващият раздел"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Показване на икона само на текущият раздел"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "Създаване на копие на текущият раздел"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Затваряна на другите раздели"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Отваряне на последната сесия"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Помощ"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Често задавани въпроси"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Докладване на проблем…"
 
-#: ../midori/midori-browser.c:5482
-#: ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Инструменти"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Лента с менюта"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Лента за навигация"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Странична лента"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Страничен панел"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Лента с отметки"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Лента на състоянието"
 
-#: ../midori/midori-browser.c:5514
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "Автоматично"
 
-#: ../midori/midori-browser.c:5517
-#: ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Китайска традиционна (Big5)"
 
-#: ../midori/midori-browser.c:5520
-#: ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Китайска опростена (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Японска (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527
-#: ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Корейска (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530
-#: ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Руска (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533
-#: ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Юникод (UTF-8)"
 
-#: ../midori/midori-browser.c:5536
-#: ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Западно-европейска (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539
-#: ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234
-#: ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Потребителски избор…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Неуспех при инициализиране на историята: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "Разделител"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "Местоположение…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Отваряне на определеното местоположение"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Търсене в мрежата…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Стартиране на търсене в мрежата"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Отваряне отново на предишно затворени раздели или прозорци"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Показване на запазените отметки"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "Раздели"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Показване на списък с всички отворени прозорци"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "Меню"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Меню"
 
@@ -910,692 +908,689 @@ msgstr "Меню"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Настройките на разширение '%s' не могат да бъдат заредени: %s\n"
 
-#: ../midori/midori-extension.c:880
-#: ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Настройките на разширение '%s' не могат да бъдат запазени: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Изнасяне на сертификат"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Авторът, подписал сертификата е неизвестен."
 
-#: ../midori/midori-locationaction.c:1366
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr "Сертификата не съвпада с името на сайта от който е бил получен."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Срокът на действие на сертификата все още не е започнал."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Срокът на действие на сертификата е изтекъл."
 
-#: ../midori/midori-locationaction.c:1372
-msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list."
-msgstr "Съгласно искане на автора, този сертификат е обявен за недействителен."
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Съгласно искане на автора, този сертификат е обявен за недействителен."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
-msgstr "Ð\90лгоÑ\80иÑ\82Ñ\8aмÑ\8aÑ\82, Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ Ð² Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82а Ð½Ðµ Ñ\81е Ñ\81мÑ\8fÑ\82а Ð·Ð° Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ\81ен."
+msgstr "СеÑ\80Ñ\82иÑ\84икаÑ\82Ñ\8aÑ\82 Ðµ Ð·Ð°Ñ\89иÑ\82ен Ñ\81 Ð½ÐµÑ\81игÑ\83Ñ\80ен Ð°Ð»Ð³Ð¾Ñ\80иÑ\82Ñ\8aм."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Появиха се други грешки при проверка на сертификата."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "Изнасяне на сертификат."
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Самоподписан"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Подробности за безопасност"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Поставете и продължете"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Не е проверено"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Проверена и защитена връзка"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Отваряне, незащитена връзка"
 
-#: ../midori/midori-panel.c:314
-#: ../midori/midori-panel.c:316
-#: ../midori/midori-panel.c:480
-#: ../midori/midori-panel.c:483
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Разполагане на страничният панел вдясно"
 
-#: ../midori/midori-panel.c:326
-#: ../midori/midori-panel.c:327
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Затваряне на панел"
 
-#: ../midori/midori-panel.c:481
-#: ../midori/midori-panel.c:484
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Разполагане на страничният панел вляво"
 
-#: ../midori/midori-websettings.c:114
-#: ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Показване на бързо стартиране"
 
-#: ../midori/midori-websettings.c:115
-#: ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Показване на Домашната страница"
 
-#: ../midori/midori-websettings.c:116
-#: ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Показване на последните отворени раздели"
 
-#: ../midori/midori-websettings.c:117
-#: ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Показване на последните раздели без зареждане"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Покажи празна страница"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Покажи търсачката по подразбиране"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Покажи потребителска страница"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Японска (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Нов раздел"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Нов прозорец"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Текущ раздел"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Икони"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Малки икони"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Текст"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Икони и текст"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Текст до иконите"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Автоматично (GNOME или поддържаната)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Прокси-сървър HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Без прокси-сървър"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Стилът на лентата с инструменти"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Винаги да се използва избран от мен шрифт"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
-msgstr "Замяна на шрифтовете, зададени от уебсайтовете с предпочитани от потребителя"
+msgstr ""
+"Замяна на шрифтовете, зададени от уебсайтовете с предпочитани от потребителя"
 
-#: ../midori/midori-websettings.c:1410
-#: ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Не може да бъде заредена конфигурацията: %s\n"
 
-#: ../midori/midori-websettings.c:1470
-#: ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Невалидна стойност на конфигурация '%s'"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Не може да бъде внесен стил на страница: %s"
 
-#: ../midori/midori-view.c:861
-#: ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Показване на заглавието на раздела"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Показване само на икони в раздела"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Затвори Подпрозорец на_ясно"
+msgstr[1] "Затвори Подпрозорци на_ясно"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Затваряне на другият раздел"
+msgstr[1] "Затваряне на другите раздели"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Довери се на този сайт"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Неизвестно равнище на сигурност"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s иска достъп до базата данни на HTML5."
 
-#: ../midori/midori-view.c:1340
-#: ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
-msgstr "Отказване"
+msgstr "_Отказ"
 
-#: ../midori/midori-view.c:1340
-#: ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
-msgstr "Позволяване"
+msgstr "_Позволяване"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s иска да научи вашето местоположение."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Грешка — %s"
+msgid "'%s' can't be found"
+msgstr "'%s' не може да бъде намерен"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Страницата '%s' не може да бъде заредена."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Страницата '%s' не може да бъде заредена:"
 
-#: ../midori/midori-view.c:1502
-#: ../midori/midori-view.c:1646
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Проверете адреса за правописни грешки"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "Поставете кабела или активирайте мрежовата карта"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Проверете правилно ли е настроена мрежата"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Нов опит"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Грешка - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Нещо се обърка с '%s'."
 
-#: ../midori/midori-view.c:1791
-#: ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Нов опит"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Изпращане на съобщение на %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Добавяне на търсачка..."
 
-#: ../midori/midori-view.c:2701
-#: ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Проверка на елемент"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Отваряне на адрес"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Отваряне на връзката в нов раздел"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Отваряне на връзката в раздел на преден план"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Отваряне на връзката в раздел на заден план"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Отваряне на връзката в нов прозорец"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Отваряне на връзката като уеб приложение"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Копиране на адреса на връзката"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Запази като…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Отваряне на изображението в нов прозорец"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Отваряне на изображението в нов раздел"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Копиране на изображението"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Запазване на изображението"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Отваряне на изображението с програма за преглед"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Копиране на адреса на видеото"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Запазване на видеото"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Сваляне на видеото"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Отваряне на адреса в нов раздел"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Търсене с"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "Търсене в мрежата"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Отваряне на адреса в нов раздел"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Отваряне на рамката в нов раздел"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Проверка на елемент"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Отваряне или сваляне на файл от %s"
 
-#: ../midori/midori-view.c:3163
-#: ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Име на файл: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Тип файл: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Тип файл: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225
-#: ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Отваряне на %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
-msgstr "Проверка на страница  %s"
+msgstr "Проверка на страница - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Не е намерена документация"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori не можа да запази някои от личните данни:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Историята и бисквитките не бяха запазени."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Разширенията са изключени."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "HTML5 хранилището, локалната база данни и кеширането на приложения са изключени."
+msgstr ""
+"HTML5 хранилището, локалната база данни и кеширането на приложения са "
+"изключени."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori предотвратява следенето на потребителя от уеб страници:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Изходните адреси се отрязват до име на хост."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Проактивните DNS заявки са забранени."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Сайтът не предоставя информация за език и часови пояс."
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Сайтът не дава информация за наличие на Flash и други Netscape плъгини."
+msgstr ""
+"Сайтът не дава информация за наличие на Flash и други Netscape плъгини."
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "Числата в скобите показват ползваната в момента версия."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Зареждането на страницата е отложено"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Зареждането на страницата се забави:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "Зареждането на страницата е забавено заради повреда или е зададено от настройките."
+msgstr ""
+"Зареждането на страницата е забавено заради повреда или е зададено от "
+"настройките."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Зареждане на страница"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Празна страница"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "Дублиране на раздела"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Показване на заглавието на раздела"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Показване само на икони в раздела"
-
-#: ../midori/midori-view.c:4904
-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:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "предишно"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "следващо"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Отпечатване на фоновото изображение"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Да бъде ли отпечатано фоновото изображение"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Възможности"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s на %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часа"
-msgstr[2] "%d часа"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минути"
-msgstr[2] "%d минути"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, 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:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s оставащо"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?Б"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
-msgstr "Сваляният файл е повреден."
+msgstr "Сваленият файл е повреден."
 
-#: ../midori/midori-download.vala:225
-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:221
+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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Файлът \"%s\" не може да бъде запазен в тази папка."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Вие нямате права за запис в този файл."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Там няма достатъчно място за свалянето на \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Файлът се нуждае от %s обаче е налице само %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Бърз избор"
 
-#: ../midori/midori-speeddial.vala:181
-#: ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Кликнете, за да добавите пряк път"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Въведете адреса за прекият път"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Въведете заглавие за прекият път"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Сигурен ли сте, че искате да изтриете този пряк път?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Стартиране"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "При стартиране на Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Домашна страница:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Използване на текущата страница"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Използване на текущатастраница, като домашна страница"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Пропорционални шрифтове"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Шрифтове по подразбиране, използвани за показване на текста"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
-msgstr "Размер на шрифтовете по подразбиране, използвани за показване на текста"
+msgstr ""
+"Размер на шрифтовете по подразбиране, използвани за показване на текста"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Шрифтове с фиксирана ширина /равно-широки/"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Равношироки шрифтове, използвани за показване на текста"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Размер на шрифта, използван за показване на текст с фиксирана ширина"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Минимален размер на шрифта"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Минималният размер на шрифта, използван за показване на текста"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Предпочитана кодировка"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Поведение"
 
-#: ../midori/midori-preferences.c:365
-#: ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Зареждане на изображението автоматично"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Включване проверката на правописа"
 
-#: ../midori/midori-preferences.c:382
-#: ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Включване на скриптове"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Включване поддръжката на WebGL"
 
-#: ../midori/midori-preferences.c:403
-#: ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Включване на плъгини Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Увеличаване на текста и изображенията"
@@ -1606,255 +1601,264 @@ msgstr "Разрешаване на скриптовете да отварят 
 
 #: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Да се разреши ли на скриптовете да отварят изскачащи прозорци автоматично?"
+msgstr ""
+"Да се разреши ли на скриптовете да отварят изскачащи прозорци автоматично?"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Мащаб по подразбиране"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Първоначален фактор за уголемяване на новоотворените раздели"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Предпочитани езици"
 
-#: ../midori/midori-preferences.c:420
-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\", \"bg,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-preferences.c:426
+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\", "
+"\"bg,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Запазване на свалените файлове в:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Сърфиране"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Тема:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Стил на лентата с инструменти:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Отваряне на нова страница в:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Поведение на нов раздел:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Затваряне на бутоните на разделите"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Винаги показвай лентата на разделите"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Отваряне на нови раздели след текущият"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "Отваряне на нови раздели след текущият или след последният"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Отваряне на разделите във фонов режим"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Текстов редактор"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Програма за четене на новини"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Прокси сървър"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Ð\90дÑ\80еÑ\81 /Ð\98ме Ð½Ð° Ñ\85оÑ\81Ñ\82/"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "УРÐ\98\92Ñ\80Ñ\8aзка"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Порт"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Поддържани типове прокси сървъри:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520
-#: ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470
-#: ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Уеб кеширане"
 
-#: ../midori/midori-preferences.c:521
-#: ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Максимален размер на кеширани страници върху диска"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "МБ"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Идентифициране като"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Поверителност"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Изтриване на стари бисквитки след:"
 
-#: ../midori/midori-preferences.c:552
-#: ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Максимален брой дни за съхранение на бисквитки"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Приемане на бисквитки само от посещаваните сайтове"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Блокиране на бисквитките, изпратени от уебсайтове на трети страни"
 
-#: ../midori/midori-preferences.c:565
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
-msgstr "Бисквитките съхраняват входните данни, записани игри или потребителски профили за рекламни цели."
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Бисквитките съхраняват входните данни, записани игри или потребителски "
+"профили за рекламни цели."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Включване на кеширано уеб приложение"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Включване на поддръжка на локално хранилище HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Орязвай референтните детайли, изпращани към уебстраниците"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Да бъде ли заглавието \"Референтен\" съкратено до името на хоста и да не показва адреса"
+msgstr ""
+"Да бъде ли заглавието \"Референтен\" съкратено до името на хоста и да не "
+"показва адреса"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Изтривай история по- стара от:"
 
-#: ../midori/midori-preferences.c:586
-#: ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Максимален срок /в дни/ на съхраняване на историята"
 
-#: ../midori/midori-preferences.c:626
-#: ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Разширения"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Управление на търсачките"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Добавяне на търсачка"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Добавяне на търсачка"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "Име:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Описание:"
 
-#: ../midori/midori-searchaction.c:1105
-#: ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Признак:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Управление на търсачките"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Използване по подразбиране"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Търсачката не може да бъде заредена. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Търсачката не може да бъде запазена. %s"
 
 #: ../midori/midori-historycompletion.vala:17
-#: ../panels/midori-history.c:111
-msgid "History"
-msgstr "История"
+msgid "Bookmarks and History"
+msgstr "Отметки и История"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Ð\9dеÑ\83Ñ\81пеÑ\85 Ð¿Ñ\80и Ð¸Ð½Ð¸Ñ\86иализиÑ\80ане Ð½Ð° Ð¸Ñ\81Ñ\82оÑ\80иÑ\8fÑ\82а: %s"
+msgid "Search for %s"
+msgstr "ТÑ\8aÑ\80Ñ\81ене Ð½Ð° %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Неуспех при избиране от историята: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Търсене на %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Търсене с…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Търсене с %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Отваряне с"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Избор на приложение или команда за отваряне на \"%s\":"
 
-#: ../midori/sokoke.c:368
-#: ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Не може да бъде стартирана външна програма."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Невалиден URI"
 
@@ -1879,86 +1883,136 @@ msgstr "Съвпадение"
 msgid "Close Findbar"
 msgstr "Затваряне на лентата за търсене"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Не може да бъде добавена отметка: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d отметка"
+msgstr[1] "%d отметки"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d подпапка"
+msgstr[1] "%d подпапки"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Празна папка"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Папката съдержа %s и няма отметки"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Папката съдържа %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Папка съдържаща %s и  %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Отметка, водеща до: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s и не е отметнат"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Не може да бъде обновена отметка: %s\n"
+msgid "%s and %s"
+msgstr "%s и %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Редактиране на избраната отметка"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Изтриване на избраната отметка"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Добавяне на нова папка"
 
-#: ../panels/midori-bookmarks.c:687
-#: ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Разделител</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Отваряне в нов раздел"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Търсене в отметките"
 
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "История"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Днес"
 
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] "Преди %d ден"
-msgstr[1] "Преди %d дни"
-msgstr[2] "Преди %d дни"
+msgstr[0] "преди %d ден"
+msgstr[1] "преди %d дни"
 
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Преди седмица"
 
-#: ../panels/midori-history.c:234
-#: ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Не може да бъде премахнат от историята запис: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Искате ли да премахнете всички записи от историята?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Отмятане на избраните записи от историята"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Изтриване на избраните записи от историята"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Изчистване на цялата история"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Търсене в историята"
 
@@ -1986,112 +2040,65 @@ msgstr "Парола"
 msgid "_Remember password"
 msgstr "Запомняне на паролата"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Не може да бъде заредена икона '%s'"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Не може да бъде заредена системна икона '%s'"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Кадрите с анимация са повредени"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Няма"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Свойство '%s' не е валидно за %s"
 
-#: ../katze/katze-utils.c:565
-#: ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Избор на файл"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Избор на папка"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 час"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 ден"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 седмица"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 месец"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 година"
 
-#: ../katze/katze-preferences.c:72
-#: ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Предпочитания за %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Контролна сума MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Контролна сума SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Настройки на филтрите за реклами"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Правила за редактиране"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "Правило:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Блокиране на изображение"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Блокиране на връзка"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Блокиране на реклами"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "Тази страница съдържа потребителски скрипт. Искате ли да го инсталирате?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Тази страница съдържа потребителски скрипт. Искате ли да го инсталирате?"
 
 #: ../extensions/addons.c:223
 msgid "_Install user script"
@@ -2100,7 +2107,8 @@ msgstr "Инсталиране на потребителският скрипт"
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
-msgstr "Тази страница  съдържа потребителски стил. Желаете ли да го инсталирате?"
+msgstr ""
+"Тази страница  съдържа потребителски стил. Желаете ли да го инсталирате?"
 
 #: ../extensions/addons.c:229
 msgid "_Install user style"
@@ -2110,19 +2118,16 @@ msgstr "Инсталиране на потребителският стил"
 msgid "Don't install"
 msgstr "Не инсталирай"
 
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Потребителски скриптове"
 
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Потребителски стилове"
 
-#: ../extensions/addons.c:370
-#: ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Грешка"
 
@@ -2144,43 +2149,40 @@ msgstr "Премахване на потребителският стил"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Файлът <b>%s</b> ще бъде изтрит окончателно."
 
-#: ../extensions/addons.c:563
-#: ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Отваряне с текстов редактор."
 
-#: ../extensions/addons.c:565
-#: ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Отваряне на целевата папка"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Добавяне на нова добавка"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Премахване на избраната добавка"
 
-#: ../extensions/addons.c:1682
-#: ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Потребителски добавки"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Не може да бъде наблюдавана папка '%s': %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Поддръжка на потребителски скриптове и стилове"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Оцветяване на раздели"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Всеки раздел да има свой цвят"
 
@@ -2189,39 +2191,44 @@ msgstr "Всеки раздел да има свой цвят"
 msgid "Cookie Manager"
 msgstr "Управление на бисквитките"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 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:101
+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:116
 msgid "Expand All"
 msgstr "Разширяване на всички"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Свиване на всички"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Наистина ли искате да изтриете всички бисквитки?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Въпрос"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
-msgstr "Ще бъдат изтрити само бисквитките, които отговарят на зададеното във филтъра."
+msgstr ""
+"Ще бъдат изтрити само бисквитките, които отговарят на зададеното във филтъра."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "В края на сесията"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2239,15 +2246,15 @@ msgstr ""
 "<b>Изтичане на срока</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Да"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Не"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2256,20 +2263,20 @@ msgstr ""
 "<b>Домейн</b>: %s\n"
 "<b>Бисквитки</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Име"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Разширяване на всички"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Свиване на всички"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Търсене на бисквитки по име или домейн"
 
@@ -2289,23 +2296,47 @@ msgstr "Копиране на адресите на разделите"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Копиране на адресите на всички раздели в системният буфер"
 
-#: ../extensions/delayed-load.vala:24
-#: ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Забавяне на зареждането"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Забавяне, в секунди, преди да бъде заредена страница:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
-msgstr "Забавяне зареждането на страницата, докато действително използвате раздела."
+msgstr ""
+"Забавяне зареждането на страницата, докато действително използвате раздела."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Щракнете два пъти за още сведение"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "ДевПет"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Това разширение показва (glib) съобщение за грешка в системната лента"
 
 #: ../extensions/external-download-manager.vala:124
-msgid "An error occurred when attempting to download a file with the following plugin:\n"
-msgstr "По време на зареждането на файла, възникна грешка в плъгина:\n"
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Имаше грешка при опита за изтегляне на файл със следната добавка:\n"
+"%s\n"
+"\n"
+"Грешка:\n"
+"%s\n"
+"\n"
+"Продължение без тази добавка."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2338,32 +2369,35 @@ msgstr "Външен мениджър на изтеглянията - CommandLin
 
 #: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Не може да се намери необходимите Atom елементи  \"показване\" в база данни XML."
+msgstr ""
+"Не може да се намери необходимите Atom елементи  \"показване\" в база данни "
+"XML."
 
 #: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Не може да се намери необходимите Atom елементи  \"емисия\" в база данни XML."
+msgstr ""
+"Не може да се намери необходимите Atom елементи  \"емисия\" в база данни XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Последно обновяване: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Емисии"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Добавяне на нова емисия"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Премахване на емисия"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "Емисии"
 
@@ -2382,37 +2416,38 @@ msgstr "Неподдържан формат на емисия."
 msgid "Failed to parse XML feed: %s"
 msgstr "Неуспех при обработката на XML-емисия: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Неуспех при намирането на елемент \"канал\" в база данни RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Не е намерена поддържана версия на  RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Неуспех при намирането на изисканите RSS \"елемент\" в база данни XML."
+msgstr ""
+"Неуспех при намирането на изисканите RSS \"елемент\" в база данни XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Неуспех при намирането на изисканите RSS \"канал\" в база данни XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Емисия '%s' вече съществува"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Грешка при зареждането на емисия '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Панел с емисии"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Четене на емисии RSS/Atom"
 
@@ -2431,124 +2466,414 @@ msgid ""
 "to open password database"
 msgstr ""
 "За да отворите тази база с данни са неободими\n"
-"потребителско име и парола:"
+"потребителско име и парола"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Да бъде ли запомнена паролата?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Запомняне"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Не сега"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Никога за тази страница"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Превключване на състоянието на историята на формуляра"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
-msgstr "Активиране или деактивиране на историята на формуляра  за текущият раздел."
-
-#: ../extensions/formhistory/formhistory.c:515
-#: ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Неуспех при отварянето на база с данни: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Неуспех при изпълнението на отчета на базата с данни: %s\n"
+msgstr ""
+"Активиране или деактивиране на историята на формуляра  за текущият раздел."
 
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr "Само активиране на историята на формуляра за всеки раздел с клавишна комбинация (Ctrl + Shift + F)"
+msgstr ""
+"Само активиране на историята на формуляра за всеки раздел с клавишна "
+"комбинация (Ctrl + Shift + F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Попълване на историята на формуляра"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Съхраняване на историята на въведените данни във формулярите"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Не може да бъде избрано предложение\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Няма непосетени раздели"
 
 # Используется как заголовок окна настроек дополнения: «Параметры <this>»
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
-msgstr "Списък с история"
+msgstr "Списък с историята"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Поведение при затворен раздел:"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Превключи на последният разглеждан раздел"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Превключи на най- новият раздел"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Мигащ прозорец на разделите във фонов режим"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Следващият нов раздел (от списъка с историята)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Следващият нов раздел от историята"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Предишният нов рездел (от списъка с историята)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Предишният нов раздел от историята"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Показване на раздел във фонов режим (Списък с история)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Показване на текущо избраният раздел във фонов режим"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Списък с историята"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
-msgstr "Преместване до последният използван раздел при превключване или затваряне на разделите"
+msgstr ""
+"Преместване до последният използван раздел при превключване или затваряне на "
+"разделите"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL файлове: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Приемане"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Приемане за тази сесия"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Блокиране"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Не може да се отвори база данни на разширение: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Неуспех при изпълнението на отчета на база с данни: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Наистина ли искате да изтриете всички ДжаваСкрипт-ови разрешения?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Изтрий всички ДжаваСкрипт-ови разрешения?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Това действие ще изтрие всички ДжаваСкрипт-ови разрешения. Ще бъдете "
+"запитани отново за разрешения относно всяка посетена страница."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Управителна инстанция"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Инстанция към общия (NoJS) управител"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Нагласете (NoJS)"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Отдолу е  списък на мрежовите страници и решенията подбрани за тях. Можете "
+"за изтриете решенията като отбележите въведенията и натиснете върху  "
+"<i>Изтрий</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Домейн"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Политика за сигурност"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Изтриване на всичко"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "П_озволете скриптовете за всички страници"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "С_ри скриптове за неизвестни източници на страници по подразбиране"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "На_ласи разрешения за второстепенните източници на страници"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Откажи %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Разреши %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Позволи %s този път"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Прозорец на Браузъра"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Мидори браузър-ът, на който този изглед принадлежи"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Изглед"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Мидори изгледа, на който този изглед принадлежи"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Меню иконово състояние"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Състояние на меню иконата да бъде показано в лентата на състоянието"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Неопределен"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Разрешено"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Смесено"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Отхвърлено"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Станала е пагубна грешка, която спира (NoJS) разширението да продължи. Бива "
+"да го преустановите."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Грешка в (NoJS) разширението"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Причина"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Не може да бъде създадена папка с конфигурацията на разширение: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Не може да бъде създадена папка с конфигурацията на разширението."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Неуспех при отварянето на базата с данни на разширението."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Не може да се създаде структура на базата данни на разширението."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Примерно разширение"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Примерно разширение на Midori за това разширение"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Примерна програма"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Примерното Midori разширение принадлежи към"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Примерна база с данни"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Указател до примерна SQLite база данни, използвана от това разширение"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Път до база с данни"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Пътят към база данни SQLite например, използвани от това разширение"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Разреши всички страници"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Ако е белязано вярно, това разширение няма да проверява решенията за всяка "
+"страница, а ще ги разрешява."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Само второстепенно ниво"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Ако е белязано вярно, това разширение ще намали броя на източниците до "
+"второстепенните (www.example.org става на example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Неизвестно мрежово решение"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Решение за ползване при неизвестни източници"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Приеми временно"
 
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
@@ -2578,11 +2903,11 @@ msgstr "Бързи клавиши"
 msgid "View and edit keyboard shortcuts"
 msgstr "Преглед и редактиране на Бързите клавиши"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Часовник в лентата на състоянието"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Показване на датата и часа в лентата на състоянието"
 
@@ -2598,24 +2923,27 @@ msgstr "Скриптове"
 msgid "Netscape plugins"
 msgstr "Модули Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable 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 "Лесно превключване на функциите на уеб страниците"
+msgstr "Лесно разрешаване и забраняване на функции на уеб страниците"
 
-#: ../extensions/tab-panel.c:591
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Панел с раздели"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Панел с раздели"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Показване на разделите във вертикален панел"
 
@@ -2627,77 +2955,70 @@ msgstr "Само икони на разделите по подразбиран
 msgid "New tabs have no label by default"
 msgstr "Новите раздели са без заглавие по подразбиране"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 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:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Избиране на елементите, които ще се показват в лентата с инструменти. "
+"Елементите могат да бъдат преподредени с влачене и пускане."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Достъпни елементи"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Показване на елементите"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Настройване на лентата с инструменти…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Редактор на лентата с инструменти"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Лесно редактиране на оформлението на лентата с инструменти"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Кеширане на данните от HTTP комуникация на диска"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Неуспех при зареждането на бисквитки\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129
-#: ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Изчистване на личните данни"
 
-#: ../midori/midori-privatedata.c:134
-#: ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "Изчистване на личните данни"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Изчистване на следните данни:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Последните отворени раздели"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Изчистване на личните данни при затваряне на Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Запазване на потребителски имена и пароли"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Бисквитки и данни от уеб-сайтове"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Икони на уеб-сайтове"
 
@@ -2705,369 +3026,318 @@ msgstr "Икони на уеб-сайтове"
 msgid "Open tabs"
 msgstr "Отваряне на раздели"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Повече отворени раздели..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Не може да бъде изчистена историята: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Не могат да бъдат премахнати старите елементи от историята: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "Неуспех при свързването със старата база с данни"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "Не може да бъде внесено от стара база с данни"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "Не може да бъде отменено прехвърлянето"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "Не може да бъде изпратено"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Ð\9dе Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ\8aдаÑ\82 Ñ\81Ñ\8aздадено Ñ\82абло Ñ\81 Ð¾Ñ\82меÑ\82ки: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Ð\9dе Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ\8aде Ð´Ð¾Ð±Ð°Ð²ÐµÐ½Ð° Ð¾Ñ\82меÑ\82ка: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Ð\9dе Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ\8aде Ð²Ð½ÐµÑ\81ено Ð¾Ñ\82 Ñ\81Ñ\82аÑ\80а Ð±Ð°Ð·Ð° Ñ\81 Ð´Ð°Ð½Ð½Ð¸: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Ð\93Ñ\80еÑ\88ка Ð¿Ñ\80и Ð¾Ð±Ð½Ð¾Ð²Ñ\8fване Ð½Ð° Ð¾Ñ\82емÑ\82ка: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ð\9eÑ\82меÑ\82киÑ\82е Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ\82 Ð´Ð° Ð±Ñ\8aдаÑ\82 Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Ð\93Ñ\80еÑ\88ка Ð¿Ñ\80и Ð¸Ð·Ñ\82Ñ\80иване Ð½Ð° Ð¾Ñ\82емÑ\82ка: %s\n"
 
-#: ../midori/midori-session.c:199
-msgid "No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Не е достъпно администраторско удостоверение за файла. SSL сертификатите не могат да бъдат проверени."
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Не е достъпно администраторско удостоверение за файла. SSL сертификатите не "
+"могат да бъдат проверени."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Конфигурацията не може да бъде запазена. %s"
 
-#: ../midori/midori-session.c:390
-#: ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Сесията не можа да бъде заредена: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Сесията не може да бъде запазена. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
-msgstr "Съдържанието на кошчето не може дабъде запазено. %s"
+msgstr "Съдържанието на кошчето не може да бъде запазено. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
-msgid "Midori crashed the last time it was opened. You can report the problem at %s."
-msgstr "Midori даде грешка при последното отваряне. Може да докладвате проблема на %s."
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori даде грешка при последното отваряне. Може да докладвате проблема на "
+"%s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Промяна на предпочитанията"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Изключване на всички разширения"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
-msgstr "Показване на прозорец за действие при аварийно спиране на работата на Midori"
+msgstr ""
+"Показване на прозорец за действие при аварийно спиране на работата на Midori"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Затваряне на старите раздели"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Покажи информацията от последната грешка"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Стартирай отстраняване на грашката"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori е стартиране, но не отговаря.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Отметките не могат да бъдат заредени: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Сесията не можа да бъде заредена: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Не може да бъде заредено кошчето: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Не може да бъде заредена историята: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Открити са следните грешки:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "Пренебрегване"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL файлове: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Приемане"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Приемане за тази сесия"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Блокиране"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Неуспех при отварянето на база с данни: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Неуспех при изпълнението на отчета на база с данни: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Наистина ли искате да изтриете всички запазени бисквитки?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Изтриване на всички бисквитки ?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-msgid "This action will delete all cookie permissions. You will be asked for permissions again for each web site visited."
-msgstr "Това действие ще изтрие всички запазени бисквитки. Вие ще бъдете питани за потвърждение всеки път, когато посетите уеб сайт."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Това действие ще изтрие всички запазени бисквитки. Вие ще бъдете питани за "
+"потвърждение всеки път, когато посетите уеб сайт."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Управление на бисквитките"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Внасяне на текущите настройки в управлението на бисквитките"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Настройка на управлението на бисквитките"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
-msgid "Below is a list of all web sites and the policy set for them. You can delete policies by marking the entries and clicking on <i>Delete</i>.You can also add a policy for a domain manually by entering the domain below, choosing the policy and clicking on <i>Add</i>."
-msgstr "Отдолу е списъкът с всички уеб страници и техните правомощият. Вие можете да премахнете дадените права, като маркирате тези записи и кликнете на <i>Изтриване</i>.Вие също може да предоставите правомощия на домейн, като въведете ръчно избраните правомощия и кликнете на <i>Добавяне</i>."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Домейн"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Политика за сигурност"
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Отдолу е списъкът с всички уеб страници и техните правомощият. Вие можете да "
+"премахнете дадените права, като маркирате тези записи и кликнете на "
+"<i>Изтриване</i>.Вие също може да предоставите правомощия на домейн, като "
+"въведете ръчно избраните правомощия и кликнете на <i>Добавяне</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Ð\98зÑ\82Ñ\80иване Ð½Ð° Ð²Ñ\81иÑ\87ко"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "РеÑ\88ение Ð·Ð° Ð±Ð¸Ñ\81квиÑ\82ки Ð¾Ñ\82 Ð¸Ð·Ñ\82оÑ\87ниÑ\86и Ð½Ðµ Ð² Ñ\81пиÑ\81Ñ\8aка:list: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Питай за потвърждение, ако домейнът е непознат"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Питай за решение"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
-msgid "A fatal error occurred which prevents the cookie permission manager extension to continue. You should disable it."
-msgstr "Фатална грешка, което не позволява на разширението \"Управление на бисквитките\", за да продължи. Трябва да го изключите."
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"Фатална грешка, което не позволява на разширението \"Управление на "
+"бисквитките\", за да продължи. Трябва да го изключите."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
 msgstr "Грешка в разширението за управление на бисквитките"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Причина"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Не може да бъде създадена папка с конфигурацията на разширение: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Не може да бъде създадена папка с конфигурацията на разширението."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Неуспех при отварянето на базата с данни на разширението."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Не може да се създаде структура на базата данни на разширението."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
-msgstr "Не може да бъде определена глобалната политика за сигурност за домейн: %s"
+msgstr ""
+"Не може да бъде определена глобалната политика за сигурност за домейн: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "До края на сесията"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Уеб сайтът %s желае да запазите %d бисквитки."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Уеб сайтът %s желае да запазите бисквитката."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Множество сайтове желаят да запазите  %d бисквитки обединени."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "Разрешаване"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Разрешаване за тази сесия"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Отказване"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Откажи този път"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Път"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Стойност"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Срок на валидност"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Примерно разширение"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"Решение за ползване при източници, които не са единично настроени. Това още "
+"ще ограничи решенията за общите бисквити в настройките на Мидори."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Ð\9fÑ\80имеÑ\80но Ñ\80азÑ\88иÑ\80ение Ð½Ð° Midori Ð·Ð° Ñ\82ова Ñ\80азÑ\88иÑ\80ение"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "УпÑ\80авление Ð½Ð° Ð±Ð¸Ñ\81квиÑ\82киÑ\82e"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Ð\9fÑ\80имеÑ\80на Ð¿Ñ\80огÑ\80ама"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "УпÑ\80авление Ð½Ð° Ð±Ð¸Ñ\81квиÑ\82киÑ\82е Ð·Ð° Ñ\81айÑ\82а"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Примерното Midori разширение принадлежи към"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Неуспех при изтеглянето на иконата на приложението в %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Примерна база с данни"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Указател до примерна SQLite база данни, използвана от това разширение"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Провал при създаването на нов запусквател (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Ð\9fÑ\8aÑ\82 Ð´Ð¾ Ð±Ð°Ð·Ð° Ñ\81 Ð´Ð°Ð½Ð½Ð¸"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "СÑ\82аÑ\80Ñ\82еÑ\80Ñ\8aÑ\82 Ðµ Ñ\81Ñ\8aздаден"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Пътят към база данни SQLite например, използвани от това разширение"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Сега, Вие може да стартирате <b>%s</b> от стартера или менюто"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Ð\9fиÑ\82ай Ð¿Ñ\80и Ð½ÐµÐ¾Ð¿Ñ\80еделени Ð¿Ñ\80ава"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Ð\93Ñ\80еÑ\88ка Ð¿Ñ\80и Ñ\81Ñ\8aздаване Ð½Ð° Ñ\81Ñ\82аÑ\80Ñ\82еÑ\80"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid "If true this extension ask for policy for every unknown domain.If false this extension uses the global cookie policy set in Midori settings."
-msgstr "Ð\90ко Ð³Ð¾ Ñ\80азÑ\80еÑ\88иÑ\82е, Ñ\82ова Ñ\80азÑ\88иÑ\80ение Ñ\89е Ð¸Ñ\81ка Ð¿Ð¾Ñ\82вÑ\8aÑ\80ждение Ð¾Ñ\82 Ð²Ñ\81еки Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ\82 Ð´Ð¾Ð¼ÐµÐ¹Ð½. Ð\90ко Ð·Ð°Ð±Ñ\80аниÑ\82е Ñ\82ова Ñ\80азÑ\88иÑ\80ение Ñ\89е Ñ\81е Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð³Ð»Ð¾Ð±Ð°Ð»Ð½Ð°Ñ\82а Ð¿Ð¾Ð»Ð¸Ñ\82ика \"биÑ\81квиÑ\82ки\", Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð¾Ñ\82 Ð½Ð°Ñ\81Ñ\82Ñ\80ойкиÑ\82е Ð½Ð° Midori."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Ð\9fÑ\80огÑ\80ами"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Ð\9dеопÑ\80еделен"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Ð\9dов Ð¿Ñ\80оÑ\84ил"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "УпÑ\80авление Ð½Ð° Ð±Ð¸Ñ\81квиÑ\82киÑ\82e"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "СÑ\8aздаване Ð½Ð° Ð½Ð¾Ð², Ð½ÐµÐ·Ð°Ð²Ð¸Ñ\81им Ð¿Ñ\80оÑ\84ил Ð¸ Ñ\81Ñ\82аÑ\80Ñ\82еÑ\80"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "УпÑ\80авление Ð½Ð° Ð±Ð¸Ñ\81квиÑ\82киÑ\82е Ð·Ð° Ñ\81айÑ\82а"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Ð\9dово Ð¿Ñ\80иложение"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Програми"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Създаване на ново приложение за определен сайт"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Грешка при стартиране"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Създаване на стартер"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Управление на уеб приложенията"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Управлявай уебстраниците като приложения"
 
@@ -3075,1069 +3345,190 @@ msgstr "Управлявай уебстраниците като приложе
 msgid "Transfers"
 msgstr "Прехвърляния"
 
-#: ../extensions/transfers.vala:111
-#: ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Изчистване на всичко"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Провал при отварянето на изтеглянето: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Отваряне на местоположението на папката"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Копиране на адреса на връзката"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Файлът '<b>%s</b>' е свален."
+msgstr "Файлът '<b>%s</b>' беше свален."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' и %d други файлове са били свалени."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Прехвърлянето приключи"
 
-#: ../extensions/transfers.vala:463
-#: ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Няколко файла бяха свалени"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "Затваряне на Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Прехвърлянията ще бъдат отменени, ако Midori бъде затворен."
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Управление на трансферите"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Показване на свалените файлове"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Отваряне на избраното със среден бутон"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Зареждане на избраният адрес със среден бутон на мишката"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "Не може да бъде получен пътят до настройките на разширението: пътят е НУЛА"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Не може да бъде получен пътят до настройките на разширението."
-
-#~ msgid "Writing failed."
-#~ msgstr "Грешка при запис."
-
-#~ msgid "_Window"
-#~ msgstr "Прозорец"
-
-#~ msgid "Custom..."
-#~ msgstr "Потребителска…"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Как да се идентифицират като уеб страници"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Превъртане по инерция"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Дали превъртането по инерция трябва да става според скоростта?"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ"
-
-#~ msgid "FILENAME"
-#~ msgstr "ФАЙЛ"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Добавить кнопку запуска на _рабочий стол"
-
-#~ 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 "Действия, выполняемые при запуске Midori"
-
-#~ msgid "The homepage"
-#~ 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 ""
-#~ "Включить поддержку локального хранилища (localStorage) стандарта 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 "Highlight Matches"
-#~ msgstr "Подсветить совпадения"
-
-#~ 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 "Not available: %s"
-#~ msgstr "Недоступно: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Файлы ресурсов не установлены"
-
-#~ msgid "No filename specified"
-#~ msgstr "Имя файла не задано"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Установить количество закладок"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Введите число столбцов и строк:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Проверьте правильность ввода"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Размер миниатюр:"
-
-#~ msgid "Small"
-#~ msgstr "Маленький"
-
-#~ msgid "Medium"
-#~ msgstr "Средний"
-
-#~ msgid "Big"
-#~ msgstr "Большой"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Не удалось выполнить запрос к базе данных\n"
-
-#~ msgid "All cookies"
-#~ msgstr "Все"
-
-#~ msgid "Session cookies"
-#~ msgstr "С информацией о сеансе"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Показать панель передач"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Показывать панель передач"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Показывать средства поиска при автодополнении адреса"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Показывать средства поиска при вводе текста в адресную строку"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Показать элементы управления панелью"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Показывать элементы управления панелью"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Показывать панель быстрого набора в новых вкладках"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Показывать панель быстрого набора в только что открытых вкладках"
-
-#~ msgid "Download Manager"
-#~ msgstr "Менеджер загрузок"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Открывать внешние страницы в:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Расположение сторонних страниц при открытии"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Разрешённый тип фрагментов данных"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Хранить фрагменты данных"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Хранить историю за последние"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Запоминать последние загруженные файлы"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Сохранять историю последних загрузок"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Страница не найдена — %s"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Загрузить с помощью _менеджера загрузок"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Не удалось отобразить документ"
-
-#~ msgid "General"
-#~ msgstr "Общие"
-
-#~ msgid "Appearance"
-#~ msgstr "Внешний вид"
-
-#~ msgid "Font settings"
-#~ msgstr "Настройки шрифта"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Всегда использовать разрешение 96 точек на дюйм"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Принудительно использовать разрешение 96 точек на дюйм"
-
-#~ msgid "Interface"
-#~ msgstr "Интерфейс"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Панель навигации"
-
-#~ msgid "External applications"
-#~ msgstr "Внешние приложения"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Фрагменты данных"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Удалять фрагменты данных при закрытии Midori"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Удалять старые фрагменты данных через час"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Удалять старые фрагменты данных через неделю"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Удалять старые фрагменты данных через год"
-
-#~ msgid "days"
-#~ msgstr "дней"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s из %s, %s/s"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "_Настроить рекламные фильтры…"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Открыть папку с выбранным дополнением"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Следующая вкладка (история вкладок)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Предыдущая вкладка (история вкладок)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Предыдущая вкладка из истории"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Переключение вкладок по Ctrl-Tab в порядке времени последнего "
-#~ "использования"
-
-#~ msgid "Pageholder"
-#~ msgstr "Контейнер"
-
-#~ msgid "_Pageholder"
-#~ msgstr "К_онтейнер"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Дополнительная область для просмотра страниц"
-
-#~ msgid "Quit the application"
-#~ msgstr "Выйти из программы"
-
-#~ msgid "_Contents"
-#~ msgstr "_Содержание"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Документация"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Сохранить объект"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Загрузить объект"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% загружено"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Показать вкладку передачи"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Показывать прогресс загрузки страницы в адресной строке"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Запрашивать папку для загрузок"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Запрашивать конечную папку для каждого файла"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Показывать уведомление по окончании передачи файлов"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Загрузить _изображение"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Не удалось очистить журнал поисковых запросов: %s\n"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "С_вернуть текущую вкладку"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Свернуть текущую вкладку"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Отсоединить выбранную панель от главного окна"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Скрыть элементы управления"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Проверка орфографии"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Список языков для проверки орфографии через запятую, например, «en_US,ru»"
-
-#~ msgid "External Applications"
-#~ msgstr "Внешние приложения"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Ассоциация ссылок с внешними командами"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Словари:"
-
-#~ msgid "Console"
-#~ msgstr "Консоль"
-
-#~ msgid "Copy _All"
-#~ msgstr "Копировать все"
-
-#~ msgid "Copy All"
-#~ msgstr "Копировать все"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Менеджер _фрагментов данных"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Недавно посещённые страницы"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Открывать страницы, посещённые ранее"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Только оригинальные фрагменты данных"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Запоминать посещённые страницы"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Сохранять историю последних посещений"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Автоматически обнаруживать прокси-сервер"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Брать данные о прокси-сервере из переменных окружения"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "Во_сстановить вкладку"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Свернуть вкладку"
-
-#~ msgid "Erroneous clock time"
-#~ msgstr "Некорректное время"
-
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Дата находится в прошлом. Проверьте системное время."
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Скопировать %s в папку %s."
-
-#~ msgid "New tabs open minimized"
-#~ msgstr "Новые закладки открываются свёрнутыми"
-
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Установить число закладок"
-
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Введите число закладок:"
-
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Установленными считаются пользовательские сценарии, расположенные в «%s» "
-#~ "и стили, расположенные в «%s»."
-
-#~ msgid "Open _Link"
-#~ msgstr "_Открыть ссылку"
-
-#~ msgid "Not available on this platform"
-#~ msgstr "Недоступно для данной платформы"
-
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Не удалось получить текущее время: %s\n"
-
-#~ msgid "Show panel _titles"
-#~ msgstr "_Заголовки панелей"
-
-#~ msgid "Options"
-#~ msgstr "Настройки"
-
-#~ msgid "View Selection Source"
-#~ msgstr "Исходный код выделенного фрагмента"
-
-#~ msgid "View the source code of the selection"
-#~ msgstr "Просмотр исходного кода выделенного фрагмента"
-
-#~ msgid "Enable developer tools"
-#~ msgstr "Включить средства разработчика"
-
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Включить особые расширения для разработчиков"
-
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Упреждающие запросы DNS при наведении на ссылки"
-
-#~ msgid "Shrink images automatically"
-#~ msgstr "Масштабировать изображения автоматически"
-
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Автоматически уменьшать отдельные изображения по размеру экрана"
-
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Цветные вкладки"
-
-#~ msgid "Remember last form inputs"
-#~ msgstr "Запоминать введённые в формы данные"
-
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Сохранять последние введённые данные в формы ввода"
-
-#~ msgid "Cache size"
-#~ msgstr "Размер кэша"
-
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Разрешённый размер кэша"
-
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Кодировка символов, которая будет использоваться по умолчанию"
-
-#~ msgid "Encoding"
-#~ msgstr "Кодировка"
-
-#~ msgid "Resizable text areas"
-#~ msgstr "Изменяемый размер текстовых полей"
-
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Текстовые поля могут изменять размер"
-
-#~ msgid "Both"
-#~ msgstr "Значки и текст"
-
-#~ msgid "Both horizontal"
-#~ msgstr "Значки и текст горизонтально"
-
-#~ msgid "Load on Startup"
-#~ msgstr "Загружать при запуске"
-
-#~ msgid "Configure _Toolbar…"
-#~ msgstr "Настроить панель _инструментов…"
-
-#~ msgid "Enable"
-#~ msgstr "Включить"
-
-#~ msgid "_Disable"
-#~ msgstr "_Отключить"
-
-#~ msgid "Disable"
-#~ msgstr "Отключить"
-
-#~ msgid "%d days ago"
-#~ msgstr "%d дней назад"
-
-#~ msgid "_Quick Find"
-#~ msgstr "_Быстрый поиск"
-
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Перейти на слово или фразу"
-
-#~ msgid "Add to customized _homepage"
-#~ msgstr "До_бавить в визуальные закладки"
-
-#~ msgid "Search"
-#~ msgstr "Найти"
-
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Внимание: используется учётная запись суперпользователя!"
-
-#~ msgid "P_lugins"
-#~ msgstr "_Модули"
-
-#~ msgid "Plugins"
-#~ msgstr "Модули"
-
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s не обладает свойством «%s»"
-
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s не может быть назначен для %s.%s"
-
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s недоступен"
-
-#~ msgid ""
-#~ "<b>Host: %s</b>\n"
-#~ "Path: %s\n"
-#~ "Secure: %s\n"
-#~ "Name: %s\n"
-#~ "Value: %s"
-#~ msgstr ""
-#~ "<b>Узел: %s</b>\n"
-#~ "Путь: %s\n"
-#~ "Защищённый: %s\n"
-#~ "Имя: %s\n"
-#~ "Значение: %s"
-
-#~ msgid "Source"
-#~ msgstr "Исходный код"
-
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Значок (имя или файл):"
-
-#~ msgid "URIs"
-#~ msgstr "Идентификаторы URI"
-
-#~ msgid "[URIs]"
-#~ msgstr "[Идентификаторы URI]"
-
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
-#~ msgid "Root"
-#~ msgstr "Root"
-
-#~ msgid "HTTP Proxy"
-#~ msgstr "HTTP-прокси"
-
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "Открыть URL в новой _вкладке"
-
-#~ msgid "Enforce 96 DPI"
-#~ msgstr "Всегда использовать 96 DPI"
-
-#~ msgid "Manage search engines"
-#~ msgstr "Управление средствами поиска"
-
-#~ msgid "Open in Page_holder…"
-#~ msgstr "Открыть в _контейнере…"
-
-#~ msgid "Last pageholder URI"
-#~ msgstr "Текущий индекс URI"
-
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "Последняя открытая ссылка в хранилище"
-
-#~ msgid "_Fullscreen"
-#~ msgstr "Полноэкранный режим"
-
-#~ msgid "_Leave Fullscreen"
-#~ msgstr "Выйти из полноэкранного режима"
-
-#~ msgid "Settings"
-#~ msgstr "Установки"
-
-#~ msgid "Trash"
-#~ msgstr "Корзина"
-
-#~ msgid "The trash, collecting recently closed tabs and windows"
-#~ msgstr "Корзина. Сохраняет закрытые вкладки и окна"
-
-#~ msgid "The list of search engines"
-#~ msgstr "Список средств поиска"
-
-#~ msgid "Browser"
-#~ msgstr "Обозреватель"
-
-#~ msgid "The current browser"
-#~ msgstr "Данный браузер"
-
-#~ msgid "Kind"
-#~ msgstr "Тип"
-
-#~ msgid "The kind of addons"
-#~ msgstr "Тип дополнения"
-
-#~ msgid "The navigationbar"
-#~ msgstr "Панель навигации"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Провал при обновяването на базата данни: %s"
 
-#~ msgid "URI"
-#~ msgstr "URI"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Провал при избирането от базата данни: %s"
 
-#~ msgid "The current URI"
-#~ msgstr "Данная URI"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Провал при внасянето от предишния път: %s"
 
-#~ msgid "Tab"
-#~ msgstr "Вкладка"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Тъмни райета"
 
-#~ msgid "The current tab"
-#~ msgstr "Данная вкладка"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Управление на подпрозорец"
 
-#~ msgid "The statusbar"
-#~ msgstr "Панель состояния"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Флумини"
 
-#~ msgid "The list of search engines to be used for web search"
-#~ msgstr "Список средств поиска используемые для поиска в сети"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr "Това разширение доставя ред за обновления и повтарящи се събития."
 
-#~ msgid "Open the selected bookmark in a new tab"
-#~ msgstr "Открыть выбранные закладки в новых вкладках"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Провал при добавянето на нова бележка към база данни: %s\n"
 
-#~ msgid "Open the selected bookmark in a new window"
-#~ msgstr "Открыть выбранные закладки в новом окне"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Провал при махането на бележка от база данни: %s\n"
 
-#~ msgid "Shadow Type"
-#~ msgstr "Тип тени"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Провал при преименуването на бележката: %s\n"
 
-#~ msgid "Appearance of the shadow around each panel"
-#~ msgstr "Внешний вид тени вокруг панели"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Провал при обновяването на бележката: %s\n"
 
-#~ msgid "Menu to hold panel items"
-#~ msgstr "Управление содержимым панелей"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Бележки"
 
-#~ msgid "Show New Tab"
-#~ msgstr "Показать новую вкладку"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Нова бележка"
 
-#~ msgid "Show the New Tab button in the toolbar"
-#~ msgstr "Показать кнопку Новая Вкладка в панели инструментов"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Създай празна нова бележка, несвързани с отворените страници"
 
-#~ msgid "Show Web search"
-#~ msgstr "Показать поиск"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Нова бележка"
 
-#~ msgid "Show the Web search entry in the toolbar"
-#~ msgstr "Показывать запись сетевого поиска в панели инструментов"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Провал при избирането от базата дани бележки: %s\n"
 
-#~ msgid "Load Finished"
-#~ msgstr "Загрузка завершена"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Преименуване на бележка"
 
-#~ msgid "The URI of the currently loaded page"
-#~ msgstr "URI загруженной страницы"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Препиши бележката в паметта"
 
-#~ msgid "The title of the currently loaded page"
-#~ msgstr "Заголовок загруженной страницы"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Премахни бележка"
 
-#~ msgid "The current loading status"
-#~ msgstr "Статус загрузки"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Препиши избраното като бележката"
 
-#~ msgid "The current loading progress"
-#~ msgstr "Процесс загрузки"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Запиши текстови отрязъци от страниците като бележка"
 
-#~ msgid "Dialog"
-#~ msgstr "Диалог"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Блокиране на реклами"
 
-#~ msgid "A dialog to manage search engines"
-#~ msgstr "Диалог управления средствами поиска"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Блокиране на реклами от списъка с филтрите"
 
-#~ msgid "Icon size"
-#~ msgstr "Размер значков"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Настройки на филтрите за реклами"
 
-#~ msgid "The name of an icon containing animation frames"
-#~ msgstr "Имя иконки содержащей анимационные рамки"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Блокиране на изображение"
 
-#~ msgid "The name of an icon to be used as the static image"
-#~ msgstr "Имя иконки для статичного изобрадения"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Блокиране на връзка"
 
-#~ msgid "The descriptive text of the item"
-#~ msgstr "Описание пункта"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Правила за редактиране"
 
-#~ msgid "Token"
-#~ msgstr "Признак"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "Правило:"
diff --git a/po/bn.po b/po/bn.po
new file mode 100644 (file)
index 0000000..7ae1e15
--- /dev/null
+++ b/po/bn.po
@@ -0,0 +1,3426 @@
+# Bengali translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-07-08 05:52+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Bengali <bn@li.org>\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-Launchpad-Export-Date: 2014-11-26 05:59+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Jigesh Korona https://launchpad.net/~jigeshkorona\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/bs.po b/po/bs.po
new file mode 100644 (file)
index 0000000..384c7d0
--- /dev/null
+++ b/po/bs.po
@@ -0,0 +1,3494 @@
+# Bosnian translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-08 07:35+0000\n"
+"Last-Translator: aleksandar-todorovic <aleksandar.todorovic@mail.ru>\n"
+"Language-Team: Bosnian <bs@li.org>\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-Launchpad-Export-Date: 2014-12-09 05:52+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Internet preglednik"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori internet pregledač"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Pretražuj Internet"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW,Eksplorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Novi tab"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Novi prozor"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Novi prozor privatnog pregledanja"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori privatno pregledanje"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privatno pregledanje"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Otvori novi prozor za privatno pregledanje"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Slika sačuvana u: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Otvori ADRESU kao internet aplikaciju"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRESA"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Koristi DIREKTORIJ kao konfiguracijski direktorij"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "DIREKTORIJ"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Privatno pretraživanje, promjene nisu sačuvane"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Prenosni mod, sve datoteke su smeštene na jednome mestu"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Čist GTK+ prozor sa WebKit-om, sličan GtkLauncher-u"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Prikaži dijagnostički dijalog"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Pokreni unutar gdb-a i sačuvaj zapis pri rušenju"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Pokreni određeni fajl kao javaskriptu"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Uslikaj određeni URL"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Izvrši zadatu naredbu"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Lista dostupnih naredbi koje se izvršavaju sa -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Prikaži verziju programa"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adrese"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blokiraj URI po regularnom OBRASCU izraza"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "OBRAZAC"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Restartuj Midori nakon SEKUNDE sekundi neaktivnosti"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKUNDE"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Greška: \"gdb\" nije pronađen\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Molimo da ostavite vaše komentare, sugestije i bagove na:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Pogledaj postoji li nova verzija na:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Došlo je do nepoznate greške"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bookmarkovi"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Dodaj Boo_kmark"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Ekstenzije"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Istorija"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Korisničke _skripte"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Korisnički s_tilovi"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Novi _tab"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Transferi"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape _dodaci"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Zatvoreni tabovi"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Novi _prozor"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Novi _direktorij"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adrese]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Datoteka nije pronađena."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Dokument sa greškom"
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Nije prepoznat format za bookmarkove."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Idi na sledjeću stranicu"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Idi na sledjeću pod-stranicu"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Pretraživanje interneta..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Ponovo učitaj trenutnu stranicu"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Zaustavi učitavanje trenutne stranice"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Nije uspjelo ažuriranje naslova: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Vrijednost '%s' nije važeća za %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Nije očekivana postavka '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Nije očekivana akcija '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Privatno pretraživanje)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Nije uspjelo unošenje nove stavke u istoriju: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Označi [tekst]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bookmarkovi"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Novi direktorij"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Uredi direktorij"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Novi bookmark"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Uredi bookmark"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+"Unesite naziv za ovaj bookmark i izaberite gdje želite da ga sačuvate."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Unesite naziv za ovaj direktorij i izaberite gdje želite da ga sačuovate"
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Prikaži u bookmark _liniji"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Dodaj u _Brzo biranje"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Sačuvaj datoteku kao"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Sačuvaj povezane _resurse"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Novi prozor je otvoren"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Novi tab je otvoren"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Greška prilikom otvaranja slike!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Nije moguće otvoriti izabranu sliku u podrazumijevanom pregledaču."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Greška prilikom preuzimanja slike!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Nije moguće preuzeti izabranu sliku."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Sačuvaj datoteku"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Ponovo učitaj stranicu bez keširanja"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: ../midori/midori-browser.c:2692
+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 ""
+"Da koristite URI iznad otvorite agregator vijesti. Obično ćete tu pronaći "
+"meni ili dugme \"Nova supskripcija\", \"Novi feed vijesti\" ili slično.\n"
+"Ukoliko to ne uspije, otvorite Podešavanja, Aplikacije u Midoriju i "
+"izaberite Agregator vijesti. Sledjeći put kada kliknete na ikonu feeda "
+"vijesti, feed će se dodati automatski."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Novi feed"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Dodaj novi bookmark"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Prazno"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Izaberite sledjeću navigaciju kursora"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Pritiskanje tipke F7 će uključiti Caret Browsing. Kada je aktivno, "
+"tekstualni kursor će biti prikazan na svakoj web stranici."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Omogući Caret Browsing"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Otvori sve u _tabovima"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Otvori u novom _prozoru"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Uvezi bookmarkove..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Uvezi bookmarkove"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Aplikacija:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Uvezi iz XBEL ili HTML datoteke"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Uvezi iz datoteke"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Uvoženje bookmarkova nije uspjelo"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL bookmarkovi"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Netscape bookmarkovi"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+"Midori može da eksportuje samo u XBEL (*.xbel) i Netscape (*.html) formatu"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Greška prilikom eksportovanja bookmarkova"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Jednostavan web pretraživač."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Otvorite about:version da pregledate informacije o verziji."
+
+#: ../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 ""
+"Ova biblioteka spada u slobodan softver. Možete da je redistribuirate i/ili "
+"uređujete pod uslovima iz GNU Lesser General Public licence koju je objavila "
+"Fondacija slobodnog softvera. Ovime pristajete na 2.1 ili (na vaš izbor) "
+"noviju verziju licence."
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Bojan Malinović https://launchpad.net/~85malina\n"
+"  Stefan Ivanović https://launchpad.net/~sivanovic12345\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  aleksandar-todorovic https://launchpad.net/~aleksandar-todorovic"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicirajte trenutni tab"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Otvori u novom prozoru"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Otvori u novom tabu"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Novi _privatni prozor"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Otvori datoteku"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Sačuvaj stranicu kao..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Sačuvaj u datoteku"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Dodaj u brzo _biranje"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Pretplatite se na _feed vijesti"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Zatvori tab"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Zatvori trenutni tab"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "Z_atvori prozor"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Odštampaj trenutnu stranicu"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Zatvori _sve prozore"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Pronađi..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Pronađi riječ ili frazu na stranici"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Pronađi _sledjeće"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Pronađi _prethodno"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Konfiguriši podešavanja za aplikaciju"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Pregledaj"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Toolbarovi"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Povećaj zoom nivo"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Smanji zoom nivo"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Enkodiranje"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Pregledaj _izvor"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Pregledaj _DOM izvor"
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Ca_ret Browsing"
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Uključite/isključite prikaz preko čitavog ekrana"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Pomjeru u_lijevo"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Pomjeri prema dole"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Pomjeri prema gore"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Pomjeri u_desno"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Čitljivo"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Idi"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Idi nazad na prethodnu stranicu"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Idi na prethodnu pod-stranicu"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Sledjeće ili Naprijed"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Idi na sledjeću pod-stranicu ili na sledjeću stranicu u istoriji"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Početna stranica"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Idi na početnu stranicu"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Isprazni smeće"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Poništi _zatvaranje taba"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Dodaj novi direktorij"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Uvezi bookmarkove..."
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Eksportuj bookmarkove..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Izaberite podrazumijevane pretraživače..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Izbrišite privatne podatke..."
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "_Pregledajte stranicu"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Prethodni tab"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Sledjeći tab"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Premjesti tab na _prvu poziciju"
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "Premjesti tab u_nazad"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "_Premjesti tab unaprijed"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Premjesti tab na _zadnju poziciju"
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "Fokusiraj _trenutni tab"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Fokusiraj _sledjeći prikaz"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "Prikaži samo ikonu _trenutnog taba"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Zatvori _ostale tabove"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "Otvori prethodnu _sesiju"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Često postavljena pitanja"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_Prijavi problem..."
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Alati"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Meni bar"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "Bar za _navigaciju"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "_Panel sa strane"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Panel sa strane"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "Bar sa _bookmarkovima"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "_Status bar"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automatski"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Kineski tradicionalni (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Kineski pojednostavljeni (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanski (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Korejski (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Ruski (K0I8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unikod (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Zapadni (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Prilagođeno..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Nije moguće inicijalizovati istoriju: %s"
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Lokacija..."
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Otvori specifičnu lokaciju"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_Web pretraživanje..."
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Pokreni web pretraživanje"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Ponovo otvori prethodno zatvorene tabove ili prozore"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Pokaži sačuvane bookmarkove"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tabovi"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Prikaži listu svih otvorenih tabova"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Meni"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Meni"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr "Nije moguće učitati konfiguraciju ekstenzije '%s': %s\n"
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Nije moguće sačuvati konfiguraciju ekstenzije '%s': %s\n"
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "Eksportuj certifikate"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Nije prepoznat autoritet za potpisivanje certifikata"
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Certifikat se ne slaže sa pretpostavljenim identitetom stranice od koje ga "
+"je primio."
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Vrijeme za aktivaciju certifikata je u budućnosti."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Certifikat je istekao"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algoritam za certifikat se smatra nesigurnim."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+"Došlo je do neke druge greške prilikom ispitivanja validnosti certifikata."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Eksportuj certifikate"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Samo-potpisan"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Detalji o sigurnosti"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr "Nalijepi i _nastavi dalje"
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Nije verifikovano"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Verifikovana i enkriptovana konekcija"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Otvori ne-enkriptovanu konekciju"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Poredaj panele sa strane udesno"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Zatvori panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Poredaj panele sa strane ulijevo"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Prikaži brzo biranje"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Prikaži početnu stranicu"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Prikaži zadnje otvorene tabove"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Prikaži zadne tabove bez učitavanja"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Prikaži praznu stranicu"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Prikaži podrazumijevani pretraživač"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Prikaži neku drugu stranicu"
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japanski (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Novi tab"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Novi prozor"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Trenutni tab"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Podrazumijevano"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikone"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Male ikone"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Tekst"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Ikone i tekst"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Tekst pored ikona"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatski (GNOME ili okruženje)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "HTTP server za proksi"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "Nema proksi servera"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Stil toolbara"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Uvijek koristi moje izbore za font"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+"Obori fontove izabrane od web stranica sa onima iz podešavanja korisnika"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Nije moguće učitati konfiguraciju: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Nevažeća konfiguracijska vrijednost '%s'"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Nije uspjelo unošenje stylesheet-a: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Prikaži _naslov taba"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Prikaži samo ikonu"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Zatvori tab u_desno"
+msgstr[1] "Zatvori tabove u_desno"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Zatvori os_tali tab"
+msgstr[1] "Zatvori os_tale tabove"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Vjeruj ovoj web stranici"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Sigurnost nepoznata"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s želi da sačuva HTML5 bazu podataka."
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Odbij"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Prihvati"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s želi da zna vašu lokaciju."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' nije pronađeno"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Stranica '%s' ne može biti učitana:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Pregledajte adresu za greške pri unosu"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Uvjerite se da je eternet kabal priključen ili da je vaša WiFi kartica "
+"aktivirana"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Uvjerite se da su podešavanja vaše mreže ispravna"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Pokušaj ponovo"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Ups - %s"
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Nešto je pošlo po zlu sa '%s'."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Pokušaj ponovo"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Pošalji poruku prema %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Dodaj _pretraživač"
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Otvori _link"
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Otvori link u novom _tabu"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Otvori link u _foreground tabu"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Otvori link u _background tabu"
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Otvori link u novom _prozoru"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Kopiraj link de_stinacije"
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Sačuvaj _kao..."
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Otvori _sliku u novom prozoru"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Otvori _sliku u novom tabu"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Kopiraj sl_iku"
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Sačuvaj s_liku"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Otvori u _pregledaču fotografija"
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopiraj _adresu videa"
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Preuzmi _video"
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otvori adresu u novom _tabu"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Pretraži _sa"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Pretraži internet"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Otvori _frame u novom tabu"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Pretraži _element"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Otvori ili preuzmi datoteku iz %s"
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Ime datoteke: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tip datoteke: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tip datoteke: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Veličina: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Otvori %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspektuj stranicu - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori ne čuva nikakve lične podatke:"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Istorija ili cookie-i neće bitii sačuvani."
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Ekstenzije nisu omogućene."
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"HTML5 spremanje, lokalne baze podataka i kešovi od aplikacija nisu omogućeni."
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori sprječava web stranice da prate korisnike:"
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS prefetching nije mogućen."
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Jezik i vremenska zona nisu dijeljeni sa web stranicama."
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+"Flash i ostali Netscape dodaci se ne mogu prikazati kao lista od strane web "
+"stranica."
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+"Brojevi verzije pod navodnicima prikazu verziju korišćenu prilikom "
+"pokretanja."
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Učitavanje stranice se odužilo:"
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"Učitavanje se odužilo ili zbog nedavnog krešovanja ili podešavanja prilikom "
+"pokretanja."
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Učitaj stranicu"
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Prazna stranica"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "prethodno"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "sledjeće"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Štampaj pozadinske slike"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Da li treba štampati pozadinske slike"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Svojstva"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s od %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sati"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuta"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekundi"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " Preostaje %s"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Preuzeta datoteka ima grešaka."
+
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Checksum koji je provajdiran od strane linka se ne slaže. Ovo znači da je "
+"datoteka nekompletna ili da je uređena naknadno."
+
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Datoteka \"%s\" se ne može sačuvati u ovom direktoriju."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Nemate prava pristupa da pišete na ovoj lokaciji."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Nema dovoljno prostora za preuzimanje \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Datoteka treba %s ali imate slobodno samo %s."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Brzo biranje"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Kliknite da dodate prečicu"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Unesite adresu prečice"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Unesite naslov prečice"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Da li ste sigurni da želite da izbrišete ovu prečicu?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Pokretanje"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Kada se Midori pokrene:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Početna stranica"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Prikaži _trenutnu stranicu"
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Koristi trenutnu stranicu kao početnu"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Fontovi"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Proporcionalna porodica fontova"
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Podrazumijevana porodica fontova korišćena za prikazivanje teksta"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Podrazumijevana veličina fonta za prikazivanje teksta"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Minimalna veličina fonta"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Minimalna veličina fonta korišćena za prikaz teksta"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Preferirano enkodiranje"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Ponašanje"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Učitaj slike automatski"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Omogući provjeru pravopisa"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Omogući skripte"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Omogući WebGL podršku"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoomiraj tekst i slike"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Omogući skriptama da otvore popup prozore"
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Da li je skriptama dozvoljeno da otvaraju popup prozore automatski"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Podrazumijevani nivo zooma"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Inicijalni faktor za povećavanje novootvorenih tabova za"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Preferirani jezici"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Sačuvaj preuzete datoteke u:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Pretraživanje"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Stil toolbara:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Otvori nove stranice u:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Ponašanje novog taba:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Zatvori dugmad na tabovima"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Otvara tabove pored trenutnog"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Da li da se novi tabovi otvaraju pored trenutnog ili poslije zadnjeg taba"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Otvara tabove u pozadini"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Editor teksta"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Agregator vijesti"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Mreža"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proksi server"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Podržani tipovi proksija:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Web keš"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Maksimalna veličina keširanih stranica na disku"
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identitet kao"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privatnost"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Izbriši stare cookie datoteke poslije:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Maksimalan broj dana koliko se čuvaju cookie datoteke"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Samo prihvati cookie datoteke od stranica koje posjećujete"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokiraj cookie datoteke poslane od strane trećih strana"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Kolačići čuvaju login podatke, sačuvane igre ili korisničke profile za "
+"reklamne namjene"
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Omogući oflajn keš web aplikacija"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Omogući HTML5 podršku za lokalno spremanje"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Briše informacije o tome odakle posjećuje web stranicu"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Briši web stranice iz istorije nakon:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Maksimalan broj dana koliko se čuva istorija"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Dodaci"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Upravljač internet pretražiteljima"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Dodaj internet pretražitelja"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Uredi internet pretražitelja"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Opis:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresa:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Token"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Upravljanje internet pretražiteljima"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Koristi kao _podrazumijevani"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Internet pretražitelji ne mogu biti učitani. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Internet pretraživače nije moguće sačuvati. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bookmarkovi i istorija"
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Pretraži za %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Nije uspjelo označavanje iz istorije: %s"
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Pretraži pomoću..."
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Pretraži pomoću %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Otvori pomoću"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Izaberi aplikaciju ili komandu za otvaranje \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Nije moguće pokrenuti eksterni program"
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI nije validan"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Potraži unutar nilije"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Prethodno"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Sljedeće"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Zatvori bar za traženje"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d bookmark"
+msgstr[1] "%d bookmarka"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d pod-direktorij"
+msgstr[1] "%d pod-direktorija"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Prazan direktorij"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Direktorij sadrži %s i nema bookmarkova"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Direktorij sadrži %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Direktorij sadrži %s i %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bookmark vodi ka: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s i nema bookmarkova"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s i %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Uredi izabrani bookmark"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Izbriši izabrani bookmark"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Dodaj novi direktorij"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Separator</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otvori u novom _tabu"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Pretraži bookmarkove"
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Istorija"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Danas"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Juče"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Prije %d dana"
+msgstr[1] "Prije %d dana"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "Prije 7 dana"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nije uspjelo brisanje stavke iz istorije: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "Da li ste sigurni da želite da izbrišete kompletnu istoriju?"
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Bookmarkuj izabranu stavku iz istorije"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Izbriši izabranu stavku iz istorije"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Izbriši kompletnu istoriju"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Pretraži istoriju"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Potrebna je autentifikacija"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"Potrebno je da unesete vaše korisničko ime\n"
+"i šifru da biste otvorili ovu lokaciju:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Korisničko ime:"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Šifra:"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Sačuvaj šifru"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ništa"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "Vrijednost '%s' nije validna za %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Izaberi datoteku"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Izaberi direktorij"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 sat"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 dan"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 sedmica"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 mjesec"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 godina"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Podešavanja za %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5 otisak"
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1 otisak"
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Izgleda da ova stranica sadrži korisničku skriptu. Da li želite da je "
+"instalirate?"
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Instaliraj korisničku skriptu"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+"Izgleda da ova stranica sadrži korisnički stil prikaza. Da li želite da ga "
+"instalirate?"
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr "_Instaliraj korisnički stil prikaza"
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Nemoj instalirati"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Korisničke skripte"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Korisnički stilovi"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Greška"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Da li želite da izbrišete '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Izbriši korisničku skriptu"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Izbriši korisnički stil"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file <b>%s</b> will be permanently deleted."
+msgstr "Datoteka <b>%s</b> će biti trajno izbrisana."
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr "Otvori u editoru teksta"
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr "Otvori ciljani direktorij"
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr "Instaliraj novi dodatak"
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr "Izbriši izabrani dodatak"
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr "Korisnički dodaci"
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Nije moguće paziti na direktorij '%s': %s"
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr "Podrška za korisničke skripte i stilove"
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Tabovi u boji"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Oboji svaki tab upečatljivo"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Menadžer cookiejima"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Izbriši sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Briše sve prikazane cookieje. Ukoliko je postavljen filter, brišu se samo "
+"rezultati filtera."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Proširi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Skupi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Da li ste sigurni da želite da izbrišete sve cookieje?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Pitanje"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Samo cookieji koji se slažu sa filterom će biti izbrisani."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr "Na kraju sesije"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Host</b>: %s\n"
+"<b>Ime</b>: %s\n"
+"<b>Vrijednost</b>: %s\n"
+"<b>Putanja</b>: %s\n"
+"<b>Sigurnost</b>: %s\n"
+"<b>Ističe</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Da"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Ne"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Ime"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Proširi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Skupi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Pretraži cookieje po imenu ili domeni"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "Prelistaj, pregledaj i izbriši cookieje"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr "Kopiraj _adresu taba"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Kopiraj adrese tabova"
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr "Kopiraj adrese svih tabova u clipboard"
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Učitavanje sa zakašnjenjem"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Odlaže učitavanje stranice dok ne počnete da koristite taj tab."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dupli klik za više informacija"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Ova ekstenzija pokazuje glib greške u tray-u"
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Došlo je do greške pri pokušaju da se preuzme datoteka sa sledjećim "
+"dodatkom:\n"
+"%s\n"
+"\n"
+"Greška:\n"
+"%s\n"
+"\n"
+"Nastavite bez ovog dodatka."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Eksterni menadžer preuzimanjima - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Preuzimaj datoteke sa Aria2 menadžerom"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Eksterni menadžer preuzimanjima - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Preuzimaj datoteke sa SteadyFlow menadžerom"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Komanda:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Preuzmi datoteke sa \"%s\" ili korisničkom komandom"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Eksterni menadžer preuzimanjima - Komandna linija"
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+"Greška prilikom pronalaženja Atom \"entry\" elemenata u XML podacima."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr "Greška prilikom pronalaženja Atom \"feed\" elemenata u XML podacima."
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "FeedZadnji put uređen: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Feedovi"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Dodaj novi feed"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Izbriši feed"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Feedovi"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Nije uspjelo pronalaženje root elementa u XML podacima feeda."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Nije podržan format feeda."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Nije uspjelo raščlanjivanje XML feeda: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Nije uspjelo pronalaženje \"channel\" elementa u XML podacima RSS-a."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Pronađena nepodržana verzija RSS-a."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Nije uspjelo pronalaženje RSS \"item\" elemenata u XML podacima."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Nije uspjelo pronalaženje RSS \"channel\" elemenata u XML podacima."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Feed '%s' već postoji"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Greška prilikom učitavanja feeda '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Panel sa feedovima"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Čitaj Atom/RSS feedove"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Nije uspjelo dodavanje vrijednosti forme: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Istorija formi"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Potrebna master šifra\n"
+" da bise otvorila baza sa šiframa"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Zapamti šifru za ovu stranicu?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Zapamti"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ne sada"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Nikada za ovu stranicu"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Uključi/isključi istoriju formi"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Aktiviraj ili deaktiviraj istoriju formi za trenutni tab."
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr "Aktiviraj istoriju formi po tabu preko prečice (Ctrl+Shift+F)"
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr "Popunjavač istorije formi"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Čuva istoriju sačuvanih podataka na formama"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Nije uspio odabir prijedloga\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "Nema neposjećenih tabova"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Lista-istorije"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Ponašanje zatvaranja taba"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Ne radi ništa"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Premjesti se na zadnje pogledani tab"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Premjesti se na najnoviji tab"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Flash prozor na pozadinskim tabovima"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Sledjeći novi tab (lista istorije)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Sledjeći novi tab iz istorije"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Prethodni novi tab (lista istorije)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Prethodni novi tab iz istorije"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Prikaži tab u pozadini (lista istorije)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Prikaži trenutno izabrani tab u pozadini"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "Lista istorije"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"Premjesti se na zadnje korišćeni tab prilikom selektovanja ili zatvaranja "
+"tabova"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Greška SQL-a: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Prihvati"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Prihvati tokom ove sesije"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokiraj"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Nije moguće otvaranje baze dodatka: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Nije uspjelo izvršavanje naredbe baze podataka: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Da li sigurno želite da izbrišete sve JavaScript dozvole?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Izbriši sve JavaScript dozvole?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Ova akcija će izbrisati sve JavaScript dozvole. Prikazaće vam se dijalog sa "
+"dozvolama ponovo za svaku web stranicu koju posjetite."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Menadžer instanci"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instanca za globalni NoJS menadžer"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "NoJS konfiguracija"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domena"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Izbriši _sve"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Dozvoli skripte na svim stranicama"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blo_kiraj skripte na nepoznatim domenama"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Podesi dozvole na domenama drugog nivoa"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Odbij %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Prihvati %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Prihvati %s u ovoj sesiji"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Prozor browser-a"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Instanca kojoj pripada Midori pretraživač"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Pregledaj"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Stanje meni ikone"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Stanje meni ikone pokazano u status baru"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Nije odlučeno"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Dopušta se"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Kombinovano"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Odbija se"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Greška u NoJS dodatku"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Razlog"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instanca dodatka"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instanca aplikacije"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instanca baze podataka"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Putanja baze podataka"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Dopusti svim stranicama"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Samo drugim nivoima"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Nepoznata politika domene"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Politika za korišćenje na nepoznatim domenama."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Prihvati trenutno"
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Gesture mišem"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Kontroliši Midori pokretanjem miša"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Ponovo učitaj stranicu ili prekini učitavanje"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Prilagodi prečice na tastaturi"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Prilagodi prečice"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Prečice"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Pregledaj i edituj prečice na tastaturi"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Sat u status baru"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Prikazuje vrijeme i datum u status baru"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Slike"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skripte"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape dodaci"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Omogući Netscape dodatke"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Mogućnosti status bara"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Tab panel"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "T_ab panel"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Prikaži tabove u vertikalnom panelu"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Podrazumijevane samo ikonice na tabovima"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Podrazumijevano je da novi tabovi nemaju naslov"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Prilagodi bar sa alatkama"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Dostupne stavke"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Prikazane stavke"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Prilagodi bar sa alatkama"
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Editor bara sa alatkama"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Obriši privatne podatke"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Obriši privatne podatke"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Obriši sljedeće podatke:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Zadnje otvoreni _tabovi"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Obriši privatne podatke prilikom zatvaranja Midorija"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Sačuvani podaci za prijavljivanje"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookieji i podaci web sajtovima"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikonice web stranica"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Otvoreni tabovi"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Više otvorenih tabova..."
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Brisanje istorije nije uspjelo: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Nije uspjelo brisanje starih stavki iz istorije: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Nije uspjelo dodavanje stavke kao bookmarka: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Nije uspjelo uređivanje bookmarka: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Nije uspjelo brisanje stavke iz bookmarka: %s\n"
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Nije dostupna datoteka root certifikata. SSL certifikate nije moguće "
+"provjeriti."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Nije uspjelo čuvanje Konfiguracije. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Nije uspjelo čuvanje smeća. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori je pao zadnji put kada je bio otvoren. Ovaj problem možete da "
+"prijavite na %s."
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Izmijenite _podešavanja"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Onemogući sve _dodatke"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Prikaži dijalog kada Midori padne"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Odbaci stare tabove"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Prikaži zadnji _log o padu"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Pokreni u _debuggeru"
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Već je pokrenuta instanca Midorija, ali ona ne reaguje.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Nije uspjelo učitavanje bookmarkova: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Nije uspjelo učitavanje sesije: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Nije uspjelo učitavanje smeća: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Nije uspjelo učitavanje istorije: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Došlo je do sljedećih grešaka:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignoriši"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Nije uspjelo otvaranje baze podataka dodataka: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Da li ste sigurni da želite da izbrišete sve cookie dozvole?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Izbrisati sve cookie dozvole?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Menadžer cookie dozvola"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instanca trenutnog menadžera cookie dozvola"
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Konfiguracija cookie dozvola"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Pitaj za odluku"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Greška u menadžeru cookie dozvola."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Do kraja sesije"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Web stranica %s želi da sačuva %d cookieja."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Web stranica %s želi da sačuva cookie."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Više web stranica želi da sačuva ukupno %d coooooookieja."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Prihvati"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Prihvati za ovu _sesiju"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "_Odbij"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Odbij o_vaj put"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Putanja"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Vrijednost"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Datum isteka"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Menadžer cookie sigurnosti"
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Uređuj cookie dozvole sajt po sajt"
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Nije uspjelo učitavanje ikone aplikacije u %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Nije uspjelo kreiranje novog pokretača (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Pokretač kreiran"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Sada možete pokrenuti <b>%s</b> iz vašeg pokretača ili menija"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Greška pri kreiranju pokretača"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikacije"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Novi _profil"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Kreira novi, nezavisni, profil i pokretač"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nova _aplikacija"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Kreira novu aplikaciju za specifični sajt"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Greška prilikom pokretanja"
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Kreiraj _pokretač"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Menadžer web aplikacija"
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Uredi web stranice instalirane kao aplikacije"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transferi"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Očisti sve"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Greška prilikom otvaranja preuzimanja: %s"
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Otvori destinacioni direktorij"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopiraj lokaciju linka"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Datoteka <b>%s</b> je uspješno preuzeta."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' i %d drugih datoteka su uspješno preuzete."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transfer završen"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "U toku je proces preuzimanja nekih datoteka"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Zatvori Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Transferi datoteka će biti otkazani ukoliko zatvorite Midori."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Menadžer transferima"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Pregleda preuzete datoteke"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Nije uspio update baze podataka: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Nije uspjelo biranje iz baze podataka: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Menadžer tabova i sesija."
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Nije uspjelo dodavanje bilješke u bazu podataka: %s\n"
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Nije uspjelo brisanje bilješke iz baze podataka: %s\n"
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Nije uspjelo preimenovanje bilješke: %s\n"
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Nije uspjelo ažuriranje bilješke: %s\n"
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Bilješke"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nova bilješka"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Kreira praznu bilješku, nepovezanu sa otvorenim stranicama"
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova bilješka"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Nije uspjelo selektovanje iz baze bilješki: %s\n"
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Preimenovanje bilješke"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Kopiraj bilješku u clipboard"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Ukloni bilješku"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Kopiraj selekciju kao bilješku"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloker reklama"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokira reklame prema listi filtera"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfiguriši filtere reklama"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okiraj sliku"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okiraj link"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Uredi pravilo"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Pravilo:"
index 0e30b8d0ab7d6138735b4a706b717c25d3e901c4..4ff587407a7868bbcefed6dabab1cae181ac129b 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
 # Pol Ruzafa <kiari62@gmail.com>, 2011.
 # Carles Muñoz Gorriz <carlesmu@internautas.org>, 2009-2010, 2012.
 # Harald Servat <redcrash@gmail.com>, 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 <carlesmu@internautas.org>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-03-17 17:19+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Catalan\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-Launchpad-Export-Date: 2015-03-18 05:17+0000\n"
+"X-Generator: Launchpad (build 17403)\n"
 "Language: Catalan\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Navega la web"
-
-#: ../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
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
 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
-#, 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
-#, 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
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Valor de configuració «%s» no és vàlid"
-
-#: ../midori/main.c:380
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "No s'han pogut carregar els motors de cerca. %s\n"
-
-#: ../midori/main.c:434
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "No s'ha pogut buidar l'historial: %s\n"
-
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "No s'ha pogut obrir la base de dades: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n"
-
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "No s'ha pogut eliminar un element de l'historial:  %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "No s'han pogut desar les adreces d'interès. %s"
-
-#: ../midori/main.c:633
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "No s'ha pogut desar la configuració: %s"
-
-#: ../midori/main.c:668
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "No es pot desar les enginys de cerca. %s"
-
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
-#, 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
-msgid "Extensions"
-msgstr "Extensions"
-
-#: ../midori/main.c:760
-msgid "Privacy"
-msgstr "Privacitat"
-
-#: ../midori/main.c:772
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Les galetes emmgatzemen dades d'entrada, partides desades o perfils d'usuari "
-"per a fins publicitaris."
-
-#: ../midori/main.c:828
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "No s'ha pogut desar la sessió. %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Navegador web Midori"
 
-#: ../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."
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navegueu pel web"
 
-#: ../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."
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorador"
 
-#: ../midori/main.c:1134
-msgid "Modify _preferences"
-msgstr "Modificació de les _preferències"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Pestanya nova"
 
-#: ../midori/main.c:1138
-msgid "Disable all _extensions"
-msgstr "Inhabilita totes les _extensions"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Finestra nova"
 
-#: ../midori/main.c:1151
-msgid "Discard old tabs"
-msgstr "Descarta pestanyes velles"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nova finestra privada de navegació"
 
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
-msgid "Show last tabs without loading"
-msgstr "Mostra les darreres pestanyes sense carregar-les"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Navegació privada de Midori"
 
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
-msgid "Show last open tabs"
-msgstr "Mostra les pestanyes obertes recentment"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Navegació privada"
 
-#: ../midori/main.c:1400 ../midori/main.c:2464
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "No s'ha pogut carregar la sessió: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Obre una finestra de navegació privada"
 
-#: ../midori/main.c:1538
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "S'ha desat una captura a: %s\n"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr "Executa ADREÇA com una aplicació web"
+msgstr "Executa ADREÇA com una aplicació web"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADREÇA"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Empra CARPETA com a carpeta de configuració"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: ../midori/main.c:1957
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navegació privada, els canvis no es desaran"
 
-#: ../midori/main.c:1959
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Modalitat portàtil, tots els fitxers d'execució es desen a un sol lloc"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Finestes senzilles GTK+ amb WebKit, similar al GtkLauncher"
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
-msgstr "Mostra el diàleg de diagnosis"
+msgstr "Mostra el diàleg de diagnòstic"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Executar amb gdb i guardar un rastre de la ruptura"
 
-#: ../midori/main.c:1961
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Executa el fitxer especificat com a javascript"
 
-#: ../midori/main.c:1963
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
-msgstr "Fes una captura de la ubicació especificada"
+msgstr "Fes una captura de l'URI especificat"
 
-#: ../midori/main.c:1965
+#: ../midori/main.c:99
 msgid "Execute the specified command"
-msgstr "Executar la comanda especificada"
+msgstr "Executa l'ordre especificada"
 
-#: ../midori/main.c:1967
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
-msgstr "Llista de comandes disponibles per a executar amb -e/--execute"
+msgstr "Llista d'ordres disponibles per executar amb -e/--execute"
 
-#: ../midori/main.c:1969
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Mostra la versió del programa"
 
-#: ../midori/main.c:1971
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adreces"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
-msgstr "Bloquejar URIs segons l'expressió regular PATRÓ"
+msgstr "Bloqueja els URIs segons l'expressió regular PATRÓ"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATRÓ"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr "Reiniciar Midori després de SEGONS d'activitat"
+msgstr "Reinicia el Midori després de SEGONS segons d'activitat"
 
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGONS"
 
-#: ../midori/main.c:1980
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Redirigeix les alertes de consola a l'ARXIU especificat"
-
-#: ../midori/main.c:1980
-msgid "FILENAME"
-msgstr "ARXIU"
-
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[adreces]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Error: no s'ha pogut trobar «gdb»\n"
 
-#: ../midori/main.c:2087
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Envieu comentaris, suggeriments i informes d'error a:"
 
-#: ../midori/main.c:2089
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
-msgstr "Comprova si hi ha noves versions a:"
-
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
-msgid "Saved logins and _passwords"
-msgstr "Noms d'usuari i contra_senyes guardats"
-
-#: ../midori/main.c:2175
-msgid "Cookies and Website data"
-msgstr "Galetes i informació de llocs web"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "Memòria cau Web"
-
-#: ../midori/main.c:2182
-msgid "Website icons"
-msgstr "Icones de llocs webs"
+msgstr "Comproveu si hi ha versions noves a:"
 
-#: ../midori/main.c:2288
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "S'ha produït un error desconegut"
 
-#: ../midori/main.c:2395
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n"
-
-#: ../midori/main.c:2431
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "No s'ha pogut carregar les adreces d'interès: %s\n"
-
-#: ../midori/main.c:2479
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "No s'han pogut carregar les escombraries: %s\n"
-
-#: ../midori/main.c:2492
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "No s'ha pogut carregar l'historial: %s\n"
-
-#: ../midori/main.c:2508
-msgid "The following errors occured:"
-msgstr "S'han produït els següents errors:"
-
-#: ../midori/main.c:2524
-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
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Adreces d'interès"
 
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
-msgstr "Afegeix adreça d'_interès"
+msgstr "Afegeix una adreça d'_interès"
 
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Consola"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensions"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historial"
 
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Pàgina d'inici"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Scripts d'_usuari"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "E_stils personals"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
-msgstr "Nova _pestanya"
+msgstr "Pes_tanya nova"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferències"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
-msgstr "_Connectors de Netscape"
+msgstr "_Connectors del Netscape"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Pestanyes _tancades"
 
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
-msgstr "Nova _finestra"
+msgstr "_Finestra nova"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
-msgstr "Nova _carpeta"
+msgstr "_Carpeta nova"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[adreces]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
-msgstr "Document format erròniament."
+msgstr "El document està format erròniament."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "No es reconeix el format de l'adreça d'interès."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Ha fallat l'escriptura"
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Avança a la pàgina següent"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Avança al apartat següent de la pàgina"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Cerca en el web…"
 
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 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:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Atura la càrrega d'aquesta pàgina"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "El valor «%s» no és vàlid per a %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Opció inesperada «%s»"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Acció inesperada «%s»."
 
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navegació privada)"
 
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Carpeta de nivell superior"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "No s'ha pogut afegir un element nou a l'historial:  %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Selecciona [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Adreces d'interès"
 
-#: ../midori/midori-browser.c:774
-msgid "New folder"
-msgstr "Nova carpeta"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Carpeta nova"
 
-#: ../midori/midori-browser.c:774
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Edita la carpeta"
 
-#: ../midori/midori-browser.c:776
-msgid "New bookmark"
-msgstr "Nova adreça d'interès"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Adreça d'interès nova"
 
-#: ../midori/midori-browser.c:776
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Edita l'adreça d'interès"
 
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Títol:"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Escriviu un nom per aquesta adreça d'interès i trieu on desar-la."
 
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adreça:"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Escriviu un nom per aquesta carpeta i trieu on desar-la."
 
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Carpeta:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mostrar la _barra de les adreces d'interès"
 
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:1185
 msgid "Add to _Speed Dial"
 msgstr "Afegeix al _velocímetre"
 
-#: ../midori/midori-browser.c:890
-msgid "Show in the tool_bar"
-msgstr "Mostra a la _barra d'eines"
-
-#: ../midori/midori-browser.c:905
-msgid "Run as _web application"
-msgstr "Executa com una aplicació _web"
-
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "No es pot desar el fitxer «%s» en aquesta carpeta."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "No teniu permís per a escriure en aquesta ubicació."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "No hi ha prou espai lliure per descarregat «%s»."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Al fitxer li cal %s però només resten %s lliures."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
-msgstr "Anomena i desa"
+msgstr "Anomena i desa el fitxer"
 
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nova finestra"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Desa els _recursos associats"
 
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
-msgstr "Una nova finestra s'ha obert"
-
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nova pestanya"
+msgstr "S'ha obert una finestra nova"
 
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "S'ha obert una pestanya nova"
 
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "S'ha produït un error al obrir la imatge!"
 
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1630
 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 ""
+"No s'ha pogut obrir la imatge seleccionada en el visor predeterminat."
 
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
-msgstr "Error en descarregar la imatge!"
+msgstr "S'ha produït un error en baixar la imatge."
 
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "No es pot descarregar la imatge seleccionada."
 
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Desa el fitxer"
 
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Recarrega la pàgina sense llegir la memòria cau"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2692
 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"
@@ -531,148 +383,133 @@ msgid ""
 "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 utilitzar l'URI que hi ha a dalt, obriu un agregador de notícies. "
+"Normalment hi ha un botó de «Nova subscripció», «Noves notícies» o "
+"similars.\n"
+"Alternativament, aneu a «Preferències»/«Aplicacions» al Midori i seleccioneu "
+"un agregador de notícies. El proper cop que cliqueu a la icona de les "
+"notícies, s'agregarà automàticament."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
-msgstr "Nou canal"
+msgstr "Canal web nou"
 
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 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:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Buit"
 
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Canvia el cursor de la navegació de text"
 
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "No s'ha pogut afegir un element nou de l'historial:  %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Per alternar a la navegació mitjançant símbol d'intercalació, premeu F7. "
+"Mentre sigui actiu, apareixerà un cursor de text a tots els llocs web."
 
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
-msgid "Open all in _Tabs"
-msgstr "Obre-ho tot en _pestanyes"
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Activa navegació mitjançant símbol d'intercalació"
 
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
-msgid "Open in New _Tab"
-msgstr "Obre l'enllaç en una _pestanya nova"
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Obre-ho tot en pes_tanyes"
 
-#: ../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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 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:4352
 msgid "Arora"
 msgstr "Arora"
 
 # Nom d'un navegador web japonès
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4239
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importa les adreces d'interès…"
 
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importa les adreces d'interès"
 
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplicació:"
 
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
-msgstr "Importa d'unn fitxer XBEL o HTML"
+msgstr "Importa d'un fitxer XBEL o HTML"
 
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
-msgstr "Importar d'un fitxer"
+msgstr "Importa des d'un fitxer"
 
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4493
 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:4523
 msgid "XBEL Bookmarks"
 msgstr "Adreces d'interès XBEL"
 
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
-msgstr "Adreces d'interés Netscape"
+msgstr "Adreces d'interés del Netscape"
 
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori només pot exportar a XBEL (*.xbel) i Netscape (*.html)"
+msgstr "El Midori només pot exportar a XBEL (*.xbel) i Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4558
 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
-msgid "Clear Private Data"
-msgstr "Neteja les dades privades"
-
-#: ../midori/midori-browser.c:4560
-msgid "_Clear private data"
-msgstr "_Neteja les dades privades"
-
-#: ../midori/midori-browser.c:4573
-msgid "Clear the following data:"
-msgstr "Neteja les següents dades"
-
-#: ../midori/midori-browser.c:4583
-msgid "Last open _tabs"
-msgstr "Mostra les darreres _pestanyes obertes"
-
-#: ../midori/midori-browser.c:4609
-msgid "Clear private data when _quitting Midori"
-msgstr "Neteja les dades provades al _sortir de Midori"
-
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un navegador de pàgines web lleuger."
 
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
-msgstr "Vegeu Quant a:version per a informació de la versió."
+msgstr "Vegeu about:version per a més informació sobre la versió."
 
-#: ../midori/midori-browser.c:4807
+#: ../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 "
@@ -684,1539 +521,1520 @@ msgstr ""
 "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:4780
 msgid "translator-credits"
 msgstr ""
 "Carles Muñoz Gorriz <carlesmu@internautas.org>, 2009-2010.\n"
-"Harald Servat <redcrash@gmail.com>, 2009."
+"Harald Servat <redcrash@gmail.com>, 2009.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n"
+"  Alfredo Hernández https://launchpad.net/~aldomann\n"
+"  Carles Munoz Gorriz https://launchpad.net/~carlesmu\n"
+"  JoanColl https://launchpad.net/~joancoll\n"
+"  Juan Luis García https://launchpad.net/~jlgd2709\n"
+"  K. Moreno Herrera https://launchpad.net/~kmoreno-herrera\n"
+"  Marc https://launchpad.net/~noviluni\n"
+"  Navigalium https://launchpad.net/~hello-k\n"
+"  Paul Garden https://launchpad.net/~kiari62\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Xan https://launchpad.net/~dxpublica\n"
+"  mid-kid https://launchpad.net/~esteve-varela\n"
+"  vicmumo https://launchpad.net/~vmunoz-o\n"
+"  xavi ballestar https://launchpad.net/~xballestar"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplica la pestanya actual"
 
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Obre una finestra nova"
 
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Obre una pestanya nova"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
-msgstr "Nova finestra de navegació p_rivada"
+msgstr "Finestra de navegació p_rivada nova"
 
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Desa pàgina com…"
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
-msgstr "Desa en un fitxer"
+msgstr "Desa a un fitxer"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Afegeix al _velocímetre"
 
-#: ../midori/midori-browser.c:5235
-msgid "Add Shortcut to the _desktop"
-msgstr "Afegeix drecera a l'_escriptori"
-
-#: ../midori/midori-browser.c:5237
-msgid "Create _Launcher"
-msgstr "Crea _Llançador"
-
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
-msgstr "Subscriure's a un _canal de notícies"
+msgstr "Subscriu-te al _canal de notícies"
 
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Tan_ca la pestanya"
 
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Tanca la pestanya actual"
 
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Tanca la finestra"
 
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimeix la pàgina actual"
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Tanc_a totes la finestra"
 
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Cerca…"
 
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "Cerca el _següent"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Cerca l'_anterior"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Canvia les preferències de l'aplicació"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5140
 msgid "_View"
-msgstr "_Visualitza"
+msgstr "Vi_sualitza"
 
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
-msgstr "Barres d'e_ines"
-
-#: ../midori/midori-browser.c:5300
-msgid "Reload page without caching"
-msgstr "Carrega la pàgina sense emmagatzematge en memòria cau"
+msgstr "_Barres d'eines"
 
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Augmenta el nivell d'ampliació"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Disminueix el nivell d'ampliació"
 
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codificació"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
-msgstr "Veure codi _font"
+msgstr "Mostra el codi _font"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Mostra la font _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navegació p_rivada"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Commuta la vista a pantalla completa"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Desplaçament _esquerra"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Desplaçament a_vall"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Desplaçament _amunt"
 
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Desplaçament _dreta"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Llegible"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
-msgstr "Vé_s"
+msgstr "_Vés"
 
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Torna a la pàgina anterior"
 
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Avança a la pàgina següent"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Avança al apartat següent de la pàgina"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Següent o Endavant"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Vés a la nova subpàgina o a la següent pàgina de l'historial"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Pàgina d'inici"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Va a la vostre pàgina d'inici"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
-msgstr "Buida la paperera"
+msgstr "Buida les pestanyes tancades recentment"
 
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Desfés _tanca pestanya"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
-msgstr "Afegeix una _carpeta"
+msgstr "Afegeix una _carpeta nova"
 
-#: ../midori/midori-browser.c:5375
-msgid "_Export bookmarks"
-msgstr "_Exporta les adreces d'interès"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importa les adreces d'interès…"
 
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Gestiona els ginys de cerca"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exporta les adreces d'interès…"
 
-#: ../midori/midori-browser.c:5381
-msgid "_Clear Private Data"
-msgstr "_Neteja les dades privades"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Gestiona els motors de cerca…"
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Neteja les dades privades…"
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspecciona la pàgina"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Anterior pestanya"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Següent pestanya"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Mou la pestanya a la posició _inicial"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Mou la Pestanya _Enrera"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mou la Pestanya Endavant"
 
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Mou la pestanya a la posició _final"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Enfoca la pestanya _actual"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
-msgstr "Enfoca la _Següent vista"
+msgstr "Enfoca la vista _següent"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Mostra la icona només a la pestanya _actual"
 
-#: ../midori/midori-browser.c:5407
-msgid "_Duplicate Current Tab"
-msgstr "_Duplica la pestanya actual"
-
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Tanca la _resta de pestanyes"
 
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Obre la darrera _sessió"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Preguntes freqüents"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Informa d'un _error…"
 
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "E_ines"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra de _menú"
 
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra de _navegació"
 
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Quadre lateral"
 
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Quadre lateral"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barra d'_adreces d'interès"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra d'_estat"
 
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinese Traditional (Big5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Xinès tradicional (BIGS)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Xinès simplificat (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonès (Shift_JIS)"
 
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreà (EUC-KR)"
 
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rus (KOI8-R)"
 
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalitzat…"
 
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Error a l'inicialitzar l'historial; %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separador"
 
-#: ../midori/midori-browser.c:5992
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Ubicació…"
 
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Obre una ubicació"
 
-#: ../midori/midori-browser.c:6016
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Cerca _web…"
 
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Executa una cerca web"
 
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Mostra les adreces d'interès desades"
 
-#: ../midori/midori-browser.c:6079
-msgid "_Tools"
-msgstr "E_ines"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "Pes_tanyes"
 
-#: ../midori/midori-browser.c:6095
-msgid "_Window"
-msgstr "Fines_tra"
-
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:5939
 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:5953
 msgid "_Menu"
 msgstr "_Menú"
 
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menú"
 
-#: ../midori/midori-browser.c:6927
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Opció inesperada «%s»"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "Exporta el certificat"
 
-#: ../midori/midori-locationaction.c:412
-msgid "Search with…"
-msgstr "Cerca amb…"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "No es coneix l'autoritat del certificat de signatura."
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "No s'ha pogut seleccionar de l'historial\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"El certificat no coicideix amb la identitat esperada del lloc del qual s'ha "
+"obtingut."
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "Cercar  %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "La data d'activació del certificat encara és al futur."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "El certificat ha vençut"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"El certificat ha estat revocat d'acord a la llista de revocació del "
+"GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "L'algoritme del certificat és considerat insegur."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "S'ha produït algun error en la validació del certificat."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Exporta el certificat"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Auto-signat"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Detalls de seguretat"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Enganxa i _procedeix"
 
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "No verificat"
 
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Verificat i connexió encriptada"
 
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1814
 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:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
-msgstr "Alinear el panell lateral a la dreta"
+msgstr "Alinea el quadre lateral a la dreta"
 
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Tanca el quadre"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
-msgstr "Alinear el panell lateral a l'esquerra"
+msgstr "Alinea el quadre lateral a l'esquerra"
 
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
-msgstr "Mostra el velocímetre"
+msgstr "Mostra el marcador ràpid"
 
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Mostra la pàgina d'inici"
 
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Mostra les pestanyes obertes recentment"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Mostra les darreres pestanyes sense carregar-les"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Mostra una pàgina en blanc"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Mostra el motor de cerca predeterminat"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Mostra una pàgina personalitzada"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonès (Shift_JIS)"
 
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
-msgstr "Nova pestanya"
+msgstr "Pestanya nova"
 
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:173
 msgid "New window"
-msgstr "Nova finestra"
+msgstr "Finestra nova"
 
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Pestanya actual"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:189
 msgid "Default"
-msgstr "Per defecte"
+msgstr "Predeterminat"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Icones"
 
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Icones petites"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Icones i text"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text sota les icones"
 
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automàtic (GNOME o entorn)"
 
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Servidor intermediari de HTTP"
 
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Sense servidor intermediari"
 
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Recorda la mida de la darrera finestra"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "L'estil de la barra d'eines"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Empra sempre la meva selecció de tipus de lletra"
 
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Si voleu desar la mida de la finestra"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+"Sobreescriu el tipus de lletra dels llocs webs amb els de les vostres "
+"preferències"
 
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Amplada de la darrera finestra"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "No s'ha pogut carregar la configuració: %s\n"
 
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "L'amplada emmagatzemada de la darrera finestra"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "El valor de configuració «%s» no és vàlid"
 
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Alçada de la darrera finestra"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "No es pot injectar la fulla d'estil: %s"
 
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "L'alçada emmagatzemada de la darrera finestra"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Mostra la _etiqueta a la pestanya"
 
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Posició del darrer panell"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Mostra només _icones a les pestanyes"
 
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "La posició emmagatzemada del darrer panell"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Tanca la pestanya a la dreta"
+msgstr[1] "Tanca les pestanyes a la dreta"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Darrera pàgina del panell"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Tanca l'_altra pestanya"
+msgstr[1] "Tanca les _altres pestanyes"
 
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "La darrera pàgina del panell emmagatzemada"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Confia en aquest lloc web"
 
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Darrera cerca a la Web"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Seguretat desconeguda"
 
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "La darrera cerca a la Web emmagatzemada"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s vol desar una base de dades HTML5."
 
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Mostra la barra de menú"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Denegar"
 
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Si es mostrarà la barra de menú"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Permet"
 
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Mostra la barra de navegació"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s vol saber la vostra ubicació."
 
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Si es mostrarà la barra de navegació"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' no s'ha trobat"
 
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Mostra la barra d'adreces d'interès"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "No s'ha pogut carregar la pàgina «%s»:"
 
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Si es mostra la barra d'adreces d'interès"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Comprova l'adreça cercant errors"
 
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Mostra el quadre"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Assegureu-vos que el cable de xarxa està endollat o que la targeta de "
+"connexió inalàmbrica està activada."
 
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Si s'ha de mostrar el panell"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Comprova que la configuració de xarxa sigui correcta"
 
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Mostra la barra d'estat"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Torneu-ho a provar"
 
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Si es mostrarà la barra d'estat"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Ostres - %s"
 
-#: ../midori/midori-websettings.c:519
-msgid "Toolbar Style:"
-msgstr "Estil de la barra d'eines:"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Alguna cosa ha anat malament amb '%s'"
 
-#: ../midori/midori-websettings.c:520
-msgid "The style of the toolbar"
-msgstr "L'estil de la barra d'eines"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Torneu-ho a provar"
 
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Elements de la barra d'eines"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Envia un missatge a %s"
 
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Els elements que es mostraran a la barra d'eines"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Afegeix un _motor de cerca..."
 
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Panell lateral compacte"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Obre _enllaç"
 
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Si s'ha de compactar el panell lateral"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Obre l'enllaç en una pes_tanya nova"
 
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "La barra d'estat està a la dreta"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Obre l'enllaç en una nova pestanya en primer _pla"
 
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Si s'ha d'alinear el panell lateral a la dreta"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Obre l'enllaç en una nova pestanya _no activa"
 
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Obre els quadres en finestres separades"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Obre l'enllaç en una _finestra nova"
 
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Si s'ha d'obrir els quadres en finestres separades"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "_Copia la destinació de l'enllaç"
 
-#: ../midori/midori-websettings.c:580
-msgid "When Midori starts:"
-msgstr "Quan Midori s'inicia:"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "_Anomena i desa…"
 
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Què fer quan Midori s'iniciï"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Obre la _imatge en una finestra nova"
 
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Pàgina d'inici:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Obre la _imatge en una pestanya nova"
 
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "La pàgina d'inici"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Copia la im_atge"
 
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Mostra el diàleg de fallades"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Desa la i_matge"
 
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Mostra un diàleg quan Midori falli"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Obre en el visualitzador d'_imatges"
 
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Desar els fitxers descarregats a:"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Copia l'_adreça del vídeo"
 
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "El directori on s'emmagatzemaran els fitxers descarregats"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Baixa el _vídeo"
 
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Editor de text"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Obre l'adreça en una pes_tanya nova"
 
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Un editor de text extern"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Cerca _amb"
 
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Acumulador de notícies"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Cerca al web"
 
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Un acumulador de notícies extern"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Obre el _marc a una pestanya nova"
 
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Ubicació que s'ha de cercar"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspecciona l'_element"
 
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "La cerca a executar dins l'entrada de la localització"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Obre o baixa el fitxer des de %s"
 
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "La codificació preferida"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Nom de fitxer: %s"
 
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "Codificació de caràcters preferida"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipus de fitxer: «%s»"
 
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Mostra sempre la barra d'eines"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipus de fitxer: %s («%s»)"
 
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Mostra sempre la barra des pestanyes "
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Mida: %s"
 
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Mostra el botó de tancar a les pestanyes"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Obre %s"
 
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Si les pestanyes tenen botó de tancar"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspecciona la pàgina «%s»"
 
-#: ../midori/midori-websettings.c:709
-msgid "Open new pages in:"
-msgstr "Obre les noves pàgines a:"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "El Midori no desa cap informació personal:"
 
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "On s'han d'obrir les pàgines noves"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "No es desen ni l'historial ni les galetes."
 
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Fer clic al botó central del ratolí obre la selecció"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Les extensions estan deshabilitades."
 
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
-"Carregar una adreça des de la selecció mitjançant el botó central del ratolí"
+"L'emmagatzematge HTML5, les bases de dades locals i la memòria cau de "
+"l'aplicació estan desactivats."
 
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Obre pestanyes sense fer-les actives"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "El Midori evita que els llocs webs controlin l'usuari:"
 
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Si s'ha d'obrir pestanyes actives o inactives"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "URLs de referència no contenen el nom de màquina."
 
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Obre les pestanyes al costat de l'actual"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "Càrrega prèvia de DNS deshabilitada."
+
+#: ../midori/midori-view.c:3905
+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-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
-"Si obrir les noves pestanyes al costat de la pestanya actual o de l'última"
+"El Flash i altres connectors del Netscape no es poden llistar als llocs webs."
 
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Obre els missatges emergents en pestanyes"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+"Els nombres de versió mostrats entre parèntesis mostren la versió utilitzada "
+"al temps d'execució."
 
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Si s'han d'obrir els missatges emergents dins pestanyes"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Càrrega retardada de la pàgina:"
 
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Carrega les imatges automàticament"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"S'ha retardat la càrrega degut a una fallada recent o a les preferències "
+"d'inici."
 
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Carrega i mostra les imatges automàticament"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Carrega la pàgina"
 
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Habilita els scripts"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Pàgina en blanc"
 
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Habilita els llenguatges d'script incrustats"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "anterior"
 
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Habilita els connectors de netscape"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "següent"
 
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Activar els objectes de connexió integrats de Netscape"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Imprimeix les imatges de fons"
 
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Habilita el corrector ortogràfic"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Si s'han d'imprimir les imatges de fons"
 
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Activa la comprovació ortogràfica mentre s'escriu"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Característiques"
 
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Habilita la compatibilitat amb bases de dades HTML5"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s de %s"
 
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5"
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
 
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Habilita l'emmagatzematge local HTML5"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuts"
 
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Si s'habilita l'emmagatzematge local HTML5"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segon"
+msgstr[1] "%d segons"
 
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Habilita la memòria cau d'aplicació de fora de línia"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " -%s restants"
 
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Flaix a la finestra per les pestanyes inactives"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../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-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "El fitxer baixat conté errors."
 
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Habilita la compatibilitat WebGL"
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"La suma de verificació proveïda a l'enllaç no coincideix. Això vol dir que "
+"el fitxer probablement està incomplet o ha estat modificat posteriorment."
 
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permet als llocs web d'emprar la renderització OpenGL"
+#: ../midori/midori-download.vala:366
+#, 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-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Ampliar text i imatges"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "No teniu permís per escriure en aquesta ubicació."
 
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Si s'han d'ampliar text i imatges"
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "No hi ha prou espai lliure per baixar «%s»."
 
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Buscar en línia mentre s'escriu"
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "El fitxer necessita %s però només resten %s lliures."
 
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Si es buscarà automàticament a mesura que s'escriu"
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Velocímetre"
 
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Desplaçament cinètic"
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Feu clic per afegir una drecera"
 
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
-"Si el desplaçament hauria de moure's de forma cinètica segons la velocitat"
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Introduïu l'adreça de la drecera"
 
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Esborrar les galetes antigues després de:"
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Introduïu un títol per a la drecera"
 
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "El nombre màxim de dies que es guardaran les galetes"
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Esteu segur que voleu suprimir aquesta drecera?"
 
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Accepta només galetes de llocs que visiteu"
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Inicialització"
 
-#: ../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-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Quan el Midori s'inicia:"
 
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Esborra les pàgines de l'historia després de:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "Caducitat de l'historial"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Servidor intermediari"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "Tipus de servidor intermediari a fer servir"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "Servidor intermediari de HTTP"
-
-#: ../midori/midori-websettings.c:963
-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"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "El servidor intermediari usat per a les connexions HTTP"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "La mida màximade les pàgines emmagatzemades en memòria cau al disc"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
-msgid "Identify as"
-msgstr "Identifica'l com a"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Pàgina d'inici:"
 
-#: ../midori/midori-websettings.c:1015
-msgid "What to identify as to web pages"
-msgstr "Què identificar com a pàgines web"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Empra la pàgina _actual"
 
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Cadena de caràcters d'identificació"
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Empra la pàgina actual com a pàgina d'inici"
 
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "La cadena d'identificació d'aplicacions"
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Tipus de lletra"
 
-#: ../midori/midori-websettings.c:1048
-msgid "Preferred languages"
-msgstr "Idiomes preferits"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Família de tipus de lletra proporcional"
 
-#: ../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\""
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
 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
-msgid "Clear private data"
-msgstr "Esborrar dades privades"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "La selecció de dades privades per a esborrar"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Neteja les dades"
+"La família de tipus de lletra predeterminada emprada per mostrar el text"
 
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "La dades seleccionada per esborrar"
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "La mida del tipus de lletra predeterminat emprat per mostrar el text"
 
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Treu la informació de referència enviada als llocs webs"
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Família de tipus de lletra d'amplada fixa"
 
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr ""
-"Si la capçalera \"Referer\" hauria d'haver estat escurçada al nom del host"
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "La família de tipus de lletra emprat per mostrar textos de mida fixa"
 
-#: ../midori/midori-websettings.c:1146
-msgid "Always use my font choices"
-msgstr "Empra sempre la meva selecció de tipus de lletra"
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "La mida del tipus de lletra emprat per mostrar textos de mida fixa"
 
-#: ../midori/midori-websettings.c:1147
-msgid "Override fonts picked by websites with user preferences"
-msgstr ""
-"Sobreescriu el tipus de lletra dels llocs webs amb els de les vostres "
-"preferències"
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Mida mínima del tipus de lletra"
 
-#: ../midori/midori-view.c:1360
-#, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "%s vol desar una base de dades HTML5."
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "La mida mínima del tipus de lletra emprat per mostrar textos"
 
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Deny"
-msgstr "_Denegar"
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "La codificació preferida"
 
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Allow"
-msgstr "_Permetre"
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Comportament"
 
-#: ../midori/midori-view.c:1392
-#, c-format
-msgid "%s wants to know your location."
-msgstr "%s vol saber la vostra ubicació."
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Carrega les imatges automàticament"
 
-#: ../midori/midori-view.c:1485
-#, c-format
-msgid "Error - %s"
-msgstr "Error - %s"
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Activa la comprovació ortogràfica"
 
-#: ../midori/midori-view.c:1486
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "No s'ha pogut carregar la pàgina «%s»."
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Activa els scripts"
 
-#: ../midori/midori-view.c:1488
-msgid "Try again"
-msgstr "Torneu-ho a provar"
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Activa la compatibilitat amb el WebGL"
 
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
-#, c-format
-msgid "Send a message to %s"
-msgstr "Enviar un missatge a %s"
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Amplia texts i imatges"
 
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
-msgid "Inspect _Element"
-msgstr "Inspecciona l'_element"
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Permet als scripts d'obrir finestres emergents"
 
-#: ../midori/midori-view.c:2480
-msgid "Open Link in New _Tab"
-msgstr "Obre l'enllaç en una nova _pestanya"
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Si els scripts poden obrir finestres emergents de forma automàtica"
 
-#: ../midori/midori-view.c:2484
-msgid "Open Link in _Foreground Tab"
-msgstr "Obre l'enllaç en una nova pestanya en primer _pla"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Zoom predeterminat"
 
-#: ../midori/midori-view.c:2485
-msgid "Open Link in _Background Tab"
-msgstr "Obre l'enllaç en una nova pestanya _no activa"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Factor inicial per ampliar les noves pestanyes obertes"
 
-#: ../midori/midori-view.c:2488
-msgid "Open Link in New _Window"
-msgstr "Obre l'enllaç a una nova _finestra"
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Idiomes preferits"
 
-#: ../midori/midori-view.c:2491
-msgid "Open Link as Web A_pplication"
-msgstr "Obre l'enllaç com si fos una _aplicació web"
+#: ../midori/midori-preferences.c:426
+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-view.c:2496
-msgid "Copy Link de_stination"
-msgstr "_Copia la destinació de l'enllaç"
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Desa els fitxers baixats a:"
 
-#: ../midori/midori-view.c:2512
-msgid "Open _Image in New Tab"
-msgstr "Obre la _imatge en una nova pestanya"
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Navegant"
 
-#: ../midori/midori-view.c:2515
-msgid "Copy Image _Address"
-msgstr "Copia l'_adreça de la imatge"
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
 
-#: ../midori/midori-view.c:2518
-msgid "Save I_mage"
-msgstr "Desa la i_matge"
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Estil de la barra d'eines:"
 
-#: ../midori/midori-view.c:2521
-msgid "Open in Image _Viewer"
-msgstr "Obre en el visualitzador d'_imatges"
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Obre les pàgines noves a:"
 
-#: ../midori/midori-view.c:2528
-msgid "Copy Video _Address"
-msgstr "Copia l'_adreça del vídeo"
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Comportament de les pestanyes noves:"
 
-#: ../midori/midori-view.c:2531
-msgid "Save _Video"
-msgstr "Desa el _vídeo"
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Mostra el botó de tancar a les pestanyes"
 
-#: ../midori/midori-view.c:2531
-msgid "Download _Video"
-msgstr "Descarrega el _vídeo"
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Obre les pestanyes al costat de l'actual"
 
-#: ../midori/midori-view.c:2557
-msgid "Search _with"
-msgstr "Cerca _amb"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Si s'han d'obrir les pestanyes noves al costat de la pestanya actual o al "
+"costat de la darrera"
 
-#: ../midori/midori-view.c:2589
-msgid "_Search the Web"
-msgstr "_Cerca la Web"
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Obre pestanyes sense fer-les actives"
 
-#: ../midori/midori-view.c:2606
-msgid "Open Address in New _Tab"
-msgstr "Obre l'adreça en una nova _pestanya"
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Editor de text"
 
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Obre o descarrega el fitxer"
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Acumulador de notícies"
 
-#: ../midori/midori-view.c:2929
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipus de fitxer: «%s»"
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Xarxa"
 
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipus de fitxer: %s («%s»)"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Servidor intermediari"
 
-#: ../midori/midori-view.c:2935
-#, c-format
-msgid "File Name: %s"
-msgstr "Nom de fitxer: %s"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-view.c:2955
-#, c-format
-msgid "Open %s"
-msgstr "Obre %s"
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
 
-#: ../midori/midori-view.c:3576
-#, c-format
-msgid "Inspect page - %s"
-msgstr "Inspecciona la pàgina «%s»"
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Tipus de proxy permesos:"
 
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "Velocímetre"
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Memòria cau del web"
 
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "Feu clic per a afegir una drecera"
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "La mida màximade les pàgines emmagatzemades en memòria cau al disc"
 
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "Introduïu l'adreça de la drecera"
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
 
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "Introduïu un títol per a la drecera"
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identifica'l com a"
 
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Esteu segur d'esborrar aquesta drecera?"
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privacitat"
 
-#: ../midori/midori-view.c:4089
-#, c-format
-msgid "No documentation installed"
-msgstr "No s'ha instaŀlat la documentació"
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Suprimeix les galetes antigues després de:"
 
-#: ../midori/midori-view.c:4165
-msgid "Midori doesn't store any personal data:"
-msgstr "Midori no desa cap informació personal:"
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "El nombre màxim de dies que es desaran les galetes"
 
-#: ../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-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Accepta només galetes de llocs que visiteu"
 
-#: ../midori/midori-view.c:4167
-msgid "Extensions are disabled."
-msgstr "Les extensions estan deshabilitades."
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Bloqueja les galetes enviades per llocs webs de tercers"
 
-#: ../midori/midori-view.c:4168
-msgid "HTML5 storage, local database and application caches are disabled."
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
 msgstr ""
-"Emmagatzematge HTML5, base de dades local i memòria cau d'aplicacions "
-"deshabilitades."
-
-#: ../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: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: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."
+"Les galetes emmgatzemen dades d'entrada, partides desades o perfils d'usuari "
+"per a fins publicitaris."
 
-#: ../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-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Activa la memòria cau local d'aplicacions web"
 
-#: ../midori/midori-view.c:4222
-msgid "Version numbers in brackets show the version used at runtime."
-msgstr ""
-"Els nombres de versió mostrats entre parèntesis mostren la versió utilitzada "
-"al temps d'execució."
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Activa l'emmagatzematge local HTML5"
 
-#: ../midori/midori-view.c:4278
-msgid "Page loading delayed"
-msgstr "S'ha retardat la càrrega de la pàgina"
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Treu la informació de referència enviada als llocs webs"
 
-#: ../midori/midori-view.c:4279
-msgid "Loading delayed either due to a recent crash or startup preferences."
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
-"S'ha retardat la càrrega degut a una fallada recent o a les preferències "
-"d'inici."
-
-#: ../midori/midori-view.c:4280
-msgid "Load Page"
-msgstr "Carregar pàgina"
-
-#: ../midori/midori-view.c:4446
-msgid "Blank page"
-msgstr "Pàgina en blanc"
-
-#: ../midori/midori-view.c:4708
-msgid "_Duplicate Tab"
-msgstr "_Duplica la pestanya"
+"Si la capçalera «Referer» ha de ser escurçada al nom de l'ordinador central"
 
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Label"
-msgstr "Mostra la _etiqueta a la pestanya"
-
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Icon Only"
-msgstr "Mostra només _icones a les pestanyes"
-
-#: ../midori/midori-view.c:4719
-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
-msgid "Print background images"
-msgstr "Imprimeix les imatges de fons"
-
-#: ../midori/midori-view.c:5565
-msgid "Whether background images should be printed"
-msgstr "Si s'han d'imprimir les imatges de fons"
-
-#: ../midori/midori-view.c:5597
-msgid "Features"
-msgstr "Característiques"
-
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Inicialització"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Empra la pàgina _actual"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Empra la pàgina actual com a pàgina d'inici"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Tipus de lletra"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Família de tipus de lletra proporcional"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "La família de tipus de lletra per defecte emprada per mostrar el text"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "La mida del tipus de lletra per defecte emprada per mostrar el text"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Família de tipus de lletra d'amplada fixa"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "La família de fonts per a mostrar text de mida fixa"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "La mida de la font usada per a mostrar text de mida fixa"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Mida mínima del tipus de lletra"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "La mida mínima del tipus de lletra emprada per mostrar text"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Comportament"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Permetre als scripts obrir finestres emergents"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Si els scripts poden obrir finestres emergents de forma automàtica"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Navegant"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Xarxa"
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Suprimeix les pàgines de l'historial després de:"
 
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Nom del host"
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Caducitat de l'historial"
 
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Extensions"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Gestiona els ginys de cerca"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Afegeix giny de cerca"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Edita giny de cerca"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descripció:"
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Icona:"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adreça:"
 
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Testimoni:"
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gestiona els ginys de cerca"
 
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
-msgstr "Empra'l per _defecte"
+msgstr "Empra'l com a pre_determinat"
 
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Obrir amb"
+#: ../midori/midori-searchaction.c:1619
+#, 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/sokoke.c:362
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Seleccioneu una aplicació o ordre per obrir «%s»:"
+msgid "The search engines couldn't be saved. %s"
+msgstr "No s'han pogut desar les enginys de cerca. %s"
 
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "No s'ha pogut executar el programa extern."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Marcadors i historial"
 
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d hores"
+msgid "Search for %s"
+msgstr "Cerca %s"
 
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuts"
+msgid "Failed to select from history: %s"
+msgstr "Error al seleccionar des de l'historial: %s"
 
-#: ../midori/sokoke.c:1597
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segon"
-msgstr[1] "%d segons"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Cerca amb…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
+msgid "Search with %s"
+msgstr "Cerca amb %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Obrir amb"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr "(%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Seleccioneu una aplicació o ordre per obrir «%s»:"
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
-#, c-format
-msgid " - %s remaining"
-msgstr "-%s restants"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "No s'ha pogut executar el programa extern."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "L'URI no és vàlid"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "Cerca en _línia:"
 
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Següent"
 
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Coincidència de majúscules i minúscules"
 
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Ressalta les coincidències"
-
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Tanca la barra de cerques"
 
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "S'ha descarregat el fitxer «<b>%s</b>»."
-
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Transferència finalitzada"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d adreça d'interès"
+msgstr[1] "%d adreces d'interès"
 
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "El fitxer descarregat conté errors."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subcarpeta"
+msgstr[1] "%d subcarpetes"
 
-#: ../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."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Carpeta buida"
 
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "Netejar-ho tot"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "La carpeta conté %s i cap adreça d'interès"
 
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
-msgid "Some files are being downloaded"
-msgstr "S'estan descarregant fitxers"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "La carpeta conté %s"
 
-#: ../toolbars/midori-transferbar.c:377
-msgid "_Quit Midori"
-msgstr "_Sortir de Midori"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "La carpeta conté %s i %s"
 
-#: ../toolbars/midori-transferbar.c:379
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Les transferències es cancel·laran si se surt de Midori."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Dirigint a l'adreça d'interès a: %s"
 
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Adreces d'interès"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:257
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, 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"
+msgid "%s and %s"
+msgstr "%s i %s"
 
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Edita l'adreça d'interès seleccionada"
 
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Suprimeix l'adreça d'interès seleccionada"
 
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Afegeix una carpeta nova"
 
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separador</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Obre en una pes_tanya nova"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Cerca adreces d'interès"
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "Historial"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
-msgstr "Avuí"
+msgstr "Avui"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Setmana passada"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "No s'ha pogut suprimir un element de l'historial:  %s\n"
+
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
-msgstr "Voleu esborrar tots els elements de l’historial?"
+msgstr "Esteu segur que voleu suprimir tots els elements de l’historial?"
 
-#: ../panels/midori-history.c:407
+#: ../panels/midori-history.c:358
 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:367
 msgid "Delete the selected history item"
-msgstr "Esborra l'element de l'historial seleccionat"
+msgstr "Suprimeix l'element de l'historial seleccionat"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Buida l'historial"
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
-msgstr "Transferències"
-
-#: ../panels/midori-transfers.c:469
-msgid "Open Destination _Folder"
-msgstr "_Obre la carpeta destí"
-
-#: ../panels/midori-transfers.c:472
-msgid "Copy Link Loc_ation"
-msgstr "Copia la _localització de l'enllaç"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Historial de la cerca"
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2228,7 +2046,7 @@ msgid ""
 "to open this location:"
 msgstr ""
 "És necessari un nom d'usuari i una contrasenya\n"
-"per obrir aquesta ubicació:"
+"per obrir aquesta ubicació:"
 
 #: ../katze/katze-http-auth.c:240
 msgid "Username"
@@ -2242,187 +2060,147 @@ msgstr "Contrasenya"
 msgid "_Remember password"
 msgstr "_Recorda la contrasenya"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "La icona amb nom «%s» no s'ha pogut carregar"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "La icona «%s» no s'ha pogut carregar"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Els marcs d'animació no funcionen correctament"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Cap"
 
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:529
 #, 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:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
-msgstr "Seleccioneu fitxer"
+msgstr "Seleccioneu un fitxer"
 
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
-msgstr "Seleccioneu carpeta"
-
-#: ../katze/katze-utils.c:610
-msgid "None"
-msgstr "Cap"
+msgstr "Seleccioneu una carpeta"
 
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dia"
 
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 setmana"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mes"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 any"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferències per a %s"
 
-#: ../extensions/adblock.c:473
-msgid "Configure Advertisement filters"
-msgstr "Configura els filtres de publicitat"
-
-#: ../extensions/adblock.c:504
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"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
-msgid "Edit rule"
-msgstr "Edita la regla"
-
-#: ../extensions/adblock.c:896
-msgid "_Rule:"
-msgstr "_Regla:"
-
-#: ../extensions/adblock.c:950
-msgid "Bl_ock image"
-msgstr "Bl_oca imatge"
-
-#: ../extensions/adblock.c:955
-msgid "Bl_ock link"
-msgstr "Bl_oca enllaç"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
 
-#: ../extensions/adblock.c:1670
-msgid "Advertisement blocker"
-msgstr "Bloqueig de publicitat"
-
-#: ../extensions/adblock.c:1671
-msgid "Block advertisements according to a filter list"
-msgstr "Bloca els anuncis publicitaris segons una llista de filtres"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
 
 #. 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?"
+#: ../extensions/addons.c:222
+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:223
 msgid "_Install user script"
-msgstr "_Instalŀa l'script d'usuari"
+msgstr "Instal·la l'script d'usuari"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 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:229
 msgid "_Install user style"
 msgstr "_Instaŀla l'estil d'usuari"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "No instaŀlis"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Scripts d'usuari"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Estils d'usuari"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
-msgstr "Error"
+msgstr "S'ha produït un error"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Voleu eliminar «%s»?"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Suprimeix l'script d'usuari"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Suprimeix l'estil d'usuari"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
-msgstr "El fitxer «<b>%s</b>» s'esborrarà de forma permanent."
+msgstr "El fitxer «<b>%s</b>» se suprimirà permanentment."
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Obre en un editor de text"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Obre la carpeta destí"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
-msgstr "Afegeix un nou afegitó"
+msgstr "Afegeix un complement nou"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
-msgstr "Suprimeix l'afegitó seleccionat"
+msgstr "Suprimeix el complement seleccionat"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
-msgstr "Afegitons de l'usuari"
+msgstr "Complements de l'usuari"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, 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:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Adment l'ús d'scripts i estils d'usuari"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Pestanyes de colors"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Aplica un color diferent a cadascuna de les pestanyes"
 
@@ -2431,43 +2209,43 @@ msgstr "Aplica un color diferent a cadascuna de les pestanyes"
 msgid "Cookie Manager"
 msgstr "Gestor de galetes"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Suprimeix-ho tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 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."
+"Suprimeix totes les galetes mostrades. Si hi ha un filtre establert, només "
+"aquelles galetes que coincideixin amb el filtre se suprimiran."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Expansiona-ho tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Colapsa-ho tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
-msgstr "Voleu eliminar totes les galetes?"
+msgstr "Esteu segur que voleu suprimir totes les galetes?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:574
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Qüestió"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
-msgstr "Només s'esborraran les galetes que coincideixin amb el filtre."
+msgstr "Només se suprimiran les galetes que coincideixin amb el filtre."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
-msgstr "Al finalitzar la sessió"
+msgstr "En finalitzar la sessió"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2484,15 +2262,16 @@ msgstr ""
 "<b>Segura</b>: %s\n"
 "<b>Expiració</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Sí"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "No"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2501,921 +2280,1266 @@ msgstr ""
 "<b>Domini</b>: %s\n"
 "<b>Galeta</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nom"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandeix-ho tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Plega-ho tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-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:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Cerca galetes per nom o domini"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
-msgstr "Llista, mostra i borra galetes"
+msgstr "Llista, mostra i suprimeix 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"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Càrrega retardada"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+"Retarda la càrrega de la pàgina fins que realment utilitzeu la pestanya."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Doble click per a més informació"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Aquesta extensió mostra missatges d'error glib a la safata del sistema"
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"S'ha produït un error quan s'ha intentat descarregar un fitxer amb el "
+"següent connector:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Torni a provar-ho sense el connector."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Administrador extern de descàrregues - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Descarrega arxius amb Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Administrador extern de descàrregues - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Descarrega arxius amb SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Ordre:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Baixa els fitxers amb «%s» o una ordre personalitzada"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Administrador extern de descàrregues - CommandLine"
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML."
+msgstr "No s'han pogut trobar elements Atom  «entry» en les dades XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "No s'han pogut trobar elements Atom \"feed\" en les dades XML."
+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:367
 #, 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:620
 msgid "Feeds"
 msgstr "Canals"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
-msgstr "Afegeix un nou canal"
+msgstr "Afegeix un canal web nou"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
-msgstr "Suprimeix el canal"
+msgstr "Suprimeix el canal web"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Canals"
 
 #: ../extensions/feed-panel/feed-parse.c:195
 #, c-format
 msgid "Failed to find root element in feed XML data."
-msgstr "No s'ha pogut trobar l'element arrel en les dades XML."
+msgstr ""
+"No s'ha pogut trobar l'element arrel en les dades XML dels canals web."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Format de canal no compatible."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
-msgstr "No s'ha pogut analitzar el canal XML: %s"
+msgstr "No s'ha pogut analitzar el canal web XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "No s'ha pogut trobar l'element \"channel\" en les dades RSS XML."
+msgstr "No s'ha pogut trobar l'element «channel» en les dades RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Versió RSS no compatible."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "No s'ha pogut trobar els elements RSS \"item\" en les dades XML."
+msgstr "No s'han pogut trobar els elements RSS «item» en les dades XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "No s'ha pogut trobar els elements RSS \"channel\" en les dades XML."
+msgstr "No s'han pogut trobar els elements RSS «channel» en les dades XML."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "El canal «%s» ja existeix."
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
-msgstr "Error en carregar el canal «%s»"
+msgstr "S'ha produït un error en carregar el canal «%s»"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Quadre de canals"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Llegeix canals Atom/RSS"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, 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
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "Historial de formularis"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
 msgstr ""
-"Cal la contrasenya mestra per obrir\n"
-"la base de dades de contrasenyes"
+"Cal la contrasenya mestra per obrir\n"
+"la base de dades de contrasenyes"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Recorda la contrasenya d'aquesta pàgina?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Recorda"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "No ara"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Mai per aquesta pàgina"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Canvia l'estat de l'historial"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Activa o desactiva a la pestanya actual l'historial."
+
+#: ../extensions/formhistory/formhistory.c:598
+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:655
+msgid "Form history filler"
+msgstr "Omple el formulari de l'historial"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Emmagatzema l'historial de les dades introduïdes als formularis"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "No s'han pogut seleccionar els suggeriments\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "No hi ha pestanyes sense visitar"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Llista d'historial"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Comportament del tancament de pestanyes"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "No facis res"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Canvia a la darrera pestanya vista"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Canvia a la pestanya més nova"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Flaix a la finestra per les pestanyes inactives"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Pestanya nova següent (llista de l'historial)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Pestanya nova següent de l'historial"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Pestanya nova anterior (Llista de l'historial)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Pestanya nova anterior de l'historial"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Mostra la pestanya inactiva (Llistat d'historial)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Mostra la pestanya seleccionada actualment inactiva"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "Llista de l'historial"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"Mou a la darrera pestanya utilitzada quan es canvien o tanquen pestanyes"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Error SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Accepta"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Acceptar per aquesta sessió."
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloqueja"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "No s'ha pogut la base de dades de l'extensió: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Error a l'executar la sentència de la base de dades: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Segur que vol esborrar tots els permisos del JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Esborrar tots els permisos del JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Aquesta acció esborrarà tots els permisos del JavaScript. Per a cada pàgina "
+"web que visiti se li demanarà de nou permís."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instància del gestor"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instància al gestor global de NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configura NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"A sota hi ha una llista de totes les web i llurs polítiques. Podeu suprimir "
+"les polítiques marcant les entrades i clicant a <i>Suprimeix</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domini"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Polítiques"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Suprimeix-ho _tot"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "Permet _scripts en tots els llocs web"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Bloque_ja scripts de forma predeterminada en els dominis desconeguts"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Estableix permisos al domini de segon nivell"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Denega %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permet %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permet %s durant aquesta sessió"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Finestra del navegador"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:294
-msgid "Remember password on this page?"
-msgstr "Recorda la contrasenya d'aquesta pàgina?"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vista"
 
-#: ../extensions/formhistory/formhistory.c:299
-msgid "Remember"
-msgstr "Recorda"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:300
-msgid "Not now"
-msgstr "No ara"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Estat de la icona del menú"
 
-#: ../extensions/formhistory/formhistory.c:301
-msgid "Never for this page"
-msgstr "Mai per aquesta pàgina"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Estat de l'icona de menú per mostrar a la barra d'estat"
 
-#: ../extensions/formhistory/formhistory.c:437
-msgid "Toggle form history state"
-msgstr "Canvia l'estat de l'historial"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Sense determinar"
 
-#: ../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/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permès"
 
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mixte"
 
-#: ../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/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Denegat"
 
-#: ../extensions/formhistory/formhistory.c:668
-msgid "Form history filler"
-msgstr "Omple el formulari de l'historial"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"S'ha produït un error que ha impedit continuar a l'extensió NoJS. Hauria de "
+"desactivar-la."
 
-#: ../extensions/formhistory/formhistory.c:669
-msgid "Stores history of entered form data"
-msgstr "Emmagatzema l'historial de les dades introduïdes als formularis"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Error en l'extensió NoJS"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
-#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Motiu"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
 #, c-format
-msgid "Failed to select suggestions\n"
-msgstr "No s'ha pogut seleccionar suggeriments\n"
+msgid "Could not create configuration folder for extension: %s"
+msgstr "No s'ha pogut crear la carpeta de configuració per l'extensió: %s"
 
-#: ../extensions/history-list.vala:197
-msgid "There are no unvisited tabs"
-msgstr "No hi ha pestanyes sense visitar"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "No s'ha pogut crear la carpeta de configuració per l'extensió."
 
-#: ../extensions/history-list.vala:235
-#, c-format
-msgid "History-List"
-msgstr "Llista d'historial"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "No s'ha pogut obrir la base de dades de l'extensió."
 
-#: ../extensions/history-list.vala:275
-msgid "Tab closing behavior"
-msgstr "Comportament del tancament de pestanyes"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"No s'ha pogut configurar l'estructura de la base de dades de l'extensió."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instància d'extensió"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "La instància de l'extensió Midori per aquesta extensió"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instància d'aplicació"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
 
-#: ../extensions/history-list.vala:283
-msgid "Do nothing"
-msgstr "No facis res"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instància de base de dades"
 
-#: ../extensions/history-list.vala:289
-msgid "Switch to last viewed tab"
-msgstr "Canvia a la darrera pestanya vista"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Punter a la instància de base de dades sqlite utilitzada per aquesta extensió"
 
-#: ../extensions/history-list.vala:295
-msgid "Switch to newest tab"
-msgstr "Canvia a la pestanya més nova"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Camí a la base de dades"
 
-#: ../extensions/history-list.vala:423
-msgid "Next new Tab (History List)"
-msgstr "Nova pestanya següent (Llista de l'historial)"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Camí a la instància de base de dades sqlite utilitzada per aquesta extensió"
 
-#: ../extensions/history-list.vala:424
-msgid "Next new tab from history"
-msgstr "Nova pestanya següent de l'historial"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permet tots els llocs web"
 
-#: ../extensions/history-list.vala:433
-msgid "Previous new Tab (History List)"
-msgstr "Nova pestanya anterior (Llista de l'historial)"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Si és cert aquesta extensió no verificarà la política per a cada lloc però "
+"les permetrà."
 
-#: ../extensions/history-list.vala:434
-msgid "Previous new tab from history"
-msgstr "Nova pestanya anterior de l'historial"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Només segon nivell"
 
-#: ../extensions/history-list.vala:443
-msgid "Display tab in background (History List)"
-msgstr "Mostra la pestanya inactiva (Llistat d'historial)"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Si és cert aquesta extensió reduirà cada domini al seu segon nivell "
+"(www.example.org serà reduït a example.org)"
 
-#: ../extensions/history-list.vala:444
-msgid "Display the current selected tab in background"
-msgstr "Mostra la pestanya seleccionada actualment inactiva"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Política de domini desconeguda"
 
-#: ../extensions/history-list.vala:569
-msgid "History List"
-msgstr "Llista de l'historial"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Política a utilitzar per dominis desconeguts"
 
-#: ../extensions/history-list.vala:570
-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"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Accepta temporalment"
 
-#: ../extensions/mouse-gestures.c:301
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gesticulacions de ratolí"
 
-#: ../extensions/mouse-gestures.c:302
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
-msgstr "Controla Midori usant el ratolí"
+msgstr "Controleu el Midori emprant el ratolí"
 
 #: ../extensions/shortcuts.c:109
 msgid "Reload page or stop loading"
-msgstr "Carrega la pàgina de nou o atura la càrrega"
+msgstr "Recarrega la pàgina o atura la càrrega"
 
-#: ../extensions/shortcuts.c:176
+#: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
 msgstr "Configura les dreceres de teclat"
 
-#: ../extensions/shortcuts.c:283
+#: ../extensions/shortcuts.c:275
 msgid "Customize Sh_ortcuts…"
 msgstr "Configura les _dreceres…"
 
-#: ../extensions/shortcuts.c:320
+#: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
 msgstr "Dreceres"
 
-#: ../extensions/shortcuts.c:321
+#: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
 msgstr "Mostra i edita les dreceres del teclat"
 
-#: ../extensions/status-clock.c:174
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Rellotge a la barra d'estat"
 
-#: ../extensions/status-clock.c:175
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
-msgstr "Mostrar la data i l'hora a la barra d'estat"
+msgstr "Mostra la data i l'hora a la barra d'estat"
 
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
 msgid "Images"
 msgstr "Imatges"
 
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
 msgid "Scripts"
 msgstr "Scripts"
 
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
-msgstr "Connectors de Netscape"
+msgstr "Connectors del Netscape"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activa els connectors del Netscape"
 
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Característiques de la la barra d'estat"
 
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
 msgid "Easily toggle features on web pages on and off"
-msgstr "Activa o desactiva fàcilment funcionalitats en planes web"
+msgstr "Activa o desactiva fàcilment funcionalitats en les pàgines web"
 
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Quadre de pestanyes"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Quadre de _pestanyes"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Mostra les pestanyes en un quadre vertical"
 
 #: ../extensions/tabs-minimized.c:76
 msgid "Only Icons on Tabs by default"
-msgstr "Per defecte només icones a les pestanyes"
+msgstr "Utilitza només icones a les com a predeterminat"
 
 #: ../extensions/tabs-minimized.c:77
 msgid "New tabs have no label by default"
-msgstr "Les noves pestanyes no tenen etiqueta per defecte"
+msgstr "Les pestanyes noves no tenen cap etiqueta predeterminada"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
-msgstr "_Personalitza la barra d'eines"
+msgstr "Personalitza la barra d'eines"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 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 "
+"Seleccioneu els elements mostrats a la barra d'eines. Els elements poden ser "
 "ordenats arrossegant-los."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Elements disponibles"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Elements mostrats"
 
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar…"
-msgstr "Personalitza la barra d'e_ines…"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Personalitza la barra d'eines..."
 
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize…"
-msgstr "_Configura…"
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor de la barra d'eines"
 
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
-msgstr "Edita fàcilment la distribució de la barra d'eines"
-
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Empra el disc com a memòria cau de comunicacions HTTP"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Navegador web lleuger"
-
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "La carpeta de configuració especificada és invalida."
-
-#~ msgid "Cookies"
-#~ msgstr "Galetes"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Galetes «Flash»"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "_Bases de dades HTML5"
-
-#~ msgid "Offline Application Cache"
-#~ msgstr "Memòria cau de navegació fora de línia"
-
-#~ msgid "No filename specified"
-#~ msgstr "No s'ha especificat un nom de fitxer"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "No desar qualsevol mena de dada privada mentre es navega"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Afegeix drecera al marcador ràpid"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Afegeix drecera a l'escriptori"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Crea un llançador"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Subscriure's a aquest canal de notícies"
-
-#~ msgid "Close this window"
-#~ msgstr "Tanca aquesta finestra"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Tanca aquesta finestra"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Desfés la darrera modificació"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Refés la darrera modifcació"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Talla el text seleccionat"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Copia el text seleccionat al porta-retalls"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Enganxa el text al porta-retalls"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Suprimeix el text seleccionat"
-
-#~ msgid "Select all text"
-#~ msgstr "Selecciona tot el text"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Cerca la següent ocurrència de la paraula o frase"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Cerca l'anterior ocurrència de la paraula o frase"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Reiniciar el nivell d'ampliació"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Veure el codi font de la pàgina"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Desplaçar cap a l'esquerra"
-
-#~ msgid "Scroll down"
-#~ msgstr "Desplaçar cap avall"
-
-#~ msgid "Scroll up"
-#~ msgstr "Desplaçar cap amunt"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Desplaçament cap a la dreta"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Esborra tot el contingut de la paperera"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Obre la darrera pestanya tancada"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Afegeix una carpeta d'adreces d'interès"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Afegeix, edita o treu ginys de cerca…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Neteja les dades privades…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr ""
-#~ "Inspecciona els detalls de la pàgina i accedeix a les eines per "
-#~ "desenvolupadors…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Canvia a la pestanya anterior"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Canvia a la pestanya següent"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Canvia a la pestanya anterior"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Canvia a la pestanya següent"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Enfoca la pestanya actual"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Canvia l'enfocament entre les vistes"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Mostra només la icona de la pestanya actual"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplica la pestanya actual"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Tanca totes les pestanyes menys l'actual"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Obre les pestanyes emmagatzemades a la darrera sessió"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Mostra les preguntes més freqüents"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Obre el sistema de seguiment d'errors de Midori"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Mostra la informació sobre aquest programa"
-
-#~ msgid "Show menubar"
-#~ msgstr "Mostra la barra de menú"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Mostra barra de navegació"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Mostra el quadre lateral"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Mostra la barra d'adreces d'interès"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Mostra la barra d'estat"
-
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Checksum:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Checksum:"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Estableix el nombre de columnes i files"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Introduïu el nombre de columnes i files:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Tamany de la miniatura:"
-
-#~ msgid "Small"
-#~ msgstr "Petit"
-
-#~ msgid "Medium"
-#~ msgstr "Mitjà"
-
-#~ msgid "Big"
-#~ msgstr "Gran"
+msgstr "Edita la disposició de la barra d'eines"
 
-#~ msgid "Not available: %s"
-#~ msgstr "No disponible: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Els fitxers de recursos no estan instaŀlats"
-
-#~ msgid "Reset the last _session"
-#~ msgstr "Reiniciar la darrera _sessió"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% carregat"
-
-#~ msgid "Quit the application"
-#~ msgstr "Surt de l'aplicació"
-
-#~ msgid "_Contents"
-#~ msgstr "_Continguts"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Neteja les dades privades"
 
-#~ msgid "Show the documentation"
-#~ msgstr "Mostra la documentació"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Neteja les dades privades"
 
-#~ msgid "_Transferbar"
-#~ msgstr "Barra de _transferències"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Neteja les següents dades"
 
-#~ msgid "Show transferbar"
-#~ msgstr "Mostra la barra de transferències"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Mostra les darreres pes_tanyes obertes"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "No s'ha pogut executar la declaració de base de dades\n"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Neteja les dades provades al _sortir del Midori"
 
-#~ msgid "Show Blank page"
-#~ msgstr "Mostra pàgina en blanc"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Noms d'usuari i _contrasenyes desats"
 
-#~ msgid "All cookies"
-#~ msgstr "Totes les galetes"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Galetes i informació de llocs web"
 
-#~ msgid "Session cookies"
-#~ msgstr "Galetes de sessió"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Icones dels llocs web"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Mostra barra de fransferències"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Obre pestanyes"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Si es mostrarà la barra de transferències"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Més pestanyes obertes..."
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Mostrar el progrés a la caixa d'entrada de la localització"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "No s'ha pogut buidar l'historial: %s\n"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr ""
-#~ "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la "
-#~ "localització"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "No s'han pogut suprimir els elements antics de l'historial: %s\n"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Motors de cerca per a completar la cerca"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "No s'ha pogut afegir l'element a les adreces d'interès: %s\n"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Error actualitzant l'adreça d'interès: %s\n"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Mostrar els controls d'operació del panell"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Error suprimint element de les adreces d'interès: %s\n"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Si s'ha de mostrar els controls d'operació del panell"
+#: ../midori/midori-session.c:217
+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."
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Mostrar el marcador ràpid a les noves pestanyes"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "No s'ha pogut desar la configuració: %s"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "No s'han pogut desar les pestanyes tancades recentment. %s"
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Demanar per la carpeta destí"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"El Midori va fallar el darrer cop que es va obrir. Podeu informar del "
+"problema a %s."
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Modifica les _preferències"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Si es mostra una notificació quan acabi una transferència"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Desactiva totes les _extensions"
 
-#~ msgid "Download Manager"
-#~ msgstr "Gestor de descàrregues"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Mostra un diàleg quan el Midori falli"
 
-#~ msgid "An external download manager"
-#~ msgstr "Un gestor de descàrregues extern"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Descarta les pestanyes velles"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Obre pàgines externes a:"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Mostra el darrer informe de fallada"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "On s'obren de forma externa les pàgines obertes"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Executa en el depura_dor"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Accepta galetes"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+"Ja s'està executant una altra instància del Midori, però no respon.\n"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Quins tipus de galetes s'accepten"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "No s'han pogut carregar les adreces d'interès: %s\n"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Edat màxima de la galeta"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "No s'ha pogut carregar la sessió: %s\n"
 
-#~ msgid "Maximum history age"
-#~ msgstr "Edat màxima de l'historial"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "No s'han pogut carregar les pestanyes tancades recentment. %s\n"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Recordar els darrers fitxers descarregats"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "No s'ha pogut carregar l'historial: %s\n"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "S'han produït els següents errors:"
 
-#~ msgid "Not found - %s"
-#~ msgstr "No s'ha trobat «%s»"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignora"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "De_sa el destí de l'enllaç"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "No s'ha pogut obrir la base de dades de l'extensió: %s"
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Descarrega el destí de l'enllaç"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Esteu segur que voleu suprimir tots els permisos de galetes?"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Descarrega amb el _gestor de descàrregues"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Voleu suprimir tots els permisos de galetes?"
 
-#~ msgid "Download I_mage"
-#~ msgstr "Descarrega la i_matge"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Aquesta acció suprimirà tots els permisos de les galetes. Es tornarà a "
+"demanar permisos de nou per a cada web que visiteu."
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "El document no es pot mostrar"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Gestor de permisos de galetes"
 
-#~ msgid "General"
-#~ msgstr "General"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instància de l'actual gestor de permisos de galeta"
 
-#~ msgid "Appearance"
-#~ msgstr "Aparença"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Configura els permisos de galetes"
 
-#~ msgid "Font settings"
-#~ msgstr "Paràmetres del tipus de lletra"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Força 96 PPP"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Política de galetes dels dominis que no són a la llista: "
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Força una densitat de punt de 96 PPP"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Pregunta per poder prendre una decisió"
 
-#~ msgid "Interface"
-#~ msgstr "Interfície"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"Ha succeït un error fatal que no permet que l'extensió de gestió de permisos "
+"de les galetes finalitzi la seva tasca. L'hauria de desactivar."
 
-#~ msgid "Navigationbar"
-#~ msgstr "Barra de navegació"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Error a l'extensió del gestor de permisos de les galetes."
 
-#~ msgid "Applications"
-#~ msgstr "Aplicacions"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+"No s'ha pogut determinar la política global de galetes configurada per al "
+"domini: %s"
 
-#~ msgid "External applications"
-#~ msgstr "Aplicacions externes"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Fins al final de la sessió"
 
-#~ msgid "Web Cookies"
-#~ msgstr "Galetes de web"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "El lloc web %s vol emmagatzemar %d galetes."
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Esborrar les galetes quan sortiu de Midori"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "El lloc web %s vol emmagatzemar una galeta."
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Esborrar les galetes antigues després d'una hora"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Unes quantes webs volen emmagatzemar en total %d galetes."
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Esborrar les galetes antigues després d'una setmana"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Accepta"
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Esborrar les galetes antigues després d'un mes"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Accepta per aquesta _sessió"
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Esborrar les galetes antigues després d'un any"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "De_nega"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configura els filtres de _publicitat…"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Denegar _aquest cop"
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Obre la carpeta de l'afegitó seleccionat"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Ruta"
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Pestanya següent (Llista de l'historial)"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Valor"
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Pestanya anterior (Llista de l'historial)"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Data d'expiració"
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Pestanya anterior de l'historial"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"La política a fer servir per dominis no està configurada de forma "
+"individual. Això només actua per restringir la política global de galetes "
+"declarada en la configuració de Midori."
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Canvia de pestanya amb Ctrl-Tab ordenades per darrer ús"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Gestor de seguretat de les galetes"
 
-#~ msgid "Pageholder"
-#~ msgstr "Contenidor de la pàgina"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Gestiona els privilegis de les galetes per a cada lloc web"
 
-#~ msgid "_Pageholder"
-#~ msgstr "Contenidor de la _pàgina"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Mantè un o múltiples pàgines obertes a les pestanyes en paraŀlel"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Desenganxar el panell triat de la finestra"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Error al crear un nou llançador. (%s): %s"
 
-#~ msgid "Hide operating controls"
-#~ msgstr "Oculta els controls d'operació"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "S'ha creat un llançador"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Corrector ortogràfic"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Ara podeu obrir <b>%s</b> des del vostre llançador o menú"
 
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Una llista d'idiomes separats per coma que seran usats per a la correcció "
-#~ "ortogràfica, per exemple \"ca_ES,en_GB,de_DE\""
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Error al crear el llançador"
 
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "No s'ha pogut buidar l'historial de cerques: %s\n"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplicacions"
 
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimitza la pestanya _actual"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "_Perfil nou"
 
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimitza la pestanya actual"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Crea un nou perfil independent i un llançador"
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Diccionaris:"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "_Aplicació nova"
 
-#~ msgid "Console"
-#~ msgstr "Consola"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Crea una aplicació nova per a un lloc web determinat"
 
-#~ msgid "Copy _All"
-#~ msgstr "Copia _tot"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Error a l'executar"
 
-#~ msgid "Copy All"
-#~ msgstr "Copia tot"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Crea _Llançador"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Gestor de galetes"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Gestor d'aplicacions web"
 
-#~ msgid "External Applications"
-#~ msgstr "Aplicacions externes"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Gestiona els llocs web instal·lats com a aplicacions"
 
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Associar esquemes URL amb comandes externes"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transferències"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Restaura la pestanya"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Netejar-ho tot"
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimitza la pestanya"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Error a l'obrir la descàrrega: %s"
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Copia «%s» a la carpeta «%s»."
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "_Obre la carpeta destí"
 
-#~ msgid "Minimize new Tabs"
-#~ msgstr "_Minimitza les noves pestanyes"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copia la _localització de l'enllaç"
 
-#~ msgid "New tabs open minimized"
-#~ msgstr "Les noves pestanyes s'obren minimitzades"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "S'ha baixat el fitxer «<b>%s</b>»."
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "Pàgines visitades _recentment"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' i %d altres arxius s'han descarregat."
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Reobre pàgines que heu visitat anteriorment"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transferència finalitzada"
 
-#~ msgid "Original cookies only"
-#~ msgstr "Només galetes originals"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "S'estan baixant fitxers"
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Recordar les darreres pàgines visitades"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Surt del Midori"
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Si les darreres pàgines visitades es desaran"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Les transferències es cancel·laran si surtiu del Midori."
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Detecta automàticament el servidor intermediari"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Gestor de transferències"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr ""
-#~ "Si s'ha de detectar el servidor proxy automàticament des de l'entorn"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Visualitza els fitxers baixats"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Rellotge erroni"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Error en l'actualització de la base de dades: %s"
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual."
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Error al seleccionar des de la base de dades: %s"
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Estableix el nombre de dreceres"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Introduïeu el nombre de dreceres:"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a "
-#~ "la carpeta %s."
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestor de pestanyes i sessions."
 
-#~ msgid "Open _Link"
-#~ msgstr "Obre l'_enllaç"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Open Image in New Wi_ndow"
-#~ msgstr "Obre la imatge en una nova fi_nestra"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Aquesta extensió ofereix una cua de tasques per actualitzar treballs o "
+"esdeveniments recurrents."
 
-#~ msgid "Not available on this platform"
-#~ msgstr "No disponible en aquesta plataforma"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Error afegint una nova nota a la base de dades: %s\n"
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "No s'ha pogut obtenir l'hora actual: %s\n"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Error esborrant una nota de la base de dades: %s\n"
 
-#~ msgid "View Selection Source"
-#~ msgstr "Veure el codi font de la selecció"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Error reanomenant la nota: %s\n"
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Veure el codi font de la selecció"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Error actualitzant la nota :%s\n"
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Mostra els _títols dels panells"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notes"
 
-#~ msgid "Options"
-#~ msgstr "Opcions"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nota nova"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Encongeix les imatges automàticament"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Crea una nota nova sense relació amb les pàgines obertes"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Redueix les imatges automàticament per a encabir-les"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova nota"
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Activa les eines per a desenvolupadors"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Error al seleccionar des de la base de dades de notes: %s\n"
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Activa extensions especials per a desenvolupadors"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Reanomena la nota"
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Aplica un color diferent a les pestanyes"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copia la nota al porta-retalls"
 
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Precarrega les adreces IP dels enllaços"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Suprimeix la nota"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Recorda les darreres entrades dels formularis"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copia la selecció com a nota"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Si les entrades dels darrers formularis s'han d'emmagatzemar"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Mida de la memòria cau"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueig de publicitat"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Mida límit de la memòria cau"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloca els anuncis publicitaris segons una llista de filtres"
 
-#~ msgid "Encoding"
-#~ msgstr "Codificació"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configura els filtres de publicitat"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "La codificació de caràcters per defecte"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_oca imatge"
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Àrees de text de mida modificable"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_oca enllaç"
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Si es pot canviar la mida de les àrees de text"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Edita la regla"
 
-#~ msgid "User_styles"
-#~ msgstr "E_stils personals"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regla:"
diff --git a/po/ckb.po b/po/ckb.po
new file mode 100644 (file)
index 0000000..c672bef
--- /dev/null
+++ b/po/ckb.po
@@ -0,0 +1,3426 @@
+# Kurdish (Sorani) translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-03-22 15:15+0000\n"
+"Last-Translator: Nali Ali <Unknown>\n"
+"Language-Team: Kurdish (Sorani) <ckb@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "میدۆری"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "وێبگه‌ڕ"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "وێبگه‌ڕی میدۆری"
+
+#: ../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:1611
+msgid "New Tab"
+msgstr "تابێکی نوێ"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "پەنجەرەیەکی نوێ"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "پەنجەرەیەکی نوێ بۆ وێبگەرانی شەخسی"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "وێبگەرانی شەخسی میدۆری"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "وێبگەرانی شەخسی"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "پەنجەرەیەکی نوێ بۆ وێبگەرانی شەخسی بکەرەوە"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "وێنەکەو پاشەکەوت کرا بۆ: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "ناونیشانەکە وەکوو بەرنامە پیشان بە"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ناونیشان"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "بوخچە"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "وێبگەرانی شەخسی - گۆڕانکاریەکان پاشەکەوت ناکرێن"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "پەنجەرەیەکی سادەی +GTK لەگەڵ WebKit, پێکچوو بۆ GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "دیالۆگێکی دەستنیشانکەر پیشانبدە"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "فەرمان لیست بکە بۆ  جێبەجێکردن لەگەڵ -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "وەشانی بەرنامەکە پیشانبدە"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "ناونیشانەکان"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "شێواز"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "دوای SECONDS چركەی بێچالاکی میدۆری نوێکەرەوە"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "هەڵه: \"gdb\" نەدۆزرایەوە\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "تکایە هەڵەی بەرنامە بنێرە بۆ:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "بۆ وەشانی نوي بڕۆ بۆ:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "هەڵەیەکی نەناسراو ڕوویدا"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "ـخوازراوەکان"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "خوازراوەکە پاشەکەوتکە"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_زیادکراوەکان"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_مێژوو"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_سکریپتی بەکارهێنەر"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "شێوازی_بەکارهێنەر"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "تابی_نوێ"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_تابی داخراوو"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "په‌نجه‌ره‌_نوێ"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_بەرگێکی نوێ"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[ناونیشان]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "فایلەکە نەدۆزرایەوە"
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "شانکی خراپ"
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "بەرەوپێش بۆ لاپەڕەى داهاتوو"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "گەڕان"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "لاپەڕەى ئێستا تازە بکەرەوە"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "کردنەوەی لاپەڕەى ئێستا بوەستێنە"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "نوێکاری %s شکستی هێنا\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "دانانەوەى چاوەروان نەكراو '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "كارى چاوەروان نەكراو '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "(وێبگەڕانی شەخسی)%s"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "هەڵبژاردنی [ نووسين ]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "دڵخوازەکان"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "بوخچه‌یه‌كی نوێ"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "گۆڕینی بوخچە"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "دڵخوازێکی نوێ"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "دڵخوازەکە بگۆڕە"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "فایل پاشەکەوتکە"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "پەنجەرەيێكى نوێ کرایەوە"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "تابێکی نوێ کرایەوە"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "پاشەکەوتکردن"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "فایلێک بکەرەوە"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "بەتاڵ"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "ارۆرا"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "کازەهەکازە"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "ۆپێرا"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "كۆنكوێره‌"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "ێپیفانی"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "فایەرفۆکس (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "میدۆری 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "دڵخوازەکانی Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "وێبگەڕێکی سووكە كێش"
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Nali Ali https://launchpad.net/~nali-ali-k\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_په‌ڕگه‌"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "پەنجەرەيێكى نوێ بکەرەوە"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "تابێکی نوێ بکەرەوە"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "په‌ڕگه‌ بكه‌ره‌وه‌"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_لاپەڕەکە پاشەکاوتبکە وەک..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "پاشەکەوتکردن بۆ بەرگەیەک"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_ده‌ستكاریی"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_دۆزینەوە..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "لەم لاپەڕەیا بۆ وشەیەک بگەڕێ"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "پاش_ئه‌وه‌ بدوۆزه‌ره‌وه‌"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "دۆزینه‌وه‌ی_پێشوو"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_بینین"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "DOM Source_ببینە"
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "سکڕۆڵ _بۆ چەپ"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "سکڕۆڵ _بۆ خوارەوە"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "سکڕۆڵ _بۆ سەرەوە"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "سکڕۆڵ _بۆ ڕاست"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_دیار"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_بڕۆ"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "بڕۆ بۆ لاپەڕەی پێشوو"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "بۆ پێشەوە"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "لاپەڕەی سەرەتا"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "بڕۆ بۆسەر لاپەڕەی سەرەتا"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "بەتاڵکردنەوەی تەنەکەخۆڵ"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "دانانی _بەرگێکی نوێ"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_گه‌ڕانه‌وه‌ی دانه‌"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_داهاتوو دانه‌"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_یارمه‌تی"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_ئامراز"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "گەڕان"
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "بگەڕێ"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "لیسته‌"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "پیشاندانی لاپەڕەی سەرەتا"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "پیشاندانی لاپەڕەی بەتاڵ"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 9a4efb7a496bf9fd689b99fa7e1b09588ffa6891..5df070474beeabc80e14ce66e3c5202fb469c03a 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
 # This file is distributed under the same license as the home package.
 # David Stancl <dstancl@dstancl.cz> 2009
 # Michal Varady <miko.vaji@gmail.com> 2011-2012
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-30 03:33+0000\n"
-"PO-Revision-Date: 2012-02-24 01:20+0100\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:31+0000\n"
 "Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
 "Language-Team: Czech < >\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Poedit-Language: Czech\n"
+"X-Launchpad-Export-Date: 2014-11-27 05:45+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
+"Language: \n"
+"X-Poedit-Language: Czech\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:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Internetový prohlížeč"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Internetový prohlížeč Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Prohlížet internet"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nové okno soukromého prohlížení"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nová karta"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nové okno"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Internetový prohlížeč"
+msgid "New Private Browsing Window"
+msgstr "Nové okno soukromého prohlížení"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori - soukromé prohlížení"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Nové okno soukromého prohlížení"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Soukromé prohlížení"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Nové okno soukromého prohlížení"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Snímek uložen do: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Spustit řetězec ADRESA jako webovou aplikaci"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESA"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Použít řetězec SLOŽKA jako složku konfigurace"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "SLOŽKA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Soukromé prohlížení, bez uložení změn"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 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:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Obyčejné okno s jádrem WebKit, obdoba GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Zobrazit diagnostické dialogové okno"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Spustit v gdb a uložit ladicí informace v případě pádu"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Spustit zadaný soubor jako javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Získat snímek zadané adresy URI"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Spustit zadaný příkaz"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Seznam dostupných příkazů spustitelných s parametrem -e / --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Zobrazit verzi programu"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresy"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blokovat adresy URI pomocí regulárního výrazu REGVÝRAZ"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "REGVÝRAZ"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Restartovat aplikaci Midori po SEKUNDY sekund neaktivity"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDY"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Chyba: program \"gdb\" nebyl nalezen\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Komentáře, požadavky a hlášení o chybách posílejte na:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Zjistěte dostupnost nové verze na:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Došlo k neznámé chybě"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Záložky"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Přidat záložku"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Rozšíření"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historie"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Uživatelské skripty"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Uživatelské _styly"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nová _karta"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Přenosy"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Zásuvné moduly ap_likace Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Zavřené karty"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nová _složka"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adresy]"
 
@@ -231,134 +232,146 @@ msgstr "Nesprávný formát dokumentu."
 msgid "Unrecognized bookmark format."
 msgstr "Neznámý formát záložek."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Přejít na následující podstránku"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Hledat na webu…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Znovu načíst tuto stránku"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Zastavit načítání této stránky"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Nepodařilo se aktualizovat titulek: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Hodnota '%s' je pro %s neplatná"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Neočekávané nastavení '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Neočekávaná akce '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Soukromé prohlížení)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Nová složka"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Upravit složku"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
-msgstr "Nová záložka"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Upravit záložku"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:973
-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:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:1029
+#: ../midori/midori-browser.c:1185
 msgid "Add to _Speed Dial"
 msgstr "Přidat do _rychlého přístupu"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Zobrazit v panelu _nástrojů"
-
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Spustit jako _webovou aplikaci"
-
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Uložit soubor jako"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Uložit připojené _zdroje"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Bylo otevřeno nové okno"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Byla otevřena nová karta"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Chyba při otevírání obrázku!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 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:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Chyba při stahování obrázku."
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Vybraný obrázek se nepodařilo stáhnout."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Uložit soubor"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Znovu načíst stránku bez použití mezipaměti"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Otevřít soubor"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -367,36 +380,29 @@ msgid ""
 "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."
+"RSS). Obvykle se v něm nachází položka nabídky nebo tlačítko \"Nový kanál\" "
+"(nebo s podobným názvem). Další možností je změna nastavení aplikace Midori "
+"(Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Dalším "
+"kliknutím na ikonu RSS přidáte kanál přímo do čtečky."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nový kanál"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Přidat novou záložku"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Sdílet tuto stránku"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Prázdné"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Přepíná navigaci pomocí kurzoru"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -404,111 +410,101 @@ 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:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Povolit ovládání ku_rzorem"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Otevřít všechny v _kartách"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Otevřít v nové _kartě"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Otevřít v novém _okně"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importovat záložky…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importovat záložky"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplikace:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importovat ze souboru typu XBEL, nebo HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importovat ze souboru"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Nepodařilo se naimportovat záložky"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Záložky ve formátu XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Záložky z aplikace Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "Z aplikace Midori lze exportovat záložky pouze ve formátech XBEL (*.xbel) a "
 "Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Nepodařilo se exportovat záložky"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Odlehčený internetový prohlížeč."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "about:version zobrazí informace o verzi"
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -519,368 +515,389 @@ 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:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
-"Michal Várady <miko.vaji@gmail.com>"
+"Michal Várady <miko.vaji@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Alex Strnádek https://launchpad.net/~lexaxelaexl\n"
+"  David Štancl https://launchpad.net/~dstancl-dstancl\n"
+"  Hlobil Vaclav https://launchpad.net/~vaclav-hlobil\n"
+"  Honza Lafek https://launchpad.net/~hlafek99\n"
+"  Konki https://launchpad.net/~pavel-konkol\n"
+"  Michal Várady https://launchpad.net/~michal.varady"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Z_dvojit aktuální kartu"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Otevřít nové okno"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Otevřít novou kartu"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nové okno souk_romého prohlížení"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Otevřít soubor"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Uložit stránku j_ako…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Uložit do souboru"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Přidat do rychlého _přístupu"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Přihlásit se k odběru _kanálu"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Zavřít kartu"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Zavřít aktivní kartu"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Z_avřít okno"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Sdílet"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Vytisknout tuto stránku"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Zavřít _všechna okna"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Na_jít…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Najít slovo nebo frázi na stránce"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Najít _další"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Najít _předchozí"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Změnit nastavení aplikace"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Pane_ly nástrojů"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Znovu načíst stránku bez použití mezipaměti"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Přiblížit"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Oddálit"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kódování"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Zobrazit zdro_jový kód"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Prohlížení ku_rzorem"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Přepnout zobrazení na celou obrazovku"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Posunout v_levo"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Posunout _dolů"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Posunout nahor_u"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Posunout vp_ravo"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Č_tecí mód"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Přejít"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Přejít zpět (na předchozí stránku)"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Přejít na předchozí podstránku"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Domovská stránka"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Přejít na domovskou stránku"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Vyprázdnit seznam zavřených karet"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "_Znovu otevřít zavřenou kartu"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Přidat novou _složku"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exportovat záložky"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "Nastavit vy_hledávací nástroje"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Vymazat osobní data"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Pro_zkoumat stránku"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Předchozí karta"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Další karta"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Přesunout kartu na _začátek"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Přesunout kartu v_zad"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Přesunout kartu v_před"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Přesunout kartu na _konec"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "_Přepnout kurzor na tuto kartu"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Přepnout na _další"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Zobrazit pouze ikonu a_ktuální karty"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "Z_dvojit aktuální kartu"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Zavřít ostatní karty"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Otevřít poslední _relaci"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Časté _otázky"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Ohlásit chy_bu…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Ná_stroje"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Nabídka"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigační panel"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Postranní _panel"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Postranní panel"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Panel _záložek"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Stavový panel"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatické"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Čínské tradiční (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Čínské zjednodušené (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonské (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korejské (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ruské (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Západní (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Vlastní…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Nepodařilo se inicializovat historii: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Oddělovač"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "U_místění…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Otevřít konkrétní umístění"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Hledat na webu…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Spustí vyhledávání na webu"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Znovu otevřít zavřenou kartu nebo okno"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Zobrazit uložené záložky"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Karty"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Zobrazit seznam všech otevřených karet"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Nabídka"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Nabídka"
 
@@ -889,34 +906,34 @@ msgstr "Nabídka"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Nastavení rozšíření '%s' nelze načíst: %s\n"
 
-#: ../midori/midori-extension.c:880 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportovat certifikát"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Podepsaný certifikát není znám."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 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:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -924,40 +941,40 @@ msgstr ""
 "Certifikát byl odmítnut na základě seznamu odvolaných certifikátů od "
 "GTIsConnection."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Certifikační algoritmus není považován za důvěryhodný."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Při ověřování certifikátu došlo k chybě."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportovat certifikát"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Podepsán sebou samým (self-signed)"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Podrobnosti o zabezpečení"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Vložit a s_pustit"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Neověřené spojení"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Ověřené a šifrované spojení"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Ověřené, nešifrované spojení"
 
@@ -974,421 +991,433 @@ msgstr "Zavřít panel"
 msgid "Align sidepanel to the left"
 msgstr "Umístit postranní panel vlevo"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "zobrazit rychlý přístup"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "zobrazit domovskou stránku"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "zobrazit naposledy otevřené karty"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "zobrazit naposledy otevřené karty bez načtení"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "zobrazit prázdnou stránku"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "zobrazit výchozí vyhledávač"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "zobrazit vlastní stránku"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonské (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "nové kartě"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "novém okně"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "aktuální kartě"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "výchozí"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "ikony"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "malé ikony"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "text"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "ikony a text"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "text pod ikonami"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "automaticky (GNOME, nebo jiné prostředí)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "server proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "žádný server proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Styl panelu nástrojů"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Vždy použít mnou zvolená písma"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 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-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Konfiguraci nelze načíst: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Neplatná hodnota '%s' konfigurace"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Nepodařilo se aplikovat soubor se styly: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Zobrazit _popisek karty"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Zobrazit jen _ikonu karty"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Důvěřovat tomuto webu"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Neznámé zabezpečení"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s chce uložit data do databáze HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Zakázat"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Povolit"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s chce zjistit vaši polohu."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Chyba - %s"
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Stránku '%s' nelze načíst."
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Zkusit znovu"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Chyba - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Něco nesprávného se přihodilo s '%s'"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Zkusit znovu"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Poslat zprávu pro %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Přidat vy_hledávací nástroj..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Prozkouma_t prvek"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Otevřít odkaz v nové _kartě"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Otevřít odkaz v nové kartě a _zobrazit ji"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Otevřít odkaz v nové kartě na _pozadí"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Otevřít odkaz v novém _okně"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Otevřít odkaz jako _webovou aplikaci"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Zkopírovat _cíl odkazu"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Uložit j_ako…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Otevřít _obrázek v novém okně"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Otevřít _obrázek v nové kartě"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Zkopírovat _adresu obrázku"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Uložit o_brázek"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Otevřít v prohlížeči _obrázků"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Zkopírovat _adresu videa"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Uložit _video"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Stáhnout _video"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otevřít adresu v nové _kartě"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Hledat _pomocí"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Hledat na webu"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Otevřít adresu v nové _kartě"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Otevřít _rám v nové kartě"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Prozkouma_t prvek"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Otevřít nebo stáhnout soubor z %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Název souboru: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Typ souboru: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Typ souboru: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, 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:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Otevřít %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Prohlížení stránky - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Dokumentace není nainstalována"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Aplikace Midori neukládá žádné osobní údaje:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Neukládá se historie, ani cookies."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Rozšíření jsou zakázána."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 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:4417
+#: ../midori/midori-view.c:3902
 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:4418
+#: ../midori/midori-view.c:3903
 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:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Přednačítání DNS záznamů je zakázáno."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 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:4511
-msgid "Page loading delayed"
-msgstr "Načítání stránky pozdrženo"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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í."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Načíst stránku"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Prázdná stránka"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "Z_dvojit kartu"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Zobrazit _popisek karty"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Zobrazit jen _ikonu karty"
-
-#: ../midori/midori-view.c:4904
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "předchozí"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "následující"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Tisknout obrázky na pozadí"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Určuje, zda se vytisknou obrázky na pozadí"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Rozšíření"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1396,7 +1425,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1404,7 +1433,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1413,27 +1442,27 @@ msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "- zbývá %s"
+msgstr " - zbývá %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "? B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Stažený soubor obsahuje chyby."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1441,131 +1470,127 @@ 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:345
+#: ../midori/midori-download.vala:366
 #, 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:347
+#: ../midori/midori-download.vala:368
 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:350
+#: ../midori/midori-download.vala:371
 #, 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:352
+#: ../midori/midori-download.vala:373
 #, 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
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Rychlý přístup"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Záložku přidáte kliknutím"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Vložte adresu záložky"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Vložte název záložky"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Při spuštění"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Po spuštění aplikace Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Domovská stránka:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Použít _stávající stránku"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Použít stávající stránku jako domovskou"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Písma"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proporcionální písmo"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Výchozí písmo pro zobrazení textu"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Výchozí velikost písma pro zobrazení textu"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Neproporcionální písmo"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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
+#: ../midori/midori-preferences.c:351
 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
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimální velikost písma"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Minimální velikost fontu použitého pro zobrazení"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Upřednostňované kódování"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Chování"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Automaticky načítat obrázky"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Povolit kontrolu pravopisu"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Povolit skripty"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Povolit podporu WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Povolit zásuvné moduly aplikace Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Zvětšovat text i obrázky"
@@ -1579,11 +1604,19 @@ 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:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Upřednostňované jazyky"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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,118 +1624,118 @@ 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-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Ukládat stažené soubory do:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Prohlížení"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Styl panelu nástrojů:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Nové stránky otevírat v:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Na nové kartě:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Ikona zavření karty"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Vždy zobrazit panel karet"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Otevřít kartu vedle aktivní"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Otevírat karty na pozadí"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Textový editor"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Čtečka RSS"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Síť"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Název hostitele"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Podporované typy proxy:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Mezipaměť stránek"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Maximální velikost diskové mezipaměti stránek"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Hlásit se jako"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Smazat stará cookies po:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Maximální počet dní, po které jsou cookies platná."
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Přijímat cookies pouze z navštívených stránek"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blokovat cookies z jiných stránek"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1710,126 +1743,125 @@ msgstr ""
 "V cookies se ukládají přihlašovací údaje, stavy her nebo uživatelská data "
 "pro reklamní účely."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Povolit mezipaměť pro offline aplikace"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 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/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Odstranit detaily o referující adrese při odesílání"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 "Určuje, zda bude referenční hlavička \"Referer\" zkrácena na pouhý název "
 "hostitele"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Smazat stránky z historie po:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 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-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Rozšíření"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Nastavit vy_hledávací nástroje"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Přidat vyhledávací nástroj"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Upravit vyhledávací nástroj"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Název:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Popis:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Zkratka:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Spravovat vyhledávací nástroje"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Použít jako _výchozí"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Vyhledávací nástroje nelze načíst.%s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Vyhledávací nástroj nelze uložit. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historie"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Nepodařilo se inicializovat historii: %s"
+msgid "Search for %s"
+msgstr "Vyhledat %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Nepodařilo se načíst údaje z historie: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Vyhledat %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Hledat pomocí…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Hledat %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Otevřít s"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Nelze spustit externí program."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Nesprávné URI"
 
@@ -1854,46 +1886,103 @@ msgstr "Rozlišovat velikost písmen"
 msgid "Close Findbar"
 msgstr "Zavřít panel hledání"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Přidání záložky se nezdařilo: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Nepodařilo se aktualizovat záložku: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-bookmarks.c:535
-msgid "Edit the selected bookmark"
-msgstr "Upravit vybranou záložku"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:543
-msgid "Delete the selected bookmark"
-msgstr "Smazat vybranou záložku"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:558
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Upravit vybranou záložku"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Smazat vybranou záložku"
+
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Přidat novou složku"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Oddělovač</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otevřít v nové _kartě"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Hledat v záložkách"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historie"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Dnes"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Včera"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1901,33 +1990,33 @@ msgstr[0] "Před %d dnem"
 msgstr[1] "Před %d dny"
 msgstr[2] "Před %d dny"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Před týdnem"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Nepodařilo se odstranit položku historie: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Opravdu chcete smazat všechny položky historie?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Uložit vybranou položku historie do záložek"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Smazat vybranou položku historie"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Smazat celou historii"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Hledat v historii"
 
@@ -1955,114 +2044,63 @@ msgstr "Heslo"
 msgid "_Remember password"
 msgstr "Zapamatovat si _heslo"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Ikonu '%s' nelze načíst"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Uloženou ikonu '%s' nelze načíst"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Snímky animace jsou porušené"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "není"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Vlastnost '%s' je pro %s neplatná"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Zvolit soubor"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Zvolit složku"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hodině"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dni"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 týdnu"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 měsíci"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 roce"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Nastavení pro %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Kontrolní součet MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Kontrolní součet SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Nastavení filtrů blokování reklamy"
-
-#: ../extensions/adblock.c:512
-#, 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."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Upravit pravidlo"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "P_ravidlo:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_okovat obrázek"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_okovat odkaz"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Blokování reklamy"
-
-#: ../extensions/adblock.c:1926
-msgid "Block advertisements according to a filter list"
-msgstr "Blokovat reklamu podle seznamu filtrů"
-
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "Tato stránka obsahuje uživatelský skript. Chcete jej nainstalovat?"
 
 #: ../extensions/addons.c:223
@@ -2082,16 +2120,16 @@ msgstr "_Instalovat uživatelský styl"
 msgid "Don't install"
 msgstr "Neinstalovat"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Uživatelské skripty"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Uživatelské styly"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Chyba"
 
@@ -2113,40 +2151,40 @@ msgstr "Smazat uživatelský styl"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Soubor <b>%s</b> bude smazán."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Otevřít v textovém editoru"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Otevřít cílovou složku"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Přidat nový zásuvný přídavek"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Odstranit vybraný přídavek"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Uživatelské přídavky"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Nelze sledovat složku '%s': %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Podpora uživatelských skriptů a stylů."
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Barevné karty"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Obarvit každou kartu zvlášť"
 
@@ -2155,11 +2193,11 @@ msgstr "Obarvit každou kartu zvlášť"
 msgid "Cookie Manager"
 msgstr "Správce cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Smazat vše"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2167,31 +2205,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:116
 msgid "Expand All"
 msgstr "Rozbalit vše"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Sbalit vše"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Opravdu chcete smazat všechna cookies?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Dotaz"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Na konci relace"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2209,15 +2247,15 @@ msgstr ""
 "<b>Vyprší</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ano"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ne"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2226,20 +2264,20 @@ msgstr ""
 "<b>Doména</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Název"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Rozbalit _vše"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Sbalit vše"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Hledat cookies podle názvu nebo domény"
 
@@ -2259,24 +2297,38 @@ msgstr "Zkopírovat adresy z karet"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Zkopíruje do schránky adresy ze všech karet"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Zpožděné načítání"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Před načtením stránky počkat (v sekundách):"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Počkat s načítáním stránky"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "Nastala chyba při stahování souboru pomocí pluginu:\r\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2316,25 +2368,25 @@ 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."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Poslední aktualizace: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Kanály"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Přidat nový kanál"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Smazat kanál"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Kanály"
 
@@ -2353,37 +2405,37 @@ msgstr "Nepodporovaný formát kanálu."
 msgid "Failed to parse XML feed: %s"
 msgstr "Nepodařilo se zpracovat kanál XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Nepodařilo se najít element \"channel\" v datech RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Nepodporovaná verze RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 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."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 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."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Kanál '%s' již existuje"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Chyba při načítání kanálu '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel kanálů"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Čte Atom/RSS kanály"
 
@@ -2404,121 +2456,395 @@ msgstr ""
 "Pro otevření databáze hesel je\n"
 "zapotřebí zadat hlavní heslo"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Zapamatovat si heslo na této stránce?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Ano"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Nyní ne"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nikdy pro tuto stránku"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Přepnout stav historie formulářových dat"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Zapnout, nebo vypnout historii formulářových dat pro aktivní kartu"
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Nepodařilo se otevřít databázi: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Ukládání hodnot ve formuláři"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Ukládá historii dat vložených do formulářů"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Nepodařilo se vybrat návrh\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Žádné nenavštívené karty"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Historie"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Při zavření karty"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "nedělat nic"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "přepnout na poslední prohlíženou kartu"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "přepnout na naposledy přidanou kartu"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Blikání okna při otevření karty na pozadí"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Další nová karta (v historii)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Zvolí další novou kartu z historie"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Předchozí nová karta (v seznamu historie)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Zvolí předchozí novou kartu z historie"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Zobrazit kartu na pozadí (Seznam historie)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Zobrazí vybranou kartu na pozadí"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Seznam historie"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Při přepínání nebo zavírání karet přesunout do naposledy použitých"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL selhalo: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Přijmout"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Přijmout pro sezení"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Odmítnout"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Nepodařilo se spustit databázový příkaz: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Doména"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Oprávnění"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Smazat _vše"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Neurčeno"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Důvod"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Nepodařilo se otevřít databázi pro rozšíření."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Nelze vytvořit databázovou strukturu pro rozšíření."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instance rozšíření"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Instance rozšíření pro toto rozšíření"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instance aplikace"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Instance aplikace Midori tohoto rozšíření náleží"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instance databáze"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Ukazatel na instanci databáze sqlite používaný tímto rozšířením"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Cesta k databázi"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Cesta k sqlite databázi, která je používána tímto rozšířením"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gesta myší"
@@ -2547,11 +2873,11 @@ msgstr "Klávesové zkratky"
 msgid "View and edit keyboard shortcuts"
 msgstr "Zobrazí a umožní změnu klávesových zkratek"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Hodiny ve stavovém řádku"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Zobrazuje datum a čas ve stavovém řádku"
 
@@ -2567,6 +2893,10 @@ msgstr "Uživatelské skripty"
 msgid "Netscape plugins"
 msgstr "Zásuvné moduly aplikace Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Povolit zásuvné moduly aplikace Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Rozšíření stavové lišty"
@@ -2575,31 +2905,31 @@ msgstr "Rozšíření stavové lišty"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Jednoduše zapíná a vypíná rozšíření webových stránek"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panel karet"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Panel _karet"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Zobrazí karty ve svislé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 "Ve výchozím stavu na kartách zobrazovat pouze 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"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Upravit panel nástrojů"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2607,67 +2937,58 @@ msgstr ""
 "Vybrané položky se zobrazí na panelu nástrojů. Změnu pořadí položek "
 "provedete přetažením."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Dostupné položky"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Zobrazené položky"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Upravit pane_l nástrojů…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor panelu nástrojů"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Umožňuje jednoduše změnit rozvržení panelu nástrojů"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Nepodařilo se načíst cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Vymazat osobní data"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Vymazat osobní data"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Vymazat následující data:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Naposledy otevřené _karty"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Vymazat _osobní data při ukončení aplikace Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Uložené _přihlašovací údaje"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies a data stránek"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Ikony webových stránek"
 
@@ -2675,188 +2996,130 @@ msgstr "Ikony webových stránek"
 msgid "Open tabs"
 msgstr "Otevřít v kartách"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Další otevřené karty..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Nepodařilo se smazat historii: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Nepodařilo se odstranit staré položky historie: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "kvůli připojení staré databáze"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "kvůli importu ze staré databáze"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "kvůli obnově stavu před transakcí"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "kvůli odpojení databáze"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Nepodařilo se vytvořit tabulku záložek %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Přidání záložky se nezdařilo: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Nepodařil se import ze staré databáze %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Záložky nelze uložit. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nelze ověřit."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Konfiguraci nelze uložit. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Relaci nelze načíst: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Relaci nelze uložit. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Seznam zavřených karet nelze uložit. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Aplikace Midori zřejmě minule nebyla řádně ukončena. V případě opakujících "
-"se potíží použijte k jejich odstranění následující možnosti."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Změnit _nastavení"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Zakázat všechna _rozšíření"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Zobrazit dialog po pádu aplikace Midori"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Zahodit staré karty"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Zobrazit záznam pos_ledního pádu"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Spustit v _debuggeru"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Instance aplikace Midori je již spuštěna, ale neodpovídá.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Záložky nelze načíst: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
 #, c-format
-msgid "The trash couldn't be loaded: %s\n"
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Relaci nelze načíst: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
 msgstr "Zavřené karty nelze načíst: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Historii nelze načíst: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Došlo k následujícím chybám:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorovat"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL selhalo: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Přijmout"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Přijmout pro sezení"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Odmítnout"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Nepodařilo se otevřít databázi pro rozšíření: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Nepodařilo se spustit databázový příkaz: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Opravdu chcete smazat všechna oprávnění cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Smazat všechna oprávnění cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2864,20 +3127,20 @@ msgstr ""
 "Tato akce smaže všechna oprávnění k cookies. Při další návštěvě stránek bude "
 "znovu vyžadován souhlas s oprávněními."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Správce oprávnění cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instance správce oprávnění cookies"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Nastavení oprávnění cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2889,23 +3152,13 @@ msgstr ""
 "oprávnění po kliknutí na <i>Smazat</i>. Také můžete přidat oprávnění ručně "
 "zadáním domény, výběrem oprávnění a kliknutím na <i>Přidat</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Doména"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Oprávnění"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Smazat _vše"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Ze_ptat se na oprávnění u neznámé domény"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2919,148 +3172,134 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Chyba ve správci oprávnění cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Důvod"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Nepodařilo se otevřít databázi pro rozšíření."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Nelze vytvořit databázovou strukturu pro rozšíření."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "Nelze zjistit výchozí nastavení oprávnění cookies pro doménu: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Sezení ukončeno"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Stránky %s potřebují uložit %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Stránky %s vyžadují uložit cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Několik stránek vyžaduje uložit celkem %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Přijmout"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Přijmout pro toto _sezení"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Odmít_nout"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "_Teď odepřít"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Cesta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Vyprší dne"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instance rozšíření"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Instance rozšíření pro toto rozšíření"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Správce oprávnění cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instance aplikace"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Spravovat oprávnění cookies pro stránky jednotlivě"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Instance aplikace Midori tohoto rozšíření náleží"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instance databáze"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Ukazatel na instanci databáze sqlite používaný tímto rozšířením"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Cesta k databázi"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Cesta k sqlite databázi, která je používána tímto rozšířením"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Zeptat se v případě neznámého oprávnění"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikace"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
 msgstr ""
-"Pokud je povoleno, bude se toto rozšíření dotazovat na oprávnění při "
-"návštěvě neznámých stránek. Pokud je zakázáno, použije se výchozí nastavení."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Neurčeno"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Správce oprávnění cookies"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "Spravovat oprávnění cookies pro stránky jednotlivě"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Aplikace"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Vytvořit _spouštěč"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Správce webových aplikací"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Správa webových stránek označených jako aplikace"
 
@@ -3068,906 +3307,190 @@ msgstr "Správa webových stránek označených jako aplikace"
 msgid "Transfers"
 msgstr "Přenosy"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Smazat vše"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Otevřít cílovou _složku"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Kopírovat umís_tění odkazu"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Soubor <b>%s</b> byl stažen."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Přenos dokončen"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Některé soubory se stále stahují"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "U_končit aplikaci Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Pokud bude aplikace Midori ukončena, stahování se stornuje."
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Správce přenosů"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Správa stahovaných souborů"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Kliknutí prostředního tlačítka otevře vybraný text"
-
-#~ 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"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "Nelze zjistit cestu k nastavení rozšíření: cesta je NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Nelze zjistit cestu k nastavení rozšíření."
-
-#~ msgid "Custom..."
-#~ msgstr "Vlastní…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Potvrzení uložení cookie"
-
-#~ msgid "_Details"
-#~ msgstr "_Detaily"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám"
-
-#~ msgid "Writing failed."
-#~ msgstr "Zápis se nezdařil."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Kinetické posouvání"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Určuje, zda bude posouvání ovlivněno rychloistí"
-
-#~ msgid "_Window"
-#~ msgstr "_Okno"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Přidat záložku na _plochu"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Přesměruje varování z konzoly do souboru SOUBOR"
-
-#~ msgid "FILENAME"
-#~ msgstr "SOUBOR"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Zvýraznit nalezené"
-
-#~ 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 "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 specified configuration folder is invalid."
-#~ msgstr "Vybraná složka konfigurace je neplatná."
-
-#~ msgid "Cookies"
-#~ msgstr "Cookies"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Cookies modulu Flash"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "_Databáze HTML5 "
-
-#~ msgid "Offline Application Cache"
-#~ msgstr "Mezipaměť pro offline aplikace"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Odlehčený prohlížeč"
-
-#~ msgid "Not available: %s"
-#~ msgstr "Není k dispozici: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Nejsou nainstalovány soubory se zdrojem"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Neukládat při prohlížení žádná data"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Přidá záložku do rychlého přístupu"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Přidá záložku na plochu"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Vytvořit spouštěč"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Přidá tento kanál do odebíraných kanálů"
-
-#~ msgid "Close this window"
-#~ msgstr "Zavřít toto okno"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Zavře všechna okna"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Vrátit zpět poslední změnu"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Vrátit poslední změnu"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Vystříhnout vybraný text"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Zkopírovat vybraný text"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Vložit text ze schránky"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Smazat vybraný text"
-
-#~ msgid "Select all text"
-#~ msgstr "Vybrat vše"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Najít další výskyt slova nebo fráze"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Najít předchozí výskyt slova nebo fráze"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Nastavit původní přiblížení"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Zobrazí zdrojový kód stránky"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Posunout pohled vlevo"
-
-#~ msgid "Scroll down"
-#~ msgstr "Posunout pohled dolů"
-
-#~ msgid "Scroll up"
-#~ msgstr "Posunout pohled nahoru"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Posunout pohled vpravo"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Vymaže seznam zavřených karet"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Otevře naposledy zavřenou kartu"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Přidá novou složku do záložek"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Přidává, upravuje a maže vyhledávací nástroje…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Vymaže osobní data…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Zobrazí stránku ve vývojářském nástroji…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Přepnout na předchozí kartu"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Přepnout na další kartu"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Přesune kartu za předchozí"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Přesune kartu před následující"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Zaměří aktuální kartu"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Přepnout na další pohled v pořadí"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Zobrazit pouze ikonu aktuální karty"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Obsah aktuální karty otevře v nové kartě"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Zavře všechny karty kromě aktuální"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Otevře karty uložené při posledním sezení"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Zobrazí často kladené otázky (FAQ)"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Otevře stránku pro hlášení chyb"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Zobrazí informace o programu"
-
-#~ msgid "Show menubar"
-#~ msgstr "Zobrazit nabídku"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Zobrazit navigační lištu"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Zobrazit boční panel"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Zobrazit lištu se záložkami"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Zobrazit stavovou lištu"
-
-#~ msgid "No filename specified"
-#~ msgstr "Nebyl zadán název souboru"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Změnit počet sloupců a řádků"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Vložte počet sloupců a řádků:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Nesprávná hodnota velikosti rychlého přístupu"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Velikost náhledů:"
-
-#~ msgid "Small"
-#~ msgstr "malá"
-
-#~ msgid "Medium"
-#~ msgstr "střední"
-
-#~ msgid "Big"
-#~ msgstr "velká"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "_Blokování reklamy"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Nenalezeno - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokument nemůže být zobrazen"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Vnutit rozlišení 96 bodů/palec"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Vnutit rozlišení obrazu 96 bodů na palec"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Přepnout karty seřazené podle posledního použití pomocí Ctrl+Tab"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Smazat stará cookies po hodině"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Smazat stará cookies po týdnu"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Smazat stará cookies po roce"
-
-#~ msgid "All cookies"
-#~ msgstr "všechna cookies"
-
-#~ msgid "Session cookies"
-#~ msgstr "cookies sezení"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Zobrazit stav přenosu"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Zobrazit stav přenosu?"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Zobrazovat výsledky hledání při zadávání adresy"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Zobrazí seznam nástrojů"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Zda zobrazovat seznam nástrojů"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Zobrazit obsah rychlého přístupu v kartách"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách"
-
-#~ msgid "Download Manager"
-#~ msgstr "Správce stahování"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Externí stránky otevírat v:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Kde se budou otevírat externí stránky"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Který typ cookies přijímat"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maximální stáří cookies"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Maximální délka historie"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Pamatovat si naposledy stahované soubory"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Pamatovat si seznam souborů, které byly stahovány?"
-
-#~ msgid "Appearance"
-#~ msgstr "Vzhled"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Web cookies"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "_Vymazat cookies při ukončení Midori"
-
-#~ msgid "General"
-#~ msgstr "Obecné"
-
-#~ msgid "Font settings"
-#~ msgstr "Nastavení písma"
-
-#~ msgid "Interface"
-#~ msgstr "Rozhraní"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Navigační lišta"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Další karta (v historii)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Předchozí karta (v historii)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Zvolí předchozí kartu z historie"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Nepodařilo se spustit databázový příkaz\n"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s z %s, %s/s"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Otevřít cílový adresář vybraného pluginu"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Stáhnout za použití Download _manageru"
-
-#~ msgid "External applications"
-#~ msgstr "Externí aplikace"
-
-#~ msgid "Pageholder"
-#~ msgstr "Uchovávání stránek"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Uchovávání stránek"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Uchovává jednu nebo více otevřených stránek stránek v kartách"
-
-#~ msgid "Quit the application"
-#~ msgstr "Ukončit aplikaci"
-
-#~ msgid "_Contents"
-#~ msgstr "_Obsah"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Zobrazit dokumentaci"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Uložit odkaz"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Stáhnout odkaz"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% načteno"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Zobrazit stav přenosu dat"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Zobrazit průběh v řádku adresy"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Zobrazovat průběh načítání v řádku s adresou?"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Zeptat se na cílovou složku"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Zda se ptát, kam se bude ukládat"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Zda zobrazit upozornění při dokončení přenosu"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Stáhnout o_brázek"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Nepodařilo se smazat historii hledání: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Oddělit vybraný panel od okna"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Schovat ovládací prvky"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Kontrola pravopisu"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. "
-#~ "\"cs_CZ,en_GB\""
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimalizovat _aktuální kartu"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimalizuje aktuální kartu"
-
-#~ msgid "External Applications"
-#~ msgstr "Externí aplikace"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Spojuje URL schémata s externími příkazy"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Slovníky pro kontrolu pravopisu:"
-
-#~ msgid "Console"
-#~ msgstr "Konzola"
-
-#~ msgid "Copy _All"
-#~ msgstr "Kopírovat _vše"
-
-#~ msgid "Copy All"
-#~ msgstr "Kopírovat vše"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Správce _cookies"
-
-#~ msgid ""
-#~ "Do you really want to remove '%s'?\n"
-#~ "\n"
-#~ "The file '%s' will be permanently lost.\n"
-#~ msgstr ""
-#~ "Opravdu se má odstranit %s?\r\n"
-#~ "\r\n"
-#~ "Soubor '%s' bude odstraněn.\r\n"
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Kopíruje se %s do složky %s."
-
-#~ msgid "_Restore Tab"
-#~ msgstr "_Ukázat titulek"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Schovat titulek"
-
-#~ msgid "Erroneous clock time"
-#~ msgstr "Chyba v nastavení času"
-
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času."
-
-#~ msgid "Minimize new Tabs"
-#~ msgstr "Minimalizovat otevřené karty"
-
-#~ msgid "New tabs open minimized"
-#~ msgstr "Nové karty otevírat minimalizovaně"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Naposledy navštívené stránky"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Znovu otevře stránky, které jste již navštívili"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Původní"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Pamatovat si naposledy navštívené stránky"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Pamatovat si naposledy navštívené stránky?"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Zjistit proxy server automaticky"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?"
-
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Změnit počet záložek"
-
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Vložte počet záložek"
-
-#~ msgid "Open _Link"
-#~ msgstr "Otevřít _odkaz"
-
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Okopírujte uživatelské skripty do složky %s a uživatelské styly do složky "
-#~ "%s."
-
-#~ msgid "Not available on this platform"
-#~ msgstr "Není k dispozici"
-
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Nepodařilo se zjistit aktuální čas: %s\n"
-
-#~ msgid "Show panel _titles"
-#~ msgstr "Zobrazit _titulky nástrojů"
-
-#~ msgid "Options"
-#~ msgstr "Volby"
-
-#~ msgid "Spell checking languages:"
-#~ msgstr "Jazyk(y) kontroly pravopisu"
-
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Zjistit IP adresu odkazů"
-
-#~ msgid "View Selection Source"
-#~ msgstr "Zobrazit zdrojový kód výběru"
-
-#~ msgid "View the source code of the selection"
-#~ msgstr "Zobrazit zdrojový kód vybraného textu"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Povolit vývojářské nástroje"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Povolit speciální rozšíření pro vývojáře"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Obrázky automaticky zmenšovat"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Automaticky zmenšovat obrázky, aby se vešly"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Obarvit karty"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Pamatovat si vložený text"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Pamatovat si text vložený do vstupních polí?"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Velikost keše"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Povolená velikost keše"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Kódování, které se použije jako výchozí"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Encoding"
-#~ msgstr "Kódování"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Roztažitelné oblasti pro text"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Mohou se pole pro vstup textu roztahovat dle potřeby?"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Obojí"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Obojí vedle sebe"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Načíst při startu"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Configure _Toolbar…"
-#~ msgstr "Upravit _lištu…"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Rychlé hledání"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Okamžitě přeskočit na slovo nebo frázi"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Search"
-#~ msgstr "Najít"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blokování reklamy"
 
-#~ msgid "Enable"
-#~ msgstr "Povolit"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokovat reklamu podle seznamu filtrů"
 
-#~ msgid "_Disable"
-#~ msgstr "_Zakázat"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Nastavení filtrů blokování reklamy"
 
-#~ msgid "Disable"
-#~ msgstr "Zakázat"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okovat obrázek"
 
-#~ msgid "%d days ago"
-#~ msgstr "Před %d dny"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okovat odkaz"
 
-#~ msgid "P_lugins"
-#~ msgstr "P_luginy"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Upravit pravidlo"
 
-#~ msgid "Plugins"
-#~ msgstr "Pluginy"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "P_ravidlo:"
diff --git a/po/cy.po b/po/cy.po
new file mode 100644 (file)
index 0000000..1070ce1
--- /dev/null
+++ b/po/cy.po
@@ -0,0 +1,3428 @@
+# Welsh translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-09-05 07:03+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Welsh <cy@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:05+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Porwr Gwe"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Porwr Gwe"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Porwch yr We"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Christopher Griffiths https://launchpad.net/~chris\n"
+"  Corwin Mcknight https://launchpad.net/~lioneltabre\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index b8e723fe4da36e35289bd01f3c235ba22d1da7fa..74a80143f217c8b1b49bcb1b438c03d6bbf35547 100644 (file)
--- a/po/da.po
+++ b/po/da.po
 # This file is distributed under the same license as the midori package.
 # Per Kongstad <p_kongstad@op.pl>, 2009, 10.
 # Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>, 2011
-# 
+#
 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"
-"PO-Revision-Date: 2010-02-20 00:37+0100\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:39+0000\n"
 "Last-Translator: Per Kongstad <p_kongstad@op.pl>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\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-Launchpad-Export-Date: 2014-11-27 05:45+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "X-Poedit-Country: Denmark\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Danish\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:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Webbrowser"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Midori webbrowser"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Gennemse internettet"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nyt \"P_rivat browsing\"-vindue"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Stifinder"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1478
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nyt faneblad"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1475
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nyt vindue"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Webbrowser"
+msgid "New Private Browsing Window"
+msgstr "Nyt \"P_rivat browsing\"-vindue"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori Privat browsing"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Åbn nyt vindue til privat browsing"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privat browsing"
 
-#: ../midori/main.c:91 ../midori/main.c:97
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Indstillingen kunne ikke indlæses: %s\n"
-
-#: ../midori/main.c:145
-#, 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
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Ugyldig indstillingsværdi '%s'"
-
-#: ../midori/main.c:375
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Kunne ikke fjerne gamle historikelementer: %s\n"
-
-#: ../midori/main.c:545
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Indstillingen kunne ikke gemmes. %s"
-
-#: ../midori/main.c:571
-#, 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
-#, 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
-msgid "Extensions"
-msgstr "Udvidelser"
-
-#: ../midori/main.c:695
-msgid "Privacy"
-msgstr "Beskyttelse af privatliv"
-
-#: ../midori/main.c:707
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Cookies gemmer loginddata, gemte spil eller brugerprofiler for "
-"marketingsformål"
-
-#: ../midori/main.c:763
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sessionen kunne ikke gemmes. %s"
-
-#: ../midori/main.c:1001
-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
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis "
-"dette er sket gentagne gange, foreslås det at prøve de følgende muligheder "
-"for at løse problemet."
-
-#: ../midori/main.c:1112
-msgid "Modify _preferences"
-msgstr "Ændre _indstillinger"
-
-#: ../midori/main.c:1116
-msgid "Disable all _extensions"
-msgstr "Slå alle _udvidelser fra"
-
-#: ../midori/main.c:1129
-msgid "Discard old tabs"
-msgstr "Kassér gamle faneblade"
-
-#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
-msgid "Show last tabs without loading"
-msgstr "Vis sidste faneblad uden at indlæse"
-
-#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
-msgid "Show last open tabs"
-msgstr "Vis sidste åbne faneblade"
-
-#: ../midori/main.c:1379 ../midori/main.c:2433
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sessionen kunne ikke indlæses: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Åbn nyt vindue til privat browsing"
 
-#: ../midori/main.c:1517
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Øjebliksbillede gem til: %s\n"
 
-#: ../midori/main.c:1933
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Kør ADRESSE som et webprogram"
 
-#: ../midori/main.c:1933
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: ../midori/main.c:1936
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Brug MAPPE som en indstillingsmappe"
 
-#: ../midori/main.c:1936
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "MAPPE"
 
-#: ../midori/main.c:1939
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privat browsing. Ingen ændringer bliver gemt"
 
-#: ../midori/main.c:1941
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Vis en nedbrudsdialog"
 
-#: ../midori/main.c:1943
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Kør det angivne filnavn som javascript"
 
-#: ../midori/main.c:1945
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Tag et øjebliksbillede at det angivne URI"
 
-#: ../midori/main.c:1947
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Kør den angivne kommando"
 
-#: ../midori/main.c:1949
+#: ../midori/main.c:101
 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:103
 msgid "Display program version"
 msgstr "Vis programversion"
 
-#: ../midori/main.c:1953
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../midori/main.c:1955
+#: ../midori/main.c:107
 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:107
 msgid "PATTERN"
 msgstr "MØNSTRE"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1959
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Nulstil Midori efter SECONDS sekunders inaktivitet"
 
-#: ../midori/main.c:1959
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDER"
 
-#: ../midori/main.c:1962
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Videresender konsoladvarsler til det angivne FILENAME"
-
-#: ../midori/main.c:1962
-msgid "FILENAME"
-msgstr "FILENAME"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
 
-#: ../midori/main.c:2064
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Rapportér venligst kommentarer, forslag og fejl til:"
 
-#: ../midori/main.c:2066
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Tjek for nye versioner hos:"
 
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2161
-msgid "Saved logins and _passwords"
-msgstr "Gemte logins og _adgangskoder"
-
-#: ../midori/main.c:2163
-msgid "Cookies and Website data"
-msgstr "Cookies og websideinformation"
-
-#. 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 "Webcache"
-
-#: ../midori/main.c:2170
-msgid "Website icons"
-msgstr "Webstedikoner"
-
-#: ../midori/main.c:2274
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "En ukendt fejl opstod"
 
-#: ../midori/main.c:2381
-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
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Bogmærkerne kunne ikke indlæses: %s\n"
-
-#: ../midori/main.c:2448
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Papirkurven kunne ikke indlæses: %s\n"
-
-#: ../midori/main.c:2461
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Historikken kunne ikke indlæses: %s\n"
-
-#: ../midori/main.c:2476
-msgid "The following errors occured:"
-msgstr "De følgende fejl opstod:"
-
-#: ../midori/main.c:2492
-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:1457 ../midori/midori-browser.c:6431
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Bogmærker"
 
-#: ../midori/midori-app.c:1458
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Tilføj bogmærke"
 
-#: ../midori/midori-app.c:1459
+#: ../midori/midori-app.c:1155
 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:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "Hi_storik"
 
-#: ../midori/midori-app.c:1461
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Brugerskri_pter"
 
-#: ../midori/midori-app.c:1462
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Bruger_grænseflader"
 
-#: ../midori/midori-app.c:1463
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nyt _faneblad"
 
-#: ../midori/midori-app.c:1464
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Overførsler"
 
-#: ../midori/midori-app.c:1465
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape-u_dvidelsesmoduler"
 
-#: ../midori/midori-app.c:1466
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Luk faneblade"
 
-#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5570
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nyt _vindue"
 
-#: ../midori/midori-app.c:1468
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Ny __mappe"
 
-#: ../midori/midori-app.c:1497
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adresser]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Fil blev ikke fundet."
 
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Misdannet dokument."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Ukendt bogmærkeformat."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Skrivning fejlede."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Gå til næste side"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Gå til den næste underside"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
 
-#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5658
-#: ../midori/midori-browser.c:5667
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 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:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stop indlæsning af nuværende side"
 
-#: ../midori/midori-browser.c:530
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
-msgid "%s (Private Browsing)"
-msgstr "%s (Privat browsing)"
+msgid "Value '%s' is invalid for %s"
+msgstr "Værdien '%s' er ikke gyldig til %s"
 
-#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Bogmærker"
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Uventet indstilling '%s'"
 
-#: ../midori/midori-browser.c:837
-msgid "New folder"
-msgstr "Ny mappe"
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Uventet handling '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Privat browsing)"
 
-#: ../midori/midori-browser.c:837
-msgid "Edit folder"
-msgstr "Redigér mappe"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Kunne ikke indsætte nyt historikelement: %s\n"
 
-#: ../midori/midori-browser.c:839
-msgid "New bookmark"
-msgstr "Nyt bogmærke"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:839
-msgid "Edit bookmark"
-msgstr "Redigér bogmærke"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bogmærker"
 
-#: ../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:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:934
-msgid "Add to _Speed Dial"
-msgstr "Tilføj til hurtig_opkald"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:940
-msgid "Show in the tool_bar"
-msgstr "Vis på vær_ktøjsbjælken"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:948
-msgid "Run as _web application"
-msgstr "Kør so_m et webprogram"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:1019
-#, 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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:1021
-#, 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:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:1028
-#, 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:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:1031
-#, 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:1185
+msgid "Add to _Speed Dial"
+msgstr "Tilføj til hurtig_opkald"
 
-#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4691
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Gem fil som"
 
-#: ../midori/midori-browser.c:1173
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Gem associerede _ressourcer"
 
-#: ../midori/midori-browser.c:1475
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Et nyt vindue er blevet åbnet"
 
-#: ../midori/midori-browser.c:1478
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Et nyt faneblad er blevet åbnet"
 
-#: ../midori/midori-browser.c:1495
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Fejl ved åbning af billedet!"
 
-#: ../midori/midori-browser.c:1496
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Kan ikke åbne billedet i standardfremviser."
 
-#: ../midori/midori-browser.c:1502
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Fejl ved hentning af billedet!"
 
-#: ../midori/midori-browser.c:1503
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Kan ikke hente valgte billede."
 
-#: ../midori/midori-browser.c:1624
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Gem fil"
 
-#: ../midori/midori-browser.c:2527
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Genindlæs side uden caching"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: ../midori/midori-browser.c:2659
+#: ../midori/midori-browser.c:2692
 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 +386,122 @@ 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:2698 ../extensions/feed-panel/main.c:350
 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:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 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:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Tom"
 
-#: ../midori/midori-browser.c:3695 ../midori/midori-browser.c:3696
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Slå cursorbaseret navigation til og fra"
 
-#: ../midori/midori-browser.c:3698
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
 
-#: ../midori/midori-browser.c:3701
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Slå Ca_ret browsing til"
 
-#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6124
-#, 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:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Åbn i nyt _vindue"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4517
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4518
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4519
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4520
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4521
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4522
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4543
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importér bogmærker…"
 
-#: ../midori/midori-browser.c:4546 ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importér bogmærker"
 
-#: ../midori/midori-browser.c:4557
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Program:"
 
-#: ../midori/midori-browser.c:4622
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importér fra XBEL- eller HTML-fil"
 
-#: ../midori/midori-browser.c:4650
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importér fra en fil"
 
-#: ../midori/midori-browser.c:4662
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Kunne ikke importere bogmærker"
 
-#: ../midori/midori-browser.c:4696
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL bogmærker"
 
-#: ../midori/midori-browser.c:4701
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape bogmærker"
 
-#: ../midori/midori-browser.c:4715
+#: ../midori/midori-browser.c:4546
 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:4558
 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
-msgid "Clear Private Data"
-msgstr "Ryd private data"
-
-#: ../midori/midori-browser.c:4856
-msgid "_Clear private data"
-msgstr "_Ryd private data"
-
-#: ../midori/midori-browser.c:4871
-msgid "Clear the following data:"
-msgstr "Ryd de følgende data:"
-
-#: ../midori/midori-browser.c:4881
-msgid "Last open _tabs"
-msgstr "Sidste åbne _faneblade"
-
-#: ../midori/midori-browser.c:4907
-msgid "Clear private data when _quitting Midori"
-msgstr "_Ryd private data når Midori afsluttes"
-
-#: ../midori/midori-browser.c:5122
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "En letvægt-webbrowser."
 
-#: ../midori/midori-browser.c:5123
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Se about:version for versionsinfo."
 
-#: ../midori/midori-browser.c:5125
+#: ../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 "
@@ -678,1582 +513,1453 @@ 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:4780
 msgid "translator-credits"
 msgstr ""
 "Per Kongstad <p_kongstad@op.pl>\n"
 "\n"
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
-"Mere info: http://www.dansk-gruppen.dk"
+"Mere info: http://www.dansk-gruppen.dk\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Allan Rehhoff https://launchpad.net/~allan-rehhoff\n"
+"  Anton Gandrup https://launchpad.net/~anton-gandrup\n"
+"  Casper Hedegaard https://launchpad.net/~casper-b\n"
+"  Dogmax https://launchpad.net/~walus91\n"
+"  Kristoffer Andersen https://launchpad.net/~kris24\n"
+"  Nielssonnich https://launchpad.net/~nielssonnich\n"
+"  Per Kongstad https://launchpad.net/~p-kongstad\n"
+"  Simon https://launchpad.net/~sims73\n"
+"  moscar https://launchpad.net/~mikkeloscar"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dublér nuværende faneblad"
 
-#: ../midori/midori-browser.c:5568
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fil"
 
-#: ../midori/midori-browser.c:5571
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Åbn et nyt vindue"
 
-#: ../midori/midori-browser.c:5574
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Åbn et nyt faneblad"
 
-#: ../midori/midori-browser.c:5576
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nyt vindue til p_rivat browsing"
 
-#: ../midori/midori-browser.c:5580
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Åbn en fil"
 
-#: ../midori/midori-browser.c:5582
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Gem side _som…"
 
-#: ../midori/midori-browser.c:5583
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Gem til en fil"
 
-#: ../midori/midori-browser.c:5585
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Tilføj til hurtig_opkald"
 
-#: ../midori/midori-browser.c:5589
-msgid "Add Shortcut to the _desktop"
-msgstr "Tilføj genvej til _skrivebordet"
-
-#: ../midori/midori-browser.c:5591
-msgid "Create _Launcher"
-msgstr "Opret _opstarter"
-
-#: ../midori/midori-browser.c:5595
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Abonnér på _nyhedskilder"
 
-#: ../midori/midori-browser.c:5601
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Luk faneblad"
 
-#: ../midori/midori-browser.c:5602
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Luk nuværende faneblad"
 
-#: ../midori/midori-browser.c:5604
+#: ../midori/midori-browser.c:5096
 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:5100
 msgid "Print the current page"
 msgstr "Udskriv nuværende side"
 
-#: ../midori/midori-browser.c:5616
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Luk a_lle vinduer"
 
-#: ../midori/midori-browser.c:5619
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: ../midori/midori-browser.c:5642
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Find…"
 
-#: ../midori/midori-browser.c:5643
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "Find _næste"
 
-#: ../midori/midori-browser.c:5648
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Find _forrige"
 
-#: ../midori/midori-browser.c:5652
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Indstil programindstillingerne"
 
-#: ../midori/midori-browser.c:5654
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Vis"
 
-#: ../midori/midori-browser.c:5655
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Værktøjsbjælker"
 
-#: ../midori/midori-browser.c:5660
-msgid "Reload page without caching"
-msgstr "Genindlæs side uden caching"
-
-#: ../midori/midori-browser.c:5670
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Forøg forstørrelsesniveauet"
 
-#: ../midori/midori-browser.c:5673
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Formindsk forstørrelsesniveauet"
 
-#: ../midori/midori-browser.c:5677
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodning"
 
-#: ../midori/midori-browser.c:5679
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Vis _kilde"
 
-#: ../midori/midori-browser.c:5682
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Ca_ret browsing"
 
-#: ../midori/midori-browser.c:5686
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Slå fuldskærmstilstande til/fra"
 
-#: ../midori/midori-browser.c:5688
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Rul til _venstre"
 
-#: ../midori/midori-browser.c:5691
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Rul _ned"
 
-#: ../midori/midori-browser.c:5694
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Rul _op"
 
-#: ../midori/midori-browser.c:5697
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Rul til _højre"
 
-#: ../midori/midori-browser.c:5700
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Læsbar"
 
-#: ../midori/midori-browser.c:5703
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../midori/midori-browser.c:5706
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Gå til forrige side"
 
-#: ../midori/midori-browser.c:5709
-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:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Gå til den næste underside"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
 
-#: ../midori/midori-browser.c:5719
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Hjemmeside"
 
-#: ../midori/midori-browser.c:5720
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Gå til din hjemmeside"
 
-#: ../midori/midori-browser.c:5722
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: ../midori/midori-browser.c:5725
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Fortryd lu_k faneblad"
 
-#: ../midori/midori-browser.c:5732
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Tilføj en ny _mappe"
 
-#: ../midori/midori-browser.c:5738
-msgid "_Export bookmarks"
-msgstr "_Eksportér bogmærker"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5741 ../midori/midori-searchaction.c:496
-msgid "_Manage Search Engines"
-msgstr "_Håndtér søgemaskiner"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5744
-msgid "_Clear Private Data"
-msgstr "_Ryd private data"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5747
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Undersøg side"
 
-#: ../midori/midori-browser.c:5751
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Forrige faneblad"
 
-#: ../midori/midori-browser.c:5754
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Næste faneblad"
 
-#: ../midori/midori-browser.c:5756
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Flyt faneblad _tilbage"
 
-#: ../midori/midori-browser.c:5758
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Flyt faneblad _frem"
 
-#: ../midori/midori-browser.c:5761
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Fokus på _nuværende faneblad"
 
-#: ../midori/midori-browser.c:5764
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Fokus _næste visning"
 
-#: ../midori/midori-browser.c:5767
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Vis kun ikonet for _nuværende faneblad"
 
-#: ../midori/midori-browser.c:5770
-msgid "_Duplicate Current Tab"
-msgstr "_Dublér nuværende faneblad"
-
-#: ../midori/midori-browser.c:5773
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Luk a_ndre faneblade"
 
-#: ../midori/midori-browser.c:5776
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Åbn den sidste _session"
 
-#: ../midori/midori-browser.c:5779
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../midori/midori-browser.c:5781
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Ofte stillede spørgsmål"
 
-#: ../midori/midori-browser.c:5784
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Rapportér en fejl…"
 
-#: ../midori/midori-browser.c:5789 ../midori/midori-browser.c:6450
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Værk_tøjer"
 
-#: ../midori/midori-browser.c:5796
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menubjælke"
 
-#: ../midori/midori-browser.c:5800
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigeringsbjælke"
 
-#: ../midori/midori-browser.c:5804
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Side_panel"
 
-#: ../midori/midori-browser.c:5805
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Sidepanel"
 
-#: ../midori/midori-browser.c:5808
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Bogmærkebjælke"
 
-#: ../midori/midori-browser.c:5812
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusbjælke"
 
-#: ../midori/midori-browser.c:5821 ../midori/midori-websettings.c:314
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: ../midori/midori-browser.c:5824 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Traditionel kinesisk (BIG5)"
 
-#: ../midori/midori-browser.c:5827 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Simpelt kinesisk (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5831
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japansk (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5834 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: ../midori/midori-browser.c:5837 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russisk (KOI8-R)"
 
-#: ../midori/midori-browser.c:5840 ../midori/midori-websettings.c:243
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5843 ../midori/midori-websettings.c:244
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Vestlig (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5846
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Tilpasset…"
 
-#: ../midori/midori-browser.c:6356
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separator"
 
-#: ../midori/midori-browser.c:6363
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Sted…"
 
-#: ../midori/midori-browser.c:6365
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Åbn et særligt sted"
 
-#: ../midori/midori-browser.c:6387
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Websøgning…"
 
-#: ../midori/midori-browser.c:6389
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Kør en websøgnig"
 
-#: ../midori/midori-browser.c:6416
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Vis de gemte bogmærker"
 
-#: ../midori/midori-browser.c:6466
-msgid "_Window"
-msgstr "Vin_due"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:6468
+#: ../midori/midori-browser.c:5939
 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:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6484
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
-#: ../midori/midori-browser.c:7309
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Uventet indstilling '%s'"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Kunne ikke vælge fra historik\n"
-
-#: ../midori/midori-locationaction.c:628
-#, c-format
-msgid "Search for %s"
-msgstr "Søg efter %s"
-
-#: ../midori/midori-locationaction.c:1195
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Eksportér certifikat"
 
-#: ../midori/midori-locationaction.c:1227
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1229
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1231
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1233
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
-msgstr ""
+msgstr "Certifikatet er udløbet"
 
-#: ../midori/midori-locationaction.c:1235
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1237
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1239
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1286
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Eksportér certifikat"
 
-#: ../midori/midori-locationaction.c:1301
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Selv-signeret"
 
-#: ../midori/midori-locationaction.c:1335
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Sikkerhedsdetaljer"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1618
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Indsæt og f_ortsæt"
 
-#: ../midori/midori-locationaction.c:1942
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Ikke bekræftet"
 
-#: ../midori/midori-locationaction.c:1950
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Bekræftet og kodet forbindelse"
 
-#: ../midori/midori-locationaction.c:1957
+#: ../midori/midori-locationaction.c:1814
 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:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 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:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Luk panel"
 
-#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Opstil sidepanel til venstre"
 
-#: ../midori/midori-websettings.c:220
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Vis hurtigopkald"
 
-#: ../midori/midori-websettings.c:221
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Vis hjemmeside"
 
-#: ../midori/midori-websettings.c:240
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Vis sidste åbne faneblade"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Vis sidste faneblad uden at indlæse"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 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:172
 msgid "New tab"
 msgstr "Nyt faneblad"
 
-#: ../midori/midori-websettings.c:261
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nyt vindue"
 
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Nuværende faneblad"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Standard"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Små ikoner"
 
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikoner og tekst"
 
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekst ved siden af ikoner"
 
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatisk (GNOME eller miljø)"
 
-#: ../midori/midori-websettings.c:298
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP-proxyserver"
 
-#: ../midori/midori-websettings.c:299
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Ingen proxyserver"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:318
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:319
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:320
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:404
-msgid "Remember last window size"
-msgstr "Husk sidste vinduesstørrelse"
-
-#: ../midori/midori-websettings.c:405
-msgid "Whether to save the last window size"
-msgstr "Skal sidste vinduesstørrelse gemmes"
-
-#: ../midori/midori-websettings.c:413
-msgid "Last window width"
-msgstr "Sidste vinduesbredde"
-
-#: ../midori/midori-websettings.c:414
-msgid "The last saved window width"
-msgstr "Sidste gemte vinduesbredde"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Stilen for værktøjsbjælke"
 
-#: ../midori/midori-websettings.c:422
-msgid "Last window height"
-msgstr "Sidste vindueshøjde"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Brug altid mit valg af fonte"
 
-#: ../midori/midori-websettings.c:423
-msgid "The last saved window height"
-msgstr "Sidste gemte vindueshøjde"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Brug mine fonte fremfor fonte fra internetsider"
 
-#: ../midori/midori-websettings.c:448
-msgid "Last panel position"
-msgstr "Sidste panelplacering"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Indstillingen kunne ikke indlæses: %s\n"
 
-#: ../midori/midori-websettings.c:449
-msgid "The last saved panel position"
-msgstr "Sidste gemte panelplacering"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Ugyldig indstillingsværdi '%s'"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:458
-msgid "Last panel page"
-msgstr "Sidste panelside"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:459
-msgid "The last saved panel page"
-msgstr "Sidste gemte panelside"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Vis faneblad_titel"
 
-#: ../midori/midori-websettings.c:467
-msgid "Last Web search"
-msgstr "Sidste websøgning"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Vis kun  faneblad_ikon"
 
-#: ../midori/midori-websettings.c:468
-msgid "The last saved Web search"
-msgstr "Den sidste gemte websøgning"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:492
-msgid "Show Menubar"
-msgstr "Vis menubjælke"
+#: ../midori/midori-notebook.vala:370
+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-websettings.c:493
-msgid "Whether to show the menubar"
-msgstr "Om menubjælke vises"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Betro denne webside"
 
-#: ../midori/midori-websettings.c:501
-msgid "Show Navigationbar"
-msgstr "Vis navigeringsbjælke"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Sikkerhed ukendt"
 
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the navigationbar"
-msgstr "Om navigeringsbjælke vises"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s ønsker at gemme en HTML5-database."
 
-#: ../midori/midori-websettings.c:510
-msgid "Show Bookmarkbar"
-msgstr "Vis bogmærkebjælke"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Afvis"
 
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the bookmarkbar"
-msgstr "Om bogmærkebjælke vises"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Tillad"
 
-#: ../midori/midori-websettings.c:519
-msgid "Show Panel"
-msgstr "Vis panel"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s ønsker at kende dit sted."
 
-#: ../midori/midori-websettings.c:520
-msgid "Whether to show the panel"
-msgstr "Om panel vises"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:528
-msgid "Show Statusbar"
-msgstr "Vis statusbjælke"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:529
-msgid "Whether to show the statusbar"
-msgstr "Om statusbjælke vises"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:538
-msgid "Toolbar Style:"
-msgstr "Værktøjsbjælkestil:"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:539
-msgid "The style of the toolbar"
-msgstr "Stilen for værktøjsbjælke"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:548
-msgid "Toolbar Items"
-msgstr "Værktøjsbjælkes elementer"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:549
-msgid "The items to show on the toolbar"
-msgstr "Elementer der vises på værktøjsbjælken"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:557
-msgid "Compact Sidepanel"
-msgstr "Kompakt sidepanel"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:558
-msgid "Whether to make the sidepanel compact"
-msgstr "Om sidepanelet skal være kompakt"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Prøv igen"
 
-#: ../midori/midori-websettings.c:573
-msgid "Align sidepanel on the right"
-msgstr "Opstil sidepanel til højre"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Send en besked til %s"
 
-#: ../midori/midori-websettings.c:574
-msgid "Whether to align the sidepanel on the right"
-msgstr "Om sidepanelet skal være opstilles til højre"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Tilføj _søgemaskine..."
 
-#: ../midori/midori-websettings.c:589
-msgid "Open panels in separate windows"
-msgstr "Åbn paneler i separate vinduer"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-websettings.c:590
-msgid "Whether to always open panels in separate windows"
-msgstr "Om paneler altid skal åbnes i separate vinduer"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Åbn henvisning i nyt _faneblad"
 
-#: ../midori/midori-websettings.c:599
-msgid "When Midori starts:"
-msgstr "Når Midori starter:"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Åbn henvisning i  _fanebladet i forgrunden"
 
-#: ../midori/midori-websettings.c:600
-msgid "What to do when Midori starts"
-msgstr "Hvad der skal ske når Midori startes"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Åbn henvisning i  _faneblad i baggrunden"
 
-#: ../midori/midori-websettings.c:609
-msgid "Homepage:"
-msgstr "Hjemmeside:"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Åbn henvisning i nyt _vindue"
 
-#: ../midori/midori-websettings.c:610
-msgid "The homepage"
-msgstr "Hjemmesiden"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Kopiér _henvisningsdestination"
 
-#: ../midori/midori-websettings.c:625
-msgid "Show crash dialog"
-msgstr "Vis nedbrudsdialog"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
 
-#: ../midori/midori-websettings.c:626
-msgid "Show a dialog after Midori crashed"
-msgstr "Vis en dialog efter nedbrud af Midori"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
 
-#: ../midori/midori-websettings.c:634
-msgid "Save downloaded files to:"
-msgstr "Gem hentede filer til:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Åbn _billede i nyt faneblad"
 
-#: ../midori/midori-websettings.c:635
-msgid "The folder downloaded files are saved to"
-msgstr "Mappen hvor nedhentede filer skal gemmes"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
 
-#: ../midori/midori-websettings.c:643
-msgid "Text Editor"
-msgstr "Tekstbehandler"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Gem _billede"
 
-#: ../midori/midori-websettings.c:644
-msgid "An external text editor"
-msgstr "En ekstern tekstbehandler"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Åbn i Image_Viewer"
 
-#: ../midori/midori-websettings.c:659
-msgid "News Aggregator"
-msgstr "Nyhedssamler"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopiér vide_oadresse"
 
-#: ../midori/midori-websettings.c:660
-msgid "An external news aggregator"
-msgstr "En ekstern nyhedssamler"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Hent _video"
 
-#: ../midori/midori-websettings.c:668
-msgid "Location entry Search"
-msgstr "Søg for stedindgang"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Åbn adresse i nyt _faneblad"
 
-#: ../midori/midori-websettings.c:669
-msgid "The search to perform inside the location entry"
-msgstr "Søgningen som skal foretages i placeringsindgang"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Søg _med"
 
-#: ../midori/midori-websettings.c:677
-msgid "Preferred Encoding"
-msgstr "Foretrukne tegnsæt"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Søg internettet"
 
-#: ../midori/midori-websettings.c:678
-msgid "The preferred character encoding"
-msgstr "Foretrukne tegnsæt"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Åbn _ramme i nyt faneblad"
 
-#: ../midori/midori-websettings.c:688
-msgid "Always Show Tabbar"
-msgstr "Vis altid fanebladsbjælke"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Undersøg _element"
 
-#: ../midori/midori-websettings.c:689
-msgid "Always show the tabbar"
-msgstr "Vis altid fanebladsbjælken"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:702
-msgid "Close Buttons on Tabs"
-msgstr "Lukkeknapper på faneblade"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Filnavn: %s"
 
-#: ../midori/midori-websettings.c:703
-msgid "Whether tabs have close buttons"
-msgstr "Om faneblade har lukkeknapper"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Filtype: '%s'"
 
-#: ../midori/midori-websettings.c:728
-msgid "Open new pages in:"
-msgstr "Åbn nye sider i:"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Filtype: %s ('%s')"
 
-#: ../midori/midori-websettings.c:729
-msgid "Where to open new pages"
-msgstr "Hvor skal nye sider åbnes"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Størrelse: %s"
 
-#: ../midori/midori-websettings.c:738
-msgid "Middle click opens Selection"
-msgstr "Midterklik åbner for markering"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Åbn %s"
 
-#: ../midori/midori-websettings.c:739
-msgid "Load an address from the selection via middle click"
-msgstr "Indlæs en adresse fra markeringen med midterklik"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Undersøg side - %s"
 
-#: ../midori/midori-websettings.c:747
-msgid "Open tabs in the background"
-msgstr "Åbn faneblade i baggrunden"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori gemmer ikke nogen personlige data:"
 
-#: ../midori/midori-websettings.c:748
-msgid "Whether to open new tabs in the background"
-msgstr "Om nye faneblade skal åbnes i baggrunden"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Ingen historik eller internet-cookies bliver gemt."
 
-#: ../midori/midori-websettings.c:756
-msgid "Open Tabs next to Current"
-msgstr "Åbn faneblad ved siden af nuværende"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Udvidelser er slået fra."
 
-#: ../midori/midori-websettings.c:757
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
-"Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste "
-"faneblad"
-
-#: ../midori/midori-websettings.c:765
-msgid "Open popups in tabs"
-msgstr "Åbn pop op i faneblade"
+"HTML5 opbevaring, lokale databaser og programmellemlagringer er slået fra."
 
-#: ../midori/midori-websettings.c:766
-msgid "Whether to open popup windows in tabs"
-msgstr "Om pop op-vinduer skal åbnes i faneblade"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori beskytter mod netsiders sporing' af brugere:"
 
-#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
-msgid "Load images automatically"
-msgstr "Indlæs billeder automatisk"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Referende URL-er er forkortet til værtsnavnet."
 
-#: ../midori/midori-websettings.c:777
-msgid "Load and display images automatically"
-msgstr "Indlæs og vis billeder automatisk"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "Hent på forhånd DNS er slået fra."
 
-#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
-msgid "Enable scripts"
-msgstr "Brug skripter"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Sprogindstillingen og tidzone bliver ikke oplyst til internetsider."
 
-#: ../midori/midori-websettings.c:785
-msgid "Enable embedded scripting languages"
-msgstr "Slå indlejret skriptsprog til"
+#: ../midori/midori-view.c:3906
+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-websettings.c:792 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Slå Netscape-udvidelsesmoduler til"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr "Versionsnumre i parenteser viser versionen brugt under kørsel."
 
-#: ../midori/midori-websettings.c:793
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Slå indlejrede Netscape-udvidelsesobjekter til"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:808
-msgid "Enable Spell Checking"
-msgstr "Slå stavekontrol til"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger."
 
-#: ../midori/midori-websettings.c:809
-msgid "Enable spell checking while typing"
-msgstr "Slå stavekontrol til mens du taster"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Indlæs side"
 
-#: ../midori/midori-websettings.c:815
-msgid "Enable HTML5 database support"
-msgstr "Slå HTML5 databaseunderstøttelse til"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Blank side"
 
-#: ../midori/midori-websettings.c:816
-msgid "Whether to enable HTML5 database support"
-msgstr "Om understøttelse af database til HTML5 skal slås til"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "forrige"
 
-#: ../midori/midori-websettings.c:822
-msgid "Enable HTML5 local storage support"
-msgstr "Slå understøttelse af lokal lagring af HTML5 til"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "næste"
 
-#: ../midori/midori-websettings.c:823
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Udskriv baggrundsbilleder"
 
-#: ../midori/midori-websettings.c:829
-msgid "Enable offline web application cache"
-msgstr "Slå ikke forbundet webprograms mellemlager til"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Om baggrundsbilleder skal udskrives"
 
-#: ../midori/midori-websettings.c:830
-msgid "Whether to enable offline web application cache"
-msgstr "Om ikke forbundet webprograms mellemlager skal slås til"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Funktionalitet"
 
-#: ../midori/midori-websettings.c:851
-msgid "Flash window on background tabs"
-msgstr "Lad vindue på baggrundsfaneblade blinke"
-
-#: ../midori/midori-websettings.c:852
-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
-msgid "Zoom Text and Images"
-msgstr "Zoom tekst og billeder"
-
-#: ../midori/midori-websettings.c:888
-msgid "Whether to zoom text and images"
-msgstr "Om zoom af tekst og billeder"
-
-#: ../midori/midori-websettings.c:903
-msgid "Find inline while typing"
-msgstr "Find indlejret mens du taster"
-
-#: ../midori/midori-websettings.c:904
-msgid "Whether to automatically find inline while typing"
-msgstr "Om indlejret skal findes automatisk, mens du taster"
-
-#: ../midori/midori-websettings.c:919
-msgid "Kinetic scrolling"
-msgstr "Bevægelsesrulning"
-
-#: ../midori/midori-websettings.c:920
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Om rulning skal ske med bevægelseshastighed eller ej"
-
-#: ../midori/midori-websettings.c:928
-msgid "Delete old Cookies after:"
-msgstr "Slet gamle cookies efter:"
-
-#: ../midori/midori-websettings.c:929
-msgid "The maximum number of days to save cookies for"
-msgstr "Maksimal antal dage cookies skal gemmes"
-
-#: ../midori/midori-websettings.c:945
-msgid "Only accept Cookies from sites you visit"
-msgstr "Tillad kun cookies fra sider du besøger"
-
-#: ../midori/midori-websettings.c:946
-msgid "Block cookies sent by third-party websites"
-msgstr "Blokér cookies send fra trejdepartsider"
-
-#: ../midori/midori-websettings.c:960
-msgid "Delete pages from history after:"
-msgstr "Slet sider fra historik efter:"
-
-#: ../midori/midori-websettings.c:961
-msgid "The maximum number of days to save the history for"
-msgstr "Maksimale antal dage som historik skal gemmes"
-
-#: ../midori/midori-websettings.c:976
-msgid "Proxy server"
-msgstr "Proxyserver"
-
-#: ../midori/midori-websettings.c:977
-msgid "The type of proxy server to use"
-msgstr "Proxyservertypen som skal bruges"
-
-#: ../midori/midori-websettings.c:986
-msgid "HTTP Proxy Server"
-msgstr "HTTP-proxyserver"
-
-#: ../midori/midori-websettings.c:987
-msgid "The proxy server used for HTTP connections"
-msgstr "Proxyserveren som bruges til HTTP-forbindelser"
-
-#: ../midori/midori-websettings.c:1002
-msgid "Port"
-msgstr "Port"
-
-#: ../midori/midori-websettings.c:1003
-msgid "The proxy server port used for HTTP connections"
-msgstr "Porten på proxyserveren som bruges til HTTP-forbindelser"
-
-#: ../midori/midori-websettings.c:1021
-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
-msgid "Identify as"
-msgstr "Identificér som"
-
-#: ../midori/midori-websettings.c:1039
-msgid "What to identify as to web pages"
-msgstr "Hvad skal genkendes som web-sider"
-
-#: ../midori/midori-websettings.c:1055
-msgid "Identification string"
-msgstr "Identifikationsstreng"
-
-#: ../midori/midori-websettings.c:1056
-msgid "The application identification string"
-msgstr "Programmets identifikationsstreng"
-
-#: ../midori/midori-websettings.c:1072
-msgid "Preferred languages"
-msgstr "Foretrukne sprog"
-
-#: ../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 ""
-"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
-msgid "Clear private data"
-msgstr "Ryd private data"
-
-#: ../midori/midori-websettings.c:1089
-msgid "The private data selected for deletion"
-msgstr "De private data valgt til sletning"
-
-#: ../midori/midori-websettings.c:1104
-msgid "Clear data"
-msgstr "Ryd data"
-
-#: ../midori/midori-websettings.c:1105
-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
-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
-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
-msgid "Always use my font choices"
-msgstr "Brug altid mit valg af fonte"
-
-#: ../midori/midori-websettings.c:1171
-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
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
 #, 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
-msgid "_Deny"
-msgstr "_Afvis"
-
-#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
-msgid "_Allow"
-msgstr "_Tillad"
+msgid "%s of %s"
+msgstr "%s af %s"
 
-#: ../midori/midori-view.c:1469
+#: ../midori/midori-download.vala:75
 #, c-format
-msgid "%s wants to know your location."
-msgstr "%s ønsker at kende dit sted."
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
 
-#: ../midori/midori-view.c:1565
+#: ../midori/midori-download.vala:76
 #, c-format
-msgid "Error - %s"
-msgstr "Fejl - %s"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minutter"
 
-#: ../midori/midori-view.c:1566
+#: ../midori/midori-download.vala:77
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Siden '%s' kunne ikke indlæses."
-
-#: ../midori/midori-view.c:1568
-msgid "Try again"
-msgstr "Prøv igen"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
 
-#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
 #, 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
-msgid "Inspect _Element"
-msgstr "Undersøg _element"
-
-#: ../midori/midori-view.c:2757
-msgid "Open Link in New _Tab"
-msgstr "Åbn henvisning i nyt _faneblad"
-
-#: ../midori/midori-view.c:2761
-msgid "Open Link in _Foreground Tab"
-msgstr "Åbn henvisning i  _fanebladet i forgrunden"
-
-#: ../midori/midori-view.c:2762
-msgid "Open Link in _Background Tab"
-msgstr "Åbn henvisning i  _faneblad i baggrunden"
-
-#: ../midori/midori-view.c:2765
-msgid "Open Link in New _Window"
-msgstr "Åbn henvisning i nyt _vindue"
-
-#: ../midori/midori-view.c:2768
-msgid "Open Link as Web A_pplication"
-msgstr "Åbn henvisning som et _webprogram"
-
-#: ../midori/midori-view.c:2773
-msgid "Copy Link de_stination"
-msgstr "Kopiér _henvisningsdestination"
-
-#: ../midori/midori-view.c:2789
-msgid "Open _Image in New Tab"
-msgstr "Åbn _billede i nyt faneblad"
-
-#: ../midori/midori-view.c:2792
-msgid "Copy Image _Address"
-msgstr "Kopiér billed_adresse"
-
-#: ../midori/midori-view.c:2795
-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
-msgid "Copy Video _Address"
-msgstr "Kopiér vide_oadresse"
-
-#: ../midori/midori-view.c:2808
-msgid "Save _Video"
-msgstr "Gem _video"
-
-#: ../midori/midori-view.c:2808
-msgid "Download _Video"
-msgstr "Hent _video"
-
-#: ../midori/midori-view.c:2834
-msgid "Search _with"
-msgstr "Søg _med"
-
-#: ../midori/midori-view.c:2866
-msgid "_Search the Web"
-msgstr "_Søg internettet"
-
-#: ../midori/midori-view.c:2883
-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"
+msgid " - %s remaining"
+msgstr " - %s tilbage"
 
-#: ../midori/midori-view.c:3190
-msgid "Open or download file"
-msgstr "Åbn eller hent fil"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-view.c:3214
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
 #, c-format
-msgid "File Name: %s"
-msgstr "Filnavn: %s"
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-view.c:3219
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Filtype: '%s'"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Den hentede fil indeholder fejl."
 
-#: ../midori/midori-view.c:3221
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Filtype: %s ('%s')"
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Checksummen opgivet med linket stemmer ikke.  Dette betyder, at filen "
+"formentligt er ufuldendt eller blev modificeret efterfølgende."
 
-#: ../midori/midori-view.c:3256
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "Size: %s"
-msgstr "Størrelse: %s"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Filen \"%s\" kan ikke gemmes i denne mapp."
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3267
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Du har ikke skriverettigheder til dette sted."
+
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "Åbn %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"."
 
-#: ../midori/midori-view.c:3886
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Undersøg side - %s"
+msgid "The file needs %s but only %s are left."
+msgstr "Filen behøver %s men der er kun %s fri plads"
 
-#: ../midori/midori-view.c:4241
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Hurtigopkald"
 
-#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klik for at tilføje en genvej"
 
-#: ../midori/midori-view.c:4243
-msgid "Enter shortcut address"
-msgstr "Tast genvejsadresse"
-
-#: ../midori/midori-view.c:4244
-msgid "Enter shortcut title"
-msgstr "Tast en genvejstitel"
-
-#: ../midori/midori-view.c:4245
-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
-#, 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
-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
-msgid "Page loading delayed"
-msgstr "Forsinket sideindlæsning"
-
-#: ../midori/midori-view.c:4643
-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
-msgid "Load Page"
-msgstr "Indlæs side"
-
-#: ../midori/midori-view.c:4811
-msgid "Blank page"
-msgstr "Blank side"
-
-#: ../midori/midori-view.c:5075
-msgid "_Duplicate Tab"
-msgstr "_Dublér faneblad"
-
-#: ../midori/midori-view.c:5080
-msgid "Show Tab _Label"
-msgstr "Vis faneblad_titel"
-
-#: ../midori/midori-view.c:5080
-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"
-
-#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5923
-msgid "previous"
-msgstr "forrige"
-
-#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5942
-msgid "next"
-msgstr "næste"
-
-#: ../midori/midori-view.c:5955
-msgid "Print background images"
-msgstr "Udskriv baggrundsbilleder"
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Tast genvejsadresse"
 
-#: ../midori/midori-view.c:5956
-msgid "Whether background images should be printed"
-msgstr "Om baggrundsbilleder skal udskrives"
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Tast en genvejstitel"
 
-#: ../midori/midori-view.c:5988
-msgid "Features"
-msgstr "Funktionalitet"
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?"
 
-#: ../midori/midori-preferences.c:298
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Opstart"
 
-#: ../midori/midori-preferences.c:311
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Når Midori starter:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Anvend _nuværende side"
 
-#: ../midori/midori-preferences.c:315
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Brug nuværende side som hjemmeside"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:324
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proportionel skrifttypefamilie"
 
-#: ../midori/midori-preferences.c:331
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Fastbredde skrifttype"
 
-#: ../midori/midori-preferences.c:340
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Minimal skriftstørrelse"
 
-#: ../midori/midori-preferences.c:349
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Minimum størrelse af skrifttype til at vise tekst"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Foretrukne tegnsæt"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:360
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Opførsel"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Indlæs billeder automatisk"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Slå stavekontrol til"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Brug skripter"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Slå WebGL databaseunderstøttelse til"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom tekst og billeder"
+
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Tillad skripter at åbne pop op."
 
-#: ../midori/midori-preferences.c:387
+#: ../midori/midori-preferences.c:412
 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:414
+msgid "Default Zoom Level"
+msgstr ""
+
 #: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Foretrukne sprog"
+
+#: ../midori/midori-preferences.c:426
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, "
+"eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Gem hentede filer til:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Browsing"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Værktøjsbjælkestil:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Åbn nye sider i:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Lukkeknapper på faneblade"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Åbn faneblad ved siden af nuværende"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Åbn faneblade i baggrunden"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Tekstbehandler"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Nyhedssamler"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:458
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Netværk"
 
-#: ../midori/midori-preferences.c:465
-msgid "Hostname"
-msgstr "Værtsnavn"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxyserver"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Webcache"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Den maksimale størrelse af cache-sider på disken"
 
-#: ../midori/midori-preferences.c:489
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:957
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identificér som"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Beskyttelse af privatliv"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Slet gamle cookies efter:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Maksimal antal dage cookies skal gemmes"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Tillad kun cookies fra sider du besøger"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokér cookies send fra trejdepartsider"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Cookies gemmer loginddata, gemte spil eller brugerprofiler for "
+"marketingsformål"
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Slå ikke forbundet webprograms mellemlager til"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Slå understøttelse af lokal lagring af HTML5 til"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Hvorvidt \"Referer\"-headeren skal beskæres til værtsnavnet"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Slet sider fra historik efter:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Maksimale antal dage som historik skal gemmes"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Udvidelser"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Håndtér søgemaskiner"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Tilføj søgemaskine"
 
-#: ../midori/midori-searchaction.c:957
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Redigér søgemaskine"
 
-#: ../midori/midori-searchaction.c:985
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../midori/midori-searchaction.c:1000
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../midori/midori-searchaction.c:1032
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Symbol:"
 
-#: ../midori/midori-searchaction.c:1330
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Håndtér søgemaskiner"
 
-#: ../midori/midori-searchaction.c:1432
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Brug som _standard"
 
-#: ../midori/sokoke.c:346
-msgid "Open with"
-msgstr "Åbn med"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Søgemaskinerne kunne ikke indlæses. %s\n"
 
-#: ../midori/sokoke.c:354
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Vælg et program eller en kommando til at åbne \"%s\":"
+msgid "The search engines couldn't be saved. %s"
+msgstr "Søgemaskinerne kunne ikke gemmes. %s"
 
-#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
-msgid "Could not run external program."
-msgstr "Kunne ikke køre eksternt program."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/sokoke.c:1529
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
+msgid "Search for %s"
+msgstr "Søg efter %s"
 
-#: ../midori/sokoke.c:1530
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minutter"
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/sokoke.c:1531
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunder"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Søg med…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s af %s"
+msgid "Search with %s"
+msgstr "Søg med %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1548
-msgid "?B"
-msgstr "?B"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Åbn med"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1551
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr "(%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Vælg et program eller en kommando til at åbne \"%s\":"
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1568
-#, c-format
-msgid " - %s remaining"
-msgstr " - %s tilbage"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Kunne ikke køre eksternt program."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:265
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "_Indlejret søgning:"
 
-#: ../toolbars/midori-findbar.c:287
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../toolbars/midori-findbar.c:293
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Næste"
 
-#: ../toolbars/midori-findbar.c:297
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Versalfølsom"
 
-#: ../toolbars/midori-findbar.c:306
-msgid "Highlight Matches"
-msgstr "Fremhæv fundne"
-
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Luk søgebjælke"
 
-#: ../toolbars/midori-transferbar.c:124
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Filen '<b>%s</b>' er blevet hentet."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:129
-msgid "Transfer completed"
-msgstr "Overførsel gennemført"
-
-#: ../toolbars/midori-transferbar.c:201
-msgid "The downloaded file is erroneous."
-msgstr "Den hentede fil indeholder fejl."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
 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
-msgid "Clear All"
-msgstr "Ryd alle"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
-msgid "Some files are being downloaded"
-msgstr "Nogle filer bliver overført"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:388
-msgid "_Quit Midori"
-msgstr "_Afslut Midori"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:390
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Kunne ikke tilføje historikelementet: %s\n"
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Kunne ikke opdatere bogmærke: %s\n"
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Redigér det valgte bogmærke"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Slet det valgte bogmærke"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 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:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Åbn i nyt _faneblad"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1027
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Søg i bogmærker"
 
@@ -2261,63 +1967,51 @@ msgstr "Søg i bogmærker"
 msgid "History"
 msgstr "Historik"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "I dag"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "For en uge siden"
 
-#: ../panels/midori-history.c:232
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Kunne ikke fjerne historikelementet: %s\n"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:312
 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:358
 msgid "Bookmark the selected history item"
 msgstr "Bogmærk det valgte historikelement"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Slet det valgte historikelement"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 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
-msgid "Transfers"
-msgstr "Overførsler"
-
-#: ../panels/midori-transfers.c:470
-msgid "Open Destination _Folder"
-msgstr "Åbn mål_mappen"
-
-#: ../panels/midori-transfers.c:473
-msgid "Copy Link Loc_ation"
-msgstr "Kopiér henvisnings_sted"
-
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Søg i historik"
+
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Godkendelse påkrævet"
@@ -2342,136 +2036,96 @@ msgstr "Adgangskode"
 msgid "_Remember password"
 msgstr "_Husk adgangskode"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Angivet ikon '%s' blev ikke indlæst"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Lagerikon '%s' kunne ikke indlæses"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Animeringsrammer er ødelagt"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ingen"
 
-#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
+#: ../katze/katze-utils.c:529
 #, 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:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Vælg fil"
 
-#: ../katze/katze-utils.c:504
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Vælg mappe"
 
-#: ../katze/katze-utils.c:602
-msgid "None"
-msgstr "Ingen"
-
-#: ../katze/katze-utils.c:717
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 time"
 
-#: ../katze/katze-utils.c:718
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dag"
 
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 uge"
 
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 måned"
 
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 år"
 
-#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Indstillinger for %s"
 
-#: ../extensions/adblock.c:470
-msgid "Configure Advertisement filters"
-msgstr "Indstil reklamefiltre"
-
-#: ../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 ""
-"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
-msgid "Edit rule"
-msgstr "Redigér regel"
-
-#: ../extensions/adblock.c:931
-msgid "_Rule:"
-msgstr "_Regel:"
-
-#: ../extensions/adblock.c:985
-msgid "Bl_ock image"
-msgstr "Bl_okér billede"
-
-#: ../extensions/adblock.c:990
-msgid "Bl_ock link"
-msgstr "Bl_okér henvisning"
-
-#: ../extensions/adblock.c:1689
-msgid "Advertisement blocker"
-msgstr "Blokering af reklamer"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-kontrolsum:"
 
-#: ../extensions/adblock.c:1690
-msgid "Block advertisements according to a filter list"
-msgstr "Blokér reklamer i henhold til en filterliste"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-kontrolsum:"
 
 #. 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?"
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Denne side indeholder tilsyneladende et bruger-script. Ønsker du at "
 "installere det?"
 
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "_Installér brugerskript"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr ""
 "Denne side indeholder tilsyneladende en bruger-stil. Ønsker du at installere "
 "den?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Installér brugerstil"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Undlad at installere"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:677
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Brugerskripter"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:679
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Brugerstile"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Fejl"
 
@@ -2493,40 +2147,40 @@ msgstr "Slet brugerstil"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Filen <b>%s</b> vil blive slettet for bestandigt."
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:643
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Åbn i tekstbehandler"
 
-#: ../extensions/addons.c:568 ../extensions/addons.c:652
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Åbn målmappen"
 
-#: ../extensions/addons.c:634
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Tilføj nye moduler"
 
-#: ../extensions/addons.c:660
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Fjern valgte modul"
 
-#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Brugers udvidelsesmoduler"
 
-#: ../extensions/addons.c:1819
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Kan ikke overvåge mappe '%s': %s"
 
-#: ../extensions/addons.c:1908
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Understøttelse af brugerskripter og brugerstile"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Farvefulde faneblade"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Ton hvert faneblad tydeligt"
 
@@ -2535,11 +2189,11 @@ msgstr "Ton hvert faneblad tydeligt"
 msgid "Cookie Manager"
 msgstr "Cookiehåndtering"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Slet alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2547,32 +2201,32 @@ msgstr ""
 "Slet alle viste cookies. Hvis filter er indstillet, vil kun de cookies, som "
 "passer til filteret, blive slettet."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Udfold alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Fold alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Er du sikker på, at du ønsker at fjerne alle cookies?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:574
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Spørgsmål"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr ""
 "Kun cookies, som passer med den indtastede filterstreng, bliver slettet."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Ved afslutningen af sessionen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2589,15 +2243,16 @@ msgstr ""
 "<b>Sikker</b>: %s\n"
 "<b>Udløber</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nej"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2606,19 +2261,20 @@ msgstr ""
 "<b>Domæne</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1017
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Navn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1069
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Udfold alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Fold alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Søg cookies efter navn eller domæne"
 
@@ -2626,46 +2282,108 @@ msgstr "Søg cookies efter navn eller domæne"
 msgid "List, view and delete cookies"
 msgstr "Vis, gennemse og slet cookies"
 
-#: ../extensions/copy-tabs.c:38
+#: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
 msgstr "Kopiér faneblad_adresser"
 
-#: ../extensions/copy-tabs.c:95
+#: ../extensions/copy-tabs.c:96
 msgid "Copy Addresses of Tabs"
 msgstr "Kopiér adresser af faneblade"
 
-#: ../extensions/copy-tabs.c:96
+#: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopiér adresser af alle fanblade til udklipsholder"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:387
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Sidst opdateret: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:653
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Feeds"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Tilføj nyt feed"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Slet feed"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Feeds"
 
@@ -2674,60 +2392,60 @@ msgstr "_Feeds"
 msgid "Failed to find root element in feed XML data."
 msgstr "Kunne ikke finde rodelement i feed XML-data."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Ikke understøttet feed-format."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Kunne ikke fortolke XML-feed: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Kunne ikke finde \"kanal\"-element i RSS-XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Ikke understøttet RSS-version fundet."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Kunne ikke finde anmodede RSS \"punkt\"elementer i XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Kunne ikke finde anmodede RSS \"kanal\"-elemterne i XML-data."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Feed '%s' findes allerede"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Fejl ved indlæsning af feed '%s'"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Feed-panel"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Læs Atom-/ RSS-feeds"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "Kunne ikke tilføje formularværdien: %s\n"
 
-#: ../extensions/formhistory/formhistory.c:95
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "Formularrhistorik"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
@@ -2735,857 +2453,1036 @@ msgstr ""
 "Et brugernavn samt en adgangskode er påkrævet\n"
 "for at åbne dette sted:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Husk adgangskode til denne side?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Husk"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Ikke nu"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Aldrig til denne side"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Skift mellem tilstande for formularhistorik"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Slå til/fra formularhistorik for nuværende faneblad"
 
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Kunne ikke køre databaseudtryk: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:629
+#: ../extensions/formhistory/formhistory.c:598
 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
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Historikfylder til formular"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 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/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Kunne ikke vælge forslag\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Der er ingen ubesøgte faneblade"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Historikliste"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Ved lukning af faneblade"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Gør intet"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Skift til senest viste faneblad"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Skift til nyeste faneblad"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Lad vindue på baggrundsfaneblade blinke"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Næste nye faneblad (historikliste)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Næste nye faneblad fra historik"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Forrige nye faneblad (historikliste)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Forrige nye faneblad fra historik"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Vis faneblad i baggrunden (Historik)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Vis det nuværende valgte faneblad i baggrunden"
 
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Historikliste"
 
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Gå til senest brugte faneblad ved skift eller lukning"
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
-msgstr "Musebevægelser"
-
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
-msgstr "Styr Midori ved at flytte musen"
-
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "Genindlæs side eller stop indlæsning"
-
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
-msgstr "Tilpas tastaturgenveje"
-
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Tilpas gen_veje…"
-
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
-msgstr "Genveje"
-
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "Vis og redigér tastaturgenveje"
-
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
-msgstr "Statusbjælkens ur"
-
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
-msgstr "Vis dato og tid på statusbjælken"
-
-#: ../extensions/statusbar-features.c:152
-msgid "Images"
-msgstr "Billeder"
-
-#: ../extensions/statusbar-features.c:162
-msgid "Scripts"
-msgstr "Skripter"
-
-#: ../extensions/statusbar-features.c:174
-msgid "Netscape plugins"
-msgstr "Netscape-udvidelsesmoduler"
-
-#: ../extensions/statusbar-features.c:259
-msgid "Statusbar Features"
-msgstr "Status funktioner"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:260
-msgid "Easily toggle features on web pages on and off"
-msgstr "Slå nemt netsiders funktioner til/fra"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
 
-#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
-msgid "Tab Panel"
-msgstr "Fanebladpanel"
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#: ../extensions/tab-panel.c:659
-msgid "T_ab Panel"
-msgstr "Faneblad_panel"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
 
-#: ../extensions/tab-panel.c:677
-msgid "Show tabs in a vertical panel"
-msgstr "Vis faneblade i et lodret panel"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "Kun ikoner på faneblade som standard"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "Nye faneblade har ingen titel som standard"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:395
-msgid "Customize Toolbar"
-msgstr "Tilpas værktøjsbjælke"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/nojs/nojs-preferences.c:613
 msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
 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
-msgid "Available Items"
-msgstr "Tilgængelige elementer"
-
-#: ../extensions/toolbar-editor.c:448
-msgid "Displayed Items"
-msgstr "Viste elementer"
-
-#: ../extensions/toolbar-editor.c:588
-msgid "_Customize Toolbar…"
-msgstr "_Tilpas værktøjsbjælke…"
-
-#: ../extensions/toolbar-editor.c:617
-msgid "Toolbar Editor"
-msgstr "Redigering af værktøjsbjælke"
-
-#: ../extensions/toolbar-editor.c:618
-msgid "Easily edit the toolbar layout"
-msgstr "Redigér nemt layout af værktøjsbjælken"
-
-#: ../extensions/web-cache.c:463
-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"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
 
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Tilføj genvej til hurtigopkald"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
 
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Tilføj genvej til skrivebordet"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
 
-#~ msgid "Create a launcher"
-#~ msgstr "Opret en opstarter"
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
 
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Abonnér på denne nyhedskilde"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
 
-#~ msgid "Close this window"
-#~ msgstr "Luk dette vindue"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
 
-#~ msgid "Close all open windows"
-#~ msgstr "Luk alle åbne vinduer"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
 
-#~ msgid "Undo the last modification"
-#~ msgstr "Fortryd den sidste ændring"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
 
-#~ msgid "Redo the last modification"
-#~ msgstr "Gentag den sidste ændring"
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
 
-#~ msgid "Cut the selected text"
-#~ msgstr "Udklip markeret tekst"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
 
-#~ msgid "Copy the selected text"
-#~ msgstr "Kopiér markeret tekst"
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
 
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Indsæt tekst fra klippebordet"
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
 
-#~ msgid "Delete the selected text"
-#~ msgstr "Slet markeret tekst"
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
 
-#~ msgid "Select all text"
-#~ msgstr "Markér hele teksten"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Find næste forekomst af et ord eller sætning"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Find forrige forekomst af et ord eller sætning"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
 
-#~ msgid "Reset the zoom level"
-#~ msgstr "Nulstil forstørrelsesniveauet"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#~ msgid "View the source code of the page"
-#~ msgstr "Vis kildekode for siden"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
 
-#~ msgid "Scroll to the left"
-#~ msgstr "Rul til venstre"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
 
-#~ msgid "Scroll down"
-#~ msgstr "Rul ned"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
 
-#~ msgid "Scroll up"
-#~ msgstr "Rul op"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
 
-#~ msgid "Scroll to the right"
-#~ msgstr "Rul til højre"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Slet indhold af papirkurven"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Åbn sidste lukkede faneblad"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Tilføj en ny bogmærkemappe"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Tilføj, redigér og fjern søgemaskiner…"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
 
-#~ msgid "Clear private data…"
-#~ msgstr "Ryd private data…"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne…"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Skift til det forrige faneblad"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
 
-#~ msgid "Switch to the next tab"
-#~ msgstr "Skift til det næste faneblad"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Flyt faneblad bag det forrige faneblad"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Flyt faneblad foran det næste faneblad"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Fokus på det nuværende faneblad"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "Cirkuler fokus mellem visninger"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Vis kun ikonet til det nuværende faneblad"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Dublér nuværende faneblad"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Luk alle faneblade undtaget nuværende faneblad"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Åbn faneblade gemt i den sidste session"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Vis ofte stillede spørgsmål"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Åbn Midoris fejlsystem"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
 
-#~ msgid "Show information about the program"
-#~ msgstr "Vis information om dette program"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
 
-#~ msgid "Show menubar"
-#~ msgstr "Vis menubjælke"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Vis navigeringsbjælke"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Vis sidepanel"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Vis bogmærkebjælke"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
 
-#~ msgid "Show statusbar"
-#~ msgstr "Vis statusbjælke"
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Musebevægelser"
 
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-kontrolsum:"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Styr Midori ved at flytte musen"
 
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-kontrolsum:"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Genindlæs side eller stop indlæsning"
 
-#~ msgid "No filename specified"
-#~ msgstr "Intet filnavn angivet"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Tilpas tastaturgenveje"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Indstil antal af kolonner og rækker"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Angiv antal kolonner og rækker:"
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Genveje"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Ugyldig inddata af størrelsen til hurtigopringing."
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Vis og redigér tastaturgenveje"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Miniaturestørrelse:"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Statusbjælkens ur"
 
-#~ msgid "Small"
-#~ msgstr "Små"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Vis dato og tid på statusbjælken"
 
-#~ msgid "Medium"
-#~ msgstr "Mellem"
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Billeder"
 
-#~ msgid "Big"
-#~ msgstr "Stor"
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skripter"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "Nulstil den sidste _session"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape-udvidelsesmoduler"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Indstil _reklamefiltre…"
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Slå Netscape-udvidelsesmoduler til"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Ikke fundet - %s"
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Status funktioner"
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokument kan ikke vises"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Slå nemt netsiders funktioner til/fra"
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Gennemtving 96 dots per tomme"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Fanebladpanel"
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Gennemtving tæthed af videopunkt på 96 DPI"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Faneblad_panel"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Skifter faneblade med Ctrl+Tab sorteret efter senest anvendte"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Vis faneblade i et lodret panel"
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Slet gamle cookies efter 1 time"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Kun ikoner på faneblade som standard"
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Slet gamle cookies efter 1 uge"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Nye faneblade har ingen titel som standard"
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Slet gamle cookies efter 1 måned"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Tilpas værktøjsbjælke"
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Slet gamle cookies efter 1 år"
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Vælg elementer til visning på værktøjsbjælken. Rækkefølge af elementerne kan "
+"ændres med træk og slip."
 
-#~ msgid "All cookies"
-#~ msgstr "Alle cookies"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Tilgængelige elementer"
 
-#~ msgid "Session cookies"
-#~ msgstr "Session-cookies"
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Viste elementer"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Vis overførselsstatus"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Tilpas værktøjsbjælke…"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Om overførselsstatus skal vises"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Redigering af værktøjsbjælke"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Vis søgemaskiner i adresseudfyldelse"
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Redigér nemt layout af værktøjsbjælken"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Om søgemaskiner skal vises i adresseudfyldelsen"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Ryd private data"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Vis handlingskontroller til panelet"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Ryd private data"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Om handlingskontroller til panelet skal vises"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Ryd de følgende data:"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Vis hurtigopkald i nye faneblade"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Sidste åbne _faneblade"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Vis hurtigopkald i nyligt åbnede faneblade"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "_Ryd private data når Midori afsluttes"
 
-#~ msgid "Download Manager"
-#~ msgstr "Håndtering af hentning"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Gemte logins og _adgangskoder"
 
-#~ msgid "An external download manager"
-#~ msgstr "En ekstern håndtering for nedhentning"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies og websideinformation"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Åbn eksterne sider i:"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Webstedikoner"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Hvor skal eksterne sider åbnes"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
 
-#~ msgid "Accept cookies"
-#~ msgstr "Tillad cookies"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Hvilke typer af cookes skal tillades"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Kunne ikke fjerne historik: %s\n"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maksimal cookie-levetid"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Kunne ikke fjerne gamle historikelementer: %s\n"
 
-#~ msgid "Maximum history age"
-#~ msgstr "Maksimal historik-levetid"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Kunne ikke tilføje historikelementet: %s\n"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Husk sidste hentede filer"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Om sidste hentede filer skal gemmes"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#~ msgid "Appearance"
-#~ msgstr "Udseende"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres."
 
-#~ msgid "Applications"
-#~ msgstr "Programmer"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Indstillingen kunne ikke gemmes. %s"
 
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% indlæst"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Papirkurven kunne ikke fyldes. %s"
 
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Kunne ikke fjerne søgehistorik: %s\n"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
 
-#~ msgid "Quit the application"
-#~ msgstr "Afslut programmet"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Ændre _indstillinger"
 
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "_Minimér nuværede faneblade"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Slå alle _udvidelser fra"
 
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimér nuværende faneblad"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Vis en dialog efter nedbrud af Midori"
 
-#~ msgid "_Contents"
-#~ msgstr "_Indhold"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Kassér gamle faneblade"
 
-#~ msgid "Show the documentation"
-#~ msgstr "Vis dokumentationen"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#~ msgid "_Transferbar"
-#~ msgstr "_Overførselsstatus"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#~ msgid "Show transferbar"
-#~ msgstr "Vis overførselsstatus"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "En instans af Midori kører allerede men reagerer ikke.\n"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Kunne ikke køre databaseudtryk\n"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Bogmærkerne kunne ikke indlæses: %s\n"
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Frigør valgte panel fra vinduet"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sessionen kunne ikke indlæses: %s\n"
 
-#~ msgid "Hide operating controls"
-#~ msgstr "Skjul handlingskontroller"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Papirkurven kunne ikke indlæses: %s\n"
 
-#~ msgid "Show Blank page"
-#~ msgstr "Vis blank side"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Historikken kunne ikke indlæses: %s\n"
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Vis fremgang i placeringindgang"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "De følgende fejl opstod:"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Om visning af indlæsningsfremgang i placeringsindgang"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorér"
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Spørg om målmappen"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Om der skal spørges om målmappen ved hentning af fil"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Gem henvisningsadresse"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Hent henvisningsadressen"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Hent med nedhentnings_håndtering"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "Download I_mage"
-#~ msgstr "Hent bi_llede"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "General"
-#~ msgstr "Generel"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Font settings"
-#~ msgstr "Indstillinger for skrifttype"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "Spell Checking"
-#~ msgstr "Stavekontrol"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Stavekontroller:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "En kommaadskilt liste over sprog til at blive brugt til stavekontrol "
-#~ "eksempelvis \"en_GB,de_DE\""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Grænseflade"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "Navigationbar"
-#~ msgstr "Navigeringsbjælke"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "Eksterne programmer"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "Web Cookies"
-#~ msgstr "Web-cookies"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Console"
-#~ msgstr "Konsol"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "Copy _All"
-#~ msgstr "Kopiér _alt"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#~ msgid "Copy All"
-#~ msgstr "Kopiér alt"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Åbn målmappen for valgte modul"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Cookiehåndtering"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "External Applications"
-#~ msgstr "Eksterne programmer"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Knyt URL-skemaer til eksterne kommandoer"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "Sideholder"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Sideholder"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Hold en eller flere sider åbne parallelt med dine faneblade"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid ""
-#~ "Do you really want to remove '%s'?\n"
-#~ "\n"
-#~ "The file '%s' will be permanently lost.\n"
-#~ msgstr ""
-#~ "Er du sikker på, at du vil fjerne '%s'?\n"
-#~ "\n"
-#~ "filen '%s', da denne vil være tabt for bestandigt.\n"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Kopiér %s til mappen %s."
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Gendan faneblad"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimér faneblad"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Fejlagtig tid"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid."
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "Minimize new Tabs"
-#~ msgstr "_Minimér nye faneblade"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "New tabs open minimized"
-#~ msgstr "Åbn nye faneblade minimeret"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Programmer"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Nyligt besøgte sider"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Genåbn sider som du tidligere har besøgt"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid "Original cookies only"
-#~ msgstr "Kun for originale cookies"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Husk sidste besøgte sider"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Om sidste besøgte sider skal gemmes"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Genkend automatisk proxyserver"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Opret _opstarter"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Om proxyserveren genkendes automatisk fra miljøet"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Indstil antal af genveje"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Angiv antal af genveje:"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Overførsler"
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Kopiér brugerskripter til mappen %s og kopiér brugerstile til mappen %s."
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Ryd alle"
 
-#~ msgid "Open _Link"
-#~ msgstr "Åbn _henvisning"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Open Image in New Wi_ndow"
-#~ msgstr "Åbn billede i nyt _vindue"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Åbn mål_mappen"
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Ikke tilgængeligt på denne platform"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopiér henvisnings_sted"
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Kunne ikke hente aktuel tid: %s\n"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Filen '<b>%s</b>' er blevet hentet."
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Vis panel_titler"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "Options"
-#~ msgstr "Indstillinger"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Overførsel gennemført"
 
-#~ msgid "View Selection Source"
-#~ msgstr "Vis kilde for markerede"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Nogle filer bliver overført"
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Vis kildekode for markering"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Afslut Midori"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Formindsk billeder automatisk"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes."
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Minimér enkeltstående billeder til at passe"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Brug udvikler-værktøjer"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Slå specielle udvidelser til udviklere til"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Ton faneblade tydeligt"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Hent på forhånd IP-adresser på henvisninger som musen holdes over"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Husk sidste formularindtastninger"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Om sidste formularindtastninger skal gemmes"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Størrelse af mellemlager"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Den tilladte størrelse af mellemlager"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Encoding"
-#~ msgstr "Tegnsæt"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Tegnsæt som bruges standard"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Justerbare tekstområder"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Om tekstområder kan ændre størrelse"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Find hurtigt"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Hop hurtigt til et ord eller sætning"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Begge"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Begge vandrette"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Indlæs ved opstart"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Search"
-#~ msgstr "Søg"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Advarsel: Du bruger en superbruger-konto!"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Enable"
-#~ msgstr "Slå til"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "_Disable"
-#~ msgstr "_Slå fra"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Disable"
-#~ msgstr "Slå fra"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "%d days ago"
-#~ msgstr "For %d dage siden"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blokering af reklamer"
 
-#~ msgid "P_lugins"
-#~ msgstr "Udvidelses_moduler"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokér reklamer i henhold til en filterliste"
 
-#~ msgid "Plugins"
-#~ msgstr "Udvidelsesmoduler"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Indstil reklamefiltre"
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s har ingen egenskab '%s'"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okér billede"
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s kan ikke blive tildelt til %s.%s"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okér henvisning"
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s kan ikke tilgås"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Redigér regel"
 
-#~ msgid "Source"
-#~ msgstr "Kilde"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regel:"
index 12e58e0e59c1191fd1409bdd8f25281fe4b8289b..f1a2d7ca90b86e137cf0febbe252d77adbbaf675 100644 (file)
--- a/po/de.po
+++ b/po/de.po
 # This file is distributed under the same license as the midori package.
 # Enrico Tröger <enrico.troeger@uvena.de> 2008
 # Christian Dywan <christian@twotoasts.de> 2008-2010
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 04:18+0000\n"
-"PO-Revision-Date: 2009-04-30 00:15+0100\n"
-"Last-Translator: Christian Dywan <christian@twotoasts.de>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-01-09 16:49+0000\n"
+"Last-Translator: Adalbert Mate Saric <saric.adalbert349@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-01-10 05:32+0000\n"
+"X-Generator: Launchpad (build 17298)\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"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer;Browser"
+msgid "Web Browser"
+msgstr "Web-Browser"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:3856 ../midori/sokoke.c:561
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web­brow­ser"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "Webbrowser"
+msgid "Browse the Web"
+msgstr "Im Internet surfen"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Neues Fenster zum privaten Surfen"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;Browser"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1316
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
-msgstr "Neuer Reiter"
+msgstr "Einen neuen Tab öffnen"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1313
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
-msgstr "Neues Fenster"
+msgstr "Ein neues Fenster öffnen"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Internetbetrachter"
+msgid "New Private Browsing Window"
+msgstr "Neues privates Fenster"
 
 #: ../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:4176
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privat surfen"
 
-#: ../midori/main.c:63
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Ein neues privates Fenster öffnen"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
-msgstr "Schnappschuss gespeichert: %s\n"
+msgstr "Schnappschuss gespeichert in: %s\n"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADRESSE als Internetanwendung starten"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "ORDNER als Konfigurationsordner benutzen"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ORDNER"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privat surfen, Änderungen werden nicht gespeichert"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "Portabler Modus, alle Laufzeitdateien werden an einem Ort gespeichert"
+msgstr ""
+"Portabler Modus, alle Laufzeitdateien werden an einem Ort gespeichert"
 
-#: ../midori/main.c:100
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Einfaches GTK+-Fenster mit WebKit, verwandt mit GtkLauncher"
 
-#: ../midori/main.c:102
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Diagnosedialog anzeigen"
 
-#: ../midori/main.c:104
-#, fuzzy
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
-msgstr "Gemeinsam mit gdb ausführen und einen Backtrace beim Absturz speichern"
+msgstr "Starte in gdb und sichere einen Backtrace beim Absturz"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Angegebenen Dateinamen als Javascript ausführen"
 
-#: ../midori/main.c:108
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Schnappschuss der angegebenen Adresse aufnehmen"
 
-#: ../midori/main.c:110
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Den angegebenen Befehl ausführen"
 
-#: ../midori/main.c:112
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
-msgstr "Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können"
+msgstr ""
+"Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können"
 
-#: ../midori/main.c:114
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Programmversion anzeigen"
 
-#: ../midori/main.c:116
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adressen"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "MUSTER"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen"
 
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDEN"
 
-#: ../midori/main.c:155
-#, c-format, fuzzy
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
-msgstr "Fehler: \"gdb\" konnte nicht gefunden werden"
+msgstr "Fehler: »gdb« konnte nicht gefunden werden\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Informieren Sie sich über neue Versionen unter:"
 
-#: ../midori/main.c:378
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:569
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Unerwartete Aktion »%s«."
-
-#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6070
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Lesezeichen"
 
-#: ../midori/midori-app.c:1351
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Lesezeichen _hinzufügen"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Erweiterungen"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../midori/midori-app.c:1354
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Benutzerskripte"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Benutzer_stile"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
-msgstr "Neuer _Reiter"
+msgstr "Neuer _Tab"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "Über_tragungen"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape-Modu_le"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
-msgstr "Ges_chlossene Reiter"
+msgstr "Ges_chlossene Tabs"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5209
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
-msgstr "Neues _Fenster"
+msgstr "Ein neues _Fenster öffnen"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Neuer _Ordner"
 
-#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419
-#: ../midori/midori-app.c:1422
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adressen]"
 
-#: ../midori/midori-array.c:524
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: ../midori/midori-array.c:549 ../midori/midori-array.c:588
-#: ../midori/midori-array.c:612 ../midori/midori-array.c:622
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Fehlerhaftes Dokument."
 
-#: ../midori/midori-array.c:631
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Unbekanntes Lesezeichenformat."
 
-#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
-msgstr "Gehe weiter zur nächsten Seite"
+msgstr "Zur nächsten Seite weitergehen"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5353
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
-msgstr "Gehe weiter zur nächsten Unterseite"
+msgstr "Zur nächsten Unterseite weitergehen"
 
-#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5294
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Internet-Suche …"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Diese Seite neu laden"
 
-#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Laden dieser Seite abbrechen"
 
-#: ../midori/midori-browser.c:525
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Titel konnte nicht aktualisiert werden: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:565
-#: ../midori/midori-websettings.c:1430
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Wert »%s« ist ungültig für %s"
 
-#: ../midori/midori-browser.c:645
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Unerwartete Einstellung »%s«"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Unerwartete Aktion »%s«."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Privat surfen)"
 
-#: ../midori/midori-browser.c:755 ../midori/midori-browser.c:797
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Auswählen [Text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../midori/midori-browser.c:851
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: ../midori/midori-browser.c:851
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Ordner bearbeiten"
 
-#: ../midori/midori-browser.c:853
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Neues Lesezeichen"
 
-#: ../midori/midori-browser.c:853
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Lesezeichen bearbeiten"
 
-#: ../midori/midori-browser.c:887
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+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."
+"Geben Sie einen Namen für dieses Lesezeichen an, und wählen Sie einen "
+"Speicherort."
 
-#: ../midori/midori-browser.c:943
-msgid "Add to _Speed Dial"
-msgstr "Zu Schnell_wahl hinzufügen"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Geben Sie einen Namen für diesen Ordner an, und wählen Sie einen Speicherort."
 
-#: ../midori/midori-browser.c:949
-msgid "Show in the tool_bar"
-msgstr "In der Werkzeug_leiste anzeigen"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "In der _Lesezeichenleiste anzeigen"
 
-#: ../midori/midori-browser.c:957
-msgid "Run as _web application"
-msgstr "Als _Internetanwendung starten"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Zu Schnell_wahl hinzufügen"
 
-#: ../midori/midori-browser.c:1073 ../midori/midori-browser.c:4452
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Datei speichern unter"
 
-#: ../midori/midori-browser.c:1083
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Zugehörige _Ressourcen speichern"
 
-#: ../midori/midori-browser.c:1313
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Ein neues Fenster wurde geöffnet"
 
-#: ../midori/midori-browser.c:1316
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
-msgstr "Ein neuer Reiter wurde geöffnet"
+msgstr "Ein neuer Tab wurde geöffnet"
 
-#: ../midori/midori-browser.c:1334
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Fehler beim Öffnen des Bildes!"
 
-#: ../midori/midori-browser.c:1335
+#: ../midori/midori-browser.c:1630
 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:1341
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Fehler beim Herunterladen des Bildes!"
 
-#: ../midori/midori-browser.c:1342
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Das Bild kann nicht heruntergeladen werden"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Datei speichern"
 
-#: ../midori/midori-browser.c:2373
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Seite ohne Zwischenspeicher neu laden"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: ../midori/midori-browser.c:2501
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -358,141 +383,131 @@ msgid ""
 "Aggregator. Next time you click the news feed icon, it will be added "
 "automatically."
 msgstr ""
-"Verwenden Sie einen Nachrichtenaggregator um diese URI zu benutzen. Dort "
-"findet sich meist ein Menü oder eine Schaltfläche »Neues Abo«, »Neue "
-"Nachrichtenquelle« oder ähnlich.\n"
+"Verwenden Sie für diese URI einen Nachrichtenaggregator. Dort findet sich "
+"meist ein Menü oder eine Schaltfläche »Neues Abo«, »Neue Nachrichtenquelle« "
+"oder ähnlich.\n"
 "Alternativ können Sie auch unter Einstellungen > Anwendungen in Midori einen "
 "Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf das "
-"Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt."
+"Symbol für Nachrichtenquellen die Adresse automatisch hinzugefügt."
 
-#: ../midori/midori-browser.c:2507 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Neue Nachrichtenquelle"
 
-#: ../midori/midori-browser.c:2539 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Ein neues Lesezeichen hinzufügen"
 
-#: ../midori/midori-browser.c:3065 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Leer"
 
-#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Navigation mit Textmarke einschalten"
 
-#: ../midori/midori-browser.c:3450
+#: ../midori/midori-browser.c:3549
 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."
+"Drücken von F7 aktiviert bzw. deaktiviert die Navigation mit Textcursor. "
+"Falls aktiviert, wird auf allen Internet-Seiten ein Textcursor angezeigt."
 
-#: ../midori/midori-browser.c:3453
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Navigation mit Textcursor"
 
-#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5817
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n"
-
-#: ../midori/midori-browser.c:4184 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
-msgstr "Alle in neuen _Reitern öffnen"
+msgstr "Alle in neuen _Tabs öffnen"
 
-#: ../midori/midori-browser.c:4191 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513
-msgid "Open in New _Tab"
-msgstr "In neuem _Reiter öffnen"
-
-#: ../midori/midori-browser.c:4194 ../midori/midori-view.c:2771
-#: ../midori/midori-view.c:4654 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4284
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4285
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4286
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4287
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4288
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4289
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4307
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Lesezeichen importieren …"
 
-#: ../midori/midori-browser.c:4310 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "Lesezeichen _importieren"
 
-#: ../midori/midori-browser.c:4321
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Anwendung:"
 
-#: ../midori/midori-browser.c:4386
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Aus einer XBEL- oder HTML-Datei importieren"
 
-#: ../midori/midori-browser.c:4414
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Aus einer Datei importieren"
 
-#: ../midori/midori-browser.c:4426
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Fehler beim Importieren der Lesezeichen"
 
-#: ../midori/midori-browser.c:4457
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL-Lesezeichen"
 
-#: ../midori/midori-browser.c:4462
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape-Lesezeichen"
 
-#: ../midori/midori-browser.c:4476
+#: ../midori/midori-browser.c:4546
 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:4491
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Fehler beim Exportieren der Lesezeichen"
 
-#: ../midori/midori-browser.c:4707
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
-msgstr "Ein schlanker Internetbetrachter."
+msgstr "Ein schlanker Webbrowser."
 
-#: ../midori/midori-browser.c:4708
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Siehe about:version für Versionsinformationen."
 
-#: ../midori/midori-browser.c:4710
+#: ../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 "
@@ -504,406 +519,436 @@ msgstr ""
 "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version "
 "2.1 der Lizenz oder (wahlweise) jeder späteren Version."
 
-#: ../midori/midori-browser.c:4745
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Enrico Tröger <enrico.troeger@uvena.de>\n"
-"Christian Dywan <christian@twotoasts.de>"
+"Christian Dywan <christian@twotoasts.de>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adalbert Mate Saric https://launchpad.net/~saric-adalbert349\n"
+"  Alexander Wilms https://launchpad.net/~alexander-wilms\n"
+"  Artem Anufrij https://launchpad.net/~artem-anufrij\n"
+"  Bastian Plettner https://launchpad.net/~lucarios\n"
+"  Benedikt Schum https://launchpad.net/~benediktschum\n"
+"  CanviS https://launchpad.net/~d69e23df\n"
+"  Christian Dywan https://launchpad.net/~kalikiana\n"
+"  De Kubus https://launchpad.net/~dekubus\n"
+"  Eduard Gotwig https://launchpad.net/~gotwig\n"
+"  Ghenrik https://launchpad.net/~ghenrik-deactivatedaccount\n"
+"  Jan Dillenberger https://launchpad.net/~jan-dillenberger\n"
+"  Jonathan Kraemer https://launchpad.net/~jokr\n"
+"  Joshua Feis https://launchpad.net/~joshua-feis\n"
+"  Lukas Juhrich https://launchpad.net/~ljuhrich-yahoo\n"
+"  Marco Kemmerling https://launchpad.net/~mar-co\n"
+"  Marcus Wichelmann https://launchpad.net/~l-admin-3\n"
+"  Mathias Dietrich https://launchpad.net/~theghost\n"
+"  Moritz Gehlhaar https://launchpad.net/~geoextra\n"
+"  Phillip Sz https://launchpad.net/~phillip-sz\n"
+"  Pierre Bender https://launchpad.net/~pierre-bender-deactivatedaccount\n"
+"  Roland Hügli https://launchpad.net/~roland-huegli\n"
+"  Sebastian Schlatow https://launchpad.net/~buzz-dee\n"
+"  Simeon https://launchpad.net/~simeon5\n"
+"  Thomas Pitlik https://launchpad.net/~thomaspitlik\n"
+"  Tobias Bannert https://launchpad.net/~toba\n"
+"  UweS https://launchpad.net/~uwes\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  fridlmue https://launchpad.net/~friedrich-muetschele\n"
+"  grrrk https://launchpad.net/~grrrk"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Aktuellen Tab _duplizieren"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Datei"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Ein neues Fenster öffnen"
 
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
-msgstr "Einen neuen Reiter öffnen"
+msgstr "Einen neuen Tab öffnen"
 
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
-msgstr "Neues Fenster zum _privaten Surfen"
+msgstr "Ein neues _privates Fenster öffnen"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
 
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Seite speichern unter …"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "In Datei speichern"
 
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Zu Schnell_wahl hinzufügen"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5228
-msgid "Create _Launcher"
-msgstr "_Starter erstellen"
-
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Nachrichten_quelle abonnieren"
 
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
-msgstr "Reiter s_chließen"
+msgstr "Tab s_chließen"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
-msgstr "Den aktuellen Reiter schließen"
+msgstr "Aktuellen Tab schließen"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Fenster schließen"
 
-#: ../midori/midori-browser.c:5244
-msgid "_Share"
-msgstr "_Freigeben"
-
-#: ../midori/midori-browser.c:5245
-msgid "Share this page"
-msgstr "Diese Seite teilen"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Aktuelle Seite ausdrucken"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "_Alle Fenster schließen"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Suchen …"
 
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Ein Wort oder einen Satz auf der Seite suchen"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "_Nächstes suchen"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "_Vorheriges suchen"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Anwendungseinstellungen anpassen"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Werkzeugleisten"
 
-#: ../midori/midori-browser.c:5296
-msgid "Reload page without caching"
-msgstr "Seite ohne Zwischenspeicher neu laden"
-
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Die Vergrößerungsstufe erhöhen"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Die Vergrößerungsstufe verringern"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Zeichensatz"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "_Quelltext anzeigen"
 
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "_DOM-Quelle anzeigen"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navigation mit Textma_rke"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Vollbildmodus ein-/ ausschalten"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Nach _links rollen"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
-msgstr "_Herunter rollen"
+msgstr "Nach _unten rollen"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
-msgstr "H_och rollen"
+msgstr "Noch _oben rollen"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Nach _rechts rollen"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Lesba_r"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
-msgstr "Zur vorherigen Seite zurück gehen"
+msgstr "Zur vorherigen Seite zurückgehen"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
-msgstr "Zur vorherigen Unterseite zurück gehen"
+msgstr "Zur vorherigen Unterseite zurückgehen"
 
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Nächstest oder Weiter"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Zur nächsten Unterseite oder zur nächsten Seite im Verlauf gehen"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Startseite"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Zu Ihrer Startseite gehen"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Papierkorb leeren"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
-msgstr "Reiter _zurückholen"
+msgstr "Geschlossenen Tab _wiederherstellen"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Einen neuen _Ordner hinzufügen"
 
-#: ../midori/midori-browser.c:5377
-msgid "_Export bookmarks"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "Lesezeichen _importieren"
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
 msgstr "Lesezeichen _exportieren"
 
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Suchmaschinen verwalten"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines"
+msgstr "_Suchmaschinen verwalten …"
 
-#: ../midori/midori-browser.c:5383
-msgid "_Clear Private Data"
-msgstr "_Private Daten löschen"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "Private Daten _löschen"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Seite _untersuchen"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
-msgstr "_Vorheriger Reiter"
+msgstr "_Vorheriger Tab"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
-msgstr "_Nächster Reiter"
+msgstr "_Nächster Tab"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
-msgstr "Reiter an die _erste Position verschieben."
+msgstr "Tab an die _erste Position verschieben."
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
-msgstr "Reiter _zurück schieben"
+msgstr "Tab _zurückschieben"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
-msgstr "Reiter v_orwärts schieben"
+msgstr "Tab v_orwärtsschieben"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
-msgstr "Reiter an die _letzte Position verschieben."
+msgstr "Tab an die _letzte Position verschieben."
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
-msgstr "_Aktuellen Reiter fokussieren"
+msgstr "_Aktuellen Tab fokussieren"
 
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "_Nächste Ansicht fokussieren"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
-msgstr "Nur das Symbol des _aktuellen Reiters anziegen"
-
-#: ../midori/midori-browser.c:5413
-msgid "_Duplicate Current Tab"
-msgstr "Aktuellen Reiter _verdoppeln"
+msgstr "Nur das Symbol des _aktuellen Tabs anzeigen"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
-msgstr "Ande_re Reiter schließen"
+msgstr "Ande_re Tabs schließen"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Die letzte _Sitzung öffnen"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Häufige Fragen"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Einen Fehler _melden …"
 
-#: ../midori/midori-browser.c:5432 ../midori/midori-browser.c:6089
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Extras"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menüleiste"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigationsleiste"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Seiten_leiste"
 
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Seitenleiste"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Lesezeichenleiste"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusleiste"
 
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Traditionelles Chinesisch (BIG5)"
 
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Vereinfachtes Chinesisch (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japanisch (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreanisch (EUC-KR)"
 
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russisch (KOI8-R)"
 
-#: ../midori/midori-browser.c:5483 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5486 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Westlich (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:603
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Benutzerdefiniert …"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Verlauf konnte nicht initialisiert werden: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Trennlinie"
 
-#: ../midori/midori-browser.c:6002
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Ort …"
 
-#: ../midori/midori-browser.c:6004
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Einen bestimmten Ort öffnen"
 
-#: ../midori/midori-browser.c:6026
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Im _Netz suchen …"
 
-#: ../midori/midori-browser.c:6028
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Eine Suche im Netz starten"
 
-#: ../midori/midori-browser.c:6055
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
-msgstr "Reiter oder Fenster zurückholen"
+msgstr "Geschlossenen Tab oder Fenster wiederherstellen"
 
-#: ../midori/midori-browser.c:6072
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Die gespeicherten Lesezeichen anzeigen"
 
-#: ../midori/midori-browser.c:6105
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
-msgstr "_Reiter"
+msgstr "_Tabs"
 
-#: ../midori/midori-browser.c:6107
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
-msgstr "Eine Übersicht aller offenen Reiter zeigen"
+msgstr "Eine Übersicht aller offenen Tabs zeigen"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menü"
 
-#: ../midori/midori-browser.c:6123
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menü"
 
-#: ../midori/midori-browser.c:6892
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Unerwartete Einstellung »%s«"
-
 #: ../midori/midori-extension.c:341
 #, 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:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Zertifikat exportieren"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Die signierende Zertifizierungsstelle ist unbekannt."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -911,57 +956,56 @@ msgstr ""
 "Das Zertifikat entspricht nicht der erwarteten Identität der Seite, von der "
 "es empfangen wurde."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Die Aktivierungszeit des Zertifikats liegt in der Zukunft."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: ../midori/midori-locationaction.c:1368
-#, fuzzy
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
-"Das Zertifikat wurde widerrufen, entsprechend der Widerrufliste von "
-"GTIsConnections."
+"Das Zertifikat wurde gemäß der GTlsConnection's certificate revocation list "
+"widerrufen."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Der Algorithmus des Zertifikats wurde als unsicher erkannt."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Ein anderer Fehler trat bei der Überprüfung des Zertifikats auf."
 
-#: ../midori/midori-locationaction.c:1420
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "Zertifikat _exportieren"
 
-#: ../midori/midori-locationaction.c:1435
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Selbstsigniert"
 
-#: ../midori/midori-locationaction.c:1459
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Sicherheitsdetails"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1542
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Einfügen und _fortfahren"
 
-#: ../midori/midori-locationaction.c:1774
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Nicht überprüft"
 
-#: ../midori/midori-locationaction.c:1782
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Überprüfte und verschlüsselte Verbindung"
 
-#: ../midori/midori-locationaction.c:1789
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Offene, unverschlüsselte Verbindung"
 
@@ -978,433 +1022,452 @@ msgstr "Leiste schließen"
 msgid "Align sidepanel to the left"
 msgstr "Seitenleiste links anordnen"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Schnellwahl anzeigen"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Startseite anzeigen"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:344
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
-msgstr "Zuletzt geöffnete Reiter anzeigen"
+msgstr "Zuletzt geöffnete Tabs anzeigen"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:343
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
-msgstr "Letzte Reiter zeigen, ohne sie zu laden"
+msgstr "Letzte Tabs zeigen, ohne sie zu laden"
 
-#: ../midori/midori-websettings.c:132
-#, fuzzy
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
-msgstr "Leere Seite anzeigen"
+msgstr "Eine leere Seite anzeigen"
 
-#: ../midori/midori-websettings.c:134
-#, fuzzy
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
-msgstr "Suchmaschinen verwalten"
+msgstr "Vorgegebene Suchmaschine anzeigen"
 
-#: ../midori/midori-websettings.c:136
-#, fuzzy
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
-msgstr "Startseite anzeigen"
+msgstr "Benutzerdefinierte Seite anzeigen"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanisch (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
-msgstr "Neuer Reiter"
+msgstr "Neuer Tab"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
-msgstr "Aktueller Reiter"
+msgstr "Aktueller Tab"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Standard"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Symbole"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Kleine Symbole"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Symbole und Text"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text neben Symbolen"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatisch (GNOME oder Umgebung)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP-Zwischenrechner"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Kein Zwischenrechner"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Der Stil der Werkzeugleiste"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Immer meine Schriften benutzen"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
-"Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben"
+"Schriftarten auf Internet-Seiten mit Benutzereinstellungen überschreiben"
 
-#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Die Konfiguration konnte nicht geladen werden: %s\n"
 
-#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Ungültiger Einstellungswert »%s«"
 
-#: ../midori/midori-tab.vala:121
-#, fuzzy, c-format
+#: ../midori/midori-tab.vala:133
+#, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n"
+msgstr "Anwenden des Stylesheets fehlgeschlagen: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Tableiste anzeigen"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Nur Tab_symbol anzeigen"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Tab _rechts schließen"
+msgstr[1] "Tabs _rechts schließen"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Ande_ren Tab schließen"
+msgstr[1] "Ande_re Tabs schließen"
 
-#: ../midori/midori-view.c:767 ../midori/midori-view.c:895
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
-msgstr "Dieser Webseite vertrauen"
+msgstr "Dieser Internet-Seite vertrauen"
 
-#: ../midori/midori-view.c:893
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Sicherheitsstufe unbekannt"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s möchte eine HTML5-Datenbank speichern."
 
-#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Verweigern"
 
-#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Zulassen"
 
-#: ../midori/midori-view.c:1226
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s möchte Ihren Standort wissen."
 
-#: ../midori/midori-view.c:1357
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' kann nicht gefunden werden"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Die Seite '%s' konnte nicht geladen werden:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Überprüfen Sie die Adresse auf Tippfehler"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Stellen Sie sicher, dass ein Netzwerkkabel angeschlossen ist oder die WLAN-"
+"Karte aktiviert ist"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Stellen Sie sicher, dass Ihre Netzwerkeinstellungen korrekt sind"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Erneut versuchen"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "Fehler - %s"
+msgid "Oops - %s"
+msgstr "Oops - %s"
 
-#: ../midori/midori-view.c:1358
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Die Seite »%s« konnte nicht geladen werden."
+msgid "Something went wrong with '%s'."
+msgstr "Etwas ist schief gelaufen mit '%s'."
 
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Erneut versuchen"
 
-#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2712
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Nachricht an %s schicken"
 
-#: ../midori/midori-view.c:2497
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "_Suchmaschine hinzufügen …"
 
-#: ../midori/midori-view.c:2540 ../midori/midori-view.c:2847
-msgid "Inspect _Element"
-msgstr "Element _untersuchen"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "_Verweis öffnen"
 
-#: ../midori/midori-view.c:2592
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
-msgstr "Verweis in neuem _Reiter öffnen"
+msgstr "Link in neuem _Tab öffnen"
 
-#: ../midori/midori-view.c:2596
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
-msgstr "Verweis in _Vordergrund-Reiter öffnen"
+msgstr "Verweis im _Vordergrundtab öffnen"
 
-#: ../midori/midori-view.c:2597
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
-msgstr "Verweis in _Hintergrund-Reiter öffnen"
+msgstr "Verweis im _Hintergrundtab öffnen"
 
-#: ../midori/midori-view.c:2600
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Verweis in neuem _Fenster öffnen"
 
-#: ../midori/midori-view.c:2603
-msgid "Open Link as Web A_pplication"
-msgstr "Verweis als _Internetanwendung öffnen"
-
-#: ../midori/midori-view.c:2608
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
-msgstr "Verweisziel k_opieren"
+msgstr "Verweisziel _kopieren"
 
-#: ../midori/midori-view.c:2614
-#, fuzzy
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
-msgstr "_Seite speichern unter …"
+msgstr "Speichern _unter …"
 
-#: ../midori/midori-view.c:2624
-#, fuzzy
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
-msgstr "Bild in neuem Fe_nster öffnen"
+msgstr "_Bild in neuem Fenster öffnen"
 
-#: ../midori/midori-view.c:2625
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
-msgstr "_Bild in neuem Reiter öffnen"
+msgstr "_Bild in neuem Tab öffnen"
 
-#: ../midori/midori-view.c:2629
-#, fuzzy
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
-msgstr "Bild kopieren"
+msgstr "_Bild kopieren"
 
-#: ../midori/midori-view.c:2632
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Bi_ld speichern"
 
-#: ../midori/midori-view.c:2635
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "In _Bildbetrachter öffnen"
 
-#: ../midori/midori-view.c:2642
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Video_adresse kopieren"
 
-#: ../midori/midori-view.c:2645
-msgid "Save _Video"
-msgstr "_Video speichern"
-
-#: ../midori/midori-view.c:2645
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "_Video herunterladen"
 
-#: ../midori/midori-view.c:2671
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Adresse in neuem _Tab öffnen"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Suchen _mit"
 
-#: ../midori/midori-view.c:2700
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "Im Netz _suchen"
 
-#: ../midori/midori-view.c:2720
-msgid "Open Address in New _Tab"
-msgstr "Adresse in neuem _Reiter öffnen"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
-msgstr "_Rahmen in neuem Reiter öffnen"
+msgstr "_Rahmen in neuem Tab öffnen"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Element _untersuchen"
 
-#: ../midori/midori-view.c:2984
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Datei öffnen oder von %s herunterladen"
 
-#: ../midori/midori-view.c:2997
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Dateiname: %s"
 
-#: ../midori/midori-view.c:3002
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Dateityp: »%s«"
 
-#: ../midori/midori-view.c:3004
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Dateityp: %s (»%s«)"
 
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3052
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s öffnen"
 
-#: ../midori/midori-view.c:3581
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Seite untersuchen - %s"
 
-#: ../midori/midori-view.c:4101
-#, c-format
-msgid "No documentation installed"
-msgstr "Keine Dokumentation installiert"
-
-#: ../midori/midori-view.c:4177
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori speichert keine persönlichen Daten:"
 
-#: ../midori/midori-view.c:4178
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Es werden weder Verlauf noch Web-Cookies gespeichert."
 
-#: ../midori/midori-view.c:4179
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Erweiterungen sind deaktiviert."
 
-#: ../midori/midori-view.c:4180
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "HTML5-Speicher, lokale Datenbank und Anwendungszwischenspeicher sind "
 "deaktiviert."
 
-#: ../midori/midori-view.c:4181
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
-msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen:"
+msgstr "Midori verhindert, dass Internet-Seite ihre Nutzer verfolgen:"
 
-#: ../midori/midori-view.c:4182
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 "Weiterleitende URLs werden bis hintunter auf den Rechnernamen aufgelöst."
 
-#: ../midori/midori-view.c:4183
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "DNS-Auflösung im Voraus ist deaktiviert."
 
-#: ../midori/midori-view.c:4184
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr ""
-"Die Sprach- und Zeitzoneneinstellungen werden Webseiten nicht verraten."
+"Die Sprach- und Zeitzoneneinstellungen werden Internet-Seiten nicht "
+"übermittelt."
 
-#: ../midori/midori-view.c:4185
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
-"Flash und andere Netscape-Erweiterungen können nicht durch Websites "
-"aufgelistet werden."
+"Internet-Seiten können keine Aufstellung der installierten Erweiterungen "
+"(Flash usw.) abrufen."
 
-#: ../midori/midori-view.c:4225
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "Versionsnummern in Klammern geben Versionen zur Laufzeit an."
 
-#: ../midori/midori-view.c:4275
-msgid "Page loading delayed"
-msgstr "Laden der Seite verzögert"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Das Laden der Seite wurde verzögert:"
 
-#: ../midori/midori-view.c:4276
+#: ../midori/midori-view.c:4000
 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:4277
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Seite laden"
 
-#: ../midori/midori-view.c:4444
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Leere Seite"
 
-#: ../midori/midori-view.c:4658
-msgid "_Duplicate Tab"
-msgstr "Reiter _verdoppeln"
-
-#: ../midori/midori-view.c:4663
-msgid "Show Tab _Label"
-msgstr "Reiterleiste anzeigen"
-
-#: ../midori/midori-view.c:4663
-msgid "Show Tab _Icon Only"
-msgstr "Nur Reiter_symbol anzeigen"
-
-#: ../midori/midori-view.c:4670
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5359
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "vorige"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5378
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "nächste"
 
-#: ../midori/midori-view.c:5391
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Hintergrundbilder drucken"
 
-#: ../midori/midori-view.c:5392
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Leget fest, ob Hintergrundbilder gedruckt werden sollen oder nicht"
 
-#: ../midori/midori-view.c:5417
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Inhalte"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s von %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1412,27 +1475,27 @@ msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s verbleibend"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Die heruntergeladene Datei ist fehlerhaft."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1441,131 +1504,127 @@ msgstr ""
 "normalerweise, dass die Datei unvollständig ist oder im Nachhinein verändert "
 "wurde."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Die Datei Â«%s» kann in diesem Ornder nicht gespeichert werden."
+msgstr "Die Datei Â»%s« kann in diesem Ordner nicht gespeichert werden."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Sie haben an diesem Ort keine Schreibberechtigung."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, 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 Speicherplatz reicht nicht aus, um »%s« herunterzuladen."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Schnellwahl"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klicken um eine Verknüpfung hinzuzufügen"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Ziel der Verknüpfung eingeben"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Titel der Verknüpfung eingeben"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Programmstart"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Beim Starten von Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Startseite:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "_Aktuelle Seite benutzen"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Aktuelle Seite als Startseite benutzen"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Schriften"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proportionale Schriftart"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Dicktengleiche Schriftart"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 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
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Mindestschriftgröße"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Die Mindestschriftgröße, in der Text angezeigt wird"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Bevorzugter Zeichensatz"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Bilder automatisch laden"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Rechtschreibprüfung einschalten"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Skripte einschalten"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "WebGL-Unterstützung einschalten"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape-Module einschalten"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Text und Bilder vergrößern"
@@ -1578,143 +1637,137 @@ msgstr "Skripte können Aufklappfenster öffnen"
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Skripte können selbstständig neue Fenster öffnen"
 
-#: ../midori/midori-preferences.c:415
-msgid "Middle click opens Selection"
-msgstr "Mittelklick öffnet Auswahl"
-
-#: ../midori/midori-preferences.c:416
-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 "Default Zoom Level"
+msgstr "Vorgegebene Ansichtsgröße"
 
-#: ../midori/midori-preferences.c:420
-msgid "Flash window on background tabs"
-msgstr "Fenster bei Hintergrund-Reitern blinken lassen"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Startfaktor, mit dem neu geöffnete Tabs vergößert werden"
 
-#: ../midori/midori-preferences.c:425
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Bevorzugte Sprachen"
 
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:426
 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 ""
 "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur "
-"Darstellung mehrsprachiger Internetseiten benutzt wird, zum Beispiel »de«, "
+"Darstellung mehrsprachiger Internet-Seiten benutzt wird, zum Beispiel »de«, "
 "»ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Heruntergeladene Dateien speichern in:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:438
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navigation"
 
-#: ../midori/midori-preferences.c:442
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Thema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Werkzeugleistenstil:"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Neue Seiten öffnen in:"
 
-#: ../midori/midori-preferences.c:451
-#, fuzzy
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
-msgstr "Neues Verhalten der Reiter:"
+msgstr "Verhalten von neuen Tabs:"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
-msgstr "Knöpfe zum Schließen auf Reitern"
+msgstr "Schließenknöpfe auf Tabs"
 
-#: ../midori/midori-preferences.c:460
-msgid "Always Show Tabbar"
-msgstr "Reiterleiste immer anzeigen"
-
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
-msgstr "Reiter neben aktuellem öffnen"
+msgstr "Tabs neben dem aktuellen öffnen"
 
-#: ../midori/midori-preferences.c:465
-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-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "Neue Tabs neben dem aktuellen Tab oder nach dem letzten öffnen"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
-msgstr "Reiter im Hintergrund öffnen"
+msgstr "Tab im Hintergrund öffnen"
 
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
-msgstr "Texteditor"
+msgstr "Textbearbeitung"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Nachrichtenaggregator"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:484
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../midori/midori-preferences.c:486
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxy-Server"
 
-#: ../midori/midori-preferences.c:491
-msgid "Hostname"
-msgstr "Rechnername"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "Adresse"
 
-#: ../midori/midori-preferences.c:499
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
-#: ../midori/midori-preferences.c:512
-#, fuzzy
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
-msgstr "Unterstützte Proxy Typen"
+msgstr "Unterstützte Proxyarten"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Zwischenspeicher"
 
-#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:545
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Ausgeben als"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Alte Cookies löschen nach:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Die maximale Anzahl an Tagen, für die Cookies gespeichert werden"
 
-#: ../midori/midori-preferences.c:571
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Nur Cookies von Seiten annehmen, die ich besuche"
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Cookies von Drittanbietern blockieren"
 
-#: ../midori/midori-preferences.c:577
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1722,38 +1775,42 @@ msgstr ""
 "Cookies sind Profildateien, die Anmeldedaten, Spielstände oder "
 "Benutzerprofile zu Werbezwecken speichern."
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "HTML5-Anwendungsspeicher einschalten"
 
-#: ../midori/midori-preferences.c:587
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5-Lokalspeicher einschalten"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:591
+#: ../midori/midori-preferences.c:613
 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-preferences.c:593
+#: ../midori/midori-preferences.c:615
 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/midori-preferences.c:596
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Seiten aus dem Verlauf löschen nach:"
 
-#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 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-preferences.c:638 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Erweiterungen"
 
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Suchmaschinen verwalten"
+
 #: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Suchmaschine hinzufügen"
@@ -1770,79 +1827,74 @@ msgstr "_Name:"
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../midori/midori-searchaction.c:1122
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Kürzel:"
 
-#: ../midori/midori-searchaction.c:1412
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Suchmaschinen verwalten"
 
-#: ../midori/midori-searchaction.c:1512
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Als _Standard"
 
-#: ../midori/midori-searchaction.c:1623
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n"
 
-#: ../midori/midori-searchaction.c:1678
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Verlauf"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Lesezeichen und Verlauf"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Verlauf konnte nicht initialisiert werden: %s"
+msgid "Search for %s"
+msgstr "Nach %s suchen"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Auswahl aus Verlauf schlug fehl: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Nach %s suchen"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Suchen mit …"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Suchen mit %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Anwendung oder Befehl zum Öffnen von »%s« wählen:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Externes Programm konnte nicht ausgeführt werden."
 
-#: ../midori/sokoke.c:561
-#, fuzzy
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
-msgstr "Ungültige URI"
+msgstr "Ungültige Adresse"
 
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
@@ -1865,119 +1917,139 @@ msgstr "Groß-/ Kleinschreibung"
 msgid "Close Findbar"
 msgstr "Suchleiste schließen"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Die Datei »<b>%s</b>« wurde heruntergeladen."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d Lesezeichen"
+msgstr[1] "%d Lesezeichen"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Übertragung abgeschlossen"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d Unterordner"
+msgstr[1] "%d Unterordner"
 
-#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Alle entfernen"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Leerer Ordner"
 
-#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Einige Dateien werden gerade heruntergeladen."
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Ordner enthält  %s und keine Lesezeichen"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "Midori _beenden"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Ordner enthält %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Die Übertragungen werden abgebrochen, wenn Midori beendet wird."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Ordner enthält  %s und %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Lesezeichen verweist auf: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Lesezeichen konnte nicht aktualisiert werden: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s und keine Lesezeichen"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s und %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Markiertes Lesezeichen bearbeiten"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Markiertes Lesezeichen löschen"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Einen neuen Ordner hinzufügen"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Trennlinie</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "In neuem _Tab öffnen"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Lesezeichen durchsuchen"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Verlauf"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Heute"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Vor einer Woche"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 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:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Ausgewählten Verlaufseintrag löschen"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Den gesamten Verlauf löschen"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Verlauf durchsuchen"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Übertragungen"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Zielordner ö_ffnen"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Verweisziel ko_pieren"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Authentifizierung erforderlich"
@@ -2002,114 +2074,63 @@ msgstr "Passwort"
 msgid "_Remember password"
 msgstr "Passwort _merken"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Das benannte Symbol »%s« konnte nicht geladen werden"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Animationsbilder sind fehlerhaft"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Keine"
 
-#: ../katze/katze-utils.c:422
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Eigenschaft »%s« ist ungültig für %s"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Datei wählen"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Dateispeicherordner auswählen"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "Keine"
-
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 Tag"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 Woche"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 Monat"
 
-#: ../katze/katze-utils.c:692
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 Jahr"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Einstellungen für %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Prüfsumme:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Prüfsumme:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Werbefilter einstellen"
-
-#: ../extensions/adblock.c:512
-#, 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 ""
-"Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld "
-"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere "
-"Listen finden Sie auf %s."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Regel bearbeiten"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regel:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bild bloc_kieren"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Verweis blo_ckieren"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Werbeblocker"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+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?"
 
@@ -2131,84 +2152,84 @@ msgstr "Benutzerstil _installieren"
 msgid "Don't install"
 msgstr "Nicht installieren"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Benutzerskripte"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Benutzerstile"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Fehler"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Soll »%s« gelöscht werden?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Benutzerskript löschen"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Benutzerstil löschen"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Die Datei »<b>%s</b>« wird endgültig gelöscht."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
-msgstr "In Texteditor öffnen"
+msgstr "Im Textbearbeiter öffnen"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Zielordner öffnen"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Eine neue Erweiterung hinzufügen"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Ausgewählte Erweiterung löschen"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Benutzererweiterungen"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Der Ordner »%s« kann nicht überwacht werden: %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Unterstützung für Benutzerskripte und -stile"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
-msgstr "Farbige Reiter"
+msgstr "Farbige Tabs"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
-msgstr "Alle Reiter unterschiedlich einfärben"
+msgstr "Alle Tabs unterschiedlich einfärben"
 
 #: ../extensions/cookie-manager/cookie-manager-page.c:73
 #: ../extensions/cookie-manager/main.c:35
 msgid "Cookie Manager"
-msgstr "Cookieverwaltung"
+msgstr "Cookie-Verwaltung"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Alle löschen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2216,32 +2237,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:116
 msgid "Expand All"
 msgstr "Alle ausklappen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Alle einklappen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Frage"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Am Ende der Sitzung"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2259,15 +2280,15 @@ msgstr ""
 "Verfällt: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nein"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2276,20 +2297,20 @@ msgstr ""
 "<b>Domäne</b>: %s\n"
 "<b>Profildateien</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Name"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Alle _ausklappen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Alle _einklappen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Cookies nach Name oder Rechner suchen"
 
@@ -2299,41 +2320,61 @@ msgstr "Cookies auflisten, anzeigen und löschen"
 
 #: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
-msgstr "_Adressen aller Reiter kopieren"
+msgstr "_Adressen aller Tabs kopieren"
 
 #: ../extensions/copy-tabs.c:96
 msgid "Copy Addresses of Tabs"
-msgstr "Adressen aller Reiter kopieren"
+msgstr "Adressen aller Tabs kopieren"
 
 #: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
-msgstr "Die Adressen aller Reiter in die Zwischenablage kopieren"
+msgstr "Die Adressen aller Tabs in die Zwischenablage kopieren"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Verzögertes Laden"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Verzögerung in Sekunden bis zum Laden der Seite:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
-msgstr "Laden der Seite verzögern, bis der Reiter tatsächlich genutzt wird."
+msgstr "Laden der Seite verzögern, bis der Tab tatsächlich genutzt wird."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Doppelklick für mehr Informationen"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Diese Erweiterung zeigt GLib-Fehlermeldungen im Benachrichtigungsfeld."
 
 #: ../extensions/external-download-manager.vala:124
-#, fuzzy
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr ""
-"Ein Fehler trat beim Herunterladen einer Datei mit der folgendenden "
-"Erweiterung auf:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Beim Versuch eine Datei mit der folgenden Erweiterung herunterzuladen, ist "
+"ein Fehler aufgetreten: \n"
+"%s\n"
+"\n"
+"Fehler:\n"
+"%s\n"
+"\n"
+"Ohne Erweiterung fortfahren."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
-msgstr "Externer Übertragungsmanager - Aria2"
+msgstr "Externe Übertragungsverwaltung - Aria2"
 
 #: ../extensions/external-download-manager.vala:176
 msgid "Download files with Aria2"
@@ -2341,7 +2382,7 @@ msgstr "Dateien mit Aria2 herunterladen"
 
 #: ../extensions/external-download-manager.vala:202
 msgid "External Download Manager - SteadyFlow"
-msgstr "Externer Übertragungsmanager - SteadyFlow"
+msgstr "Externer Übertragungsverwaltung – SteadyFlow"
 
 #: ../extensions/external-download-manager.vala:203
 msgid "Download files with SteadyFlow"
@@ -2358,38 +2399,38 @@ msgstr "Dateien mit »%s« oder benutzerdefinierten Befehl herunterladen"
 
 #: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
-msgstr "Externer Übertragungsmanager - Befehlszeile"
+msgstr "Externer Übertragungsverwaltung – Befehlszeile"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
-"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden."
+"Die für Atom benötigten »entry«-Elemente wurden im XML nicht gefunden."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr ""
-"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden."
+"Die für Atom benötigten »feed«-Elemente wurden im XML nicht gefunden."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Zuletzt aktualisiert: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Nachrichtenquellen"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Eine neue Nachrichtenquelle hinzufügen"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Nachrichtenquelle löschen"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Nachrichtenquellen (Feeds)"
 
@@ -2398,49 +2439,49 @@ msgstr "_Nachrichtenquellen (Feeds)"
 msgid "Failed to find root element in feed XML data."
 msgstr "Das Basiselement wurde im XML der Nachrichtenquelle nicht gefunden."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Nicht unterstütztes Quellenformat."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "XML-Quelle konnte nicht ausgelesen werden: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 "Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Nicht unterstützte RSS-Version gefunden."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 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."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Nachrichtenquelle »%s« ist bereits vorhanden"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Fehler beim Laden der Nachrichtenquelle »%s«"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Nachrichtenquellenleiste"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom-/ RSS-Quellen (Feeds) lesen"
 
@@ -2461,128 +2502,422 @@ msgstr ""
 "Ein Benutzername und ein Kennwort\n"
 "werden zum Öffnen dieses Ortes benötigt:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Passwort auf dieser Seite merken?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Merken"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Jetzt nicht"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Niemals für diese Seite"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Formulardatenstatus umschalten"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n"
+"Speichern von Formulardaten für den aktuellen Tab aktivieren oder "
+"deaktivieren."
 
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
-"Speichern von Formuardaten pro Reiter nur per Tastenkombination (Strg+Shirt"
-"+F)"
+"Speichern von Formulardaten, pro Tab, nur per Tastenkombination "
+"(Strg+Umschalttaste+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Formularvervollständigung"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Speichert zuvor eingegebene Formulareingaben"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Vervollständigung schlug fehl\n"
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
-msgstr "Keine unbesuchten Reiter vorhanden"
+msgstr "Keine unbesuchten Tabs vorhanden"
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Verlaufsliste"
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
-msgstr "Verhalten beim Schließen von Reitern"
+msgstr "Verhalten beim Schließen von Tabs"
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Nichts tun"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
-msgstr "Zum letzten Reiter wechseln"
+msgstr "Zum letzten Tab wechseln"
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
-msgstr "Zum nächsten neuen Reiter wechseln"
+msgstr "Zum neuesten Tab wechseln"
 
-#: ../extensions/history-list.vala:430
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Fenster bei Hintergrundtabs blinken lassen"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
-msgstr "Nächster neuer Reiter (Verlaufsgestützte Liste)"
+msgstr "Nächster neuer Tab (Verlaufsliste)"
 
-#: ../extensions/history-list.vala:431
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
-msgstr "Nächster neuer Reiter aus dem Verlauf"
+msgstr "Nächster neuer Tab aus dem Verlauf"
 
-#: ../extensions/history-list.vala:440
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
-msgstr "Voheriger neuer Reiter (Verlaufsgestützte Liste)"
+msgstr "Vorheriger neuer Tab (Verlaufsliste)"
 
-#: ../extensions/history-list.vala:441
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
-msgstr "Voheriger neuer Reiter aus dem Verlauf"
+msgstr "Voheriger neuer Tab aus dem Verlauf"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
-msgstr "Reiter in Hintergrund anzeigen (Verlaufsliste)"
+msgstr "Tab im Hintergrund anzeigen (Verlaufsliste)"
 
-#: ../extensions/history-list.vala:451
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
-msgstr "Aktuell ausgewählten Reiter im Hintergrund anzeigen"
+msgstr "Aktuell ausgewählten Tab im Hintergrund anzeigen"
 
-#: ../extensions/history-list.vala:578
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Verlaufsgestützte Liste"
 
-#: ../extensions/history-list.vala:579
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
-"Beim Wechseln oder Schließen von Reitern zum zuletzt genutzten Reiter "
-"wechseln"
+"Beim Wechseln oder Schließen von Tabs zum zuletzt genutzten Tab wechseln"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL schlägt fehl %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Annehmen"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Für diese Sitzung annehmen"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blockieren"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Die Datenbank der Erweiterung konnte nicht geöffnet werden: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Ausführen des Datenbank Ausdrucks fehlgeschlagen: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Wollen Sie wirklich alle JavaScript-Berechtigungen entfernen?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Alle JavaScript-Berechtigungen entfernen?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Alle JavaScript-Berechtigungen werden entfernt. Sie werden dann bei jeder "
+"Internet-Seite, die Sie besuchen, erneut um Genehmigung gebeten."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Verwalterinstanz"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instanz zur globalen NoJS-Verwaltung"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "NoJS konfigurieren"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Folgend finden Sie eine Liste mit allen Internet-Seiten und den zugehörigen "
+"Richtlinien. Durch Markieren und Betätigen von <i>Entfernen</i> können Sie "
+"eine Richtlinie entfernen."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domäne"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Regelungen"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "_Alle entfernen"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Skripte auf allen Seiten erlauben"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Skripte, bei nicht bekannten Adressen, als Vorgabe blockieren"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Berechtigungen an Domains der zweiten Ebene einstellen"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "%s ablehnen"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "%s erlauben"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "%s für diese Sitzung erlauben"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Browserfenster"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Diese Instanz des Midori-Browsers gehört zu"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Ansicht"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Diese Midori Ansichtsinstanz gehört zu"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Menüsymbolstatus"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Status des Menüsymbols in der Statusleiste anzeigen"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Unbestimmt"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Erlaubt"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Gemischt"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Verweigert"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Ein schwerwiegender Fehler hindert die NoJS-Erweiterung daran, weiter "
+"ausgeführt zu werden. Sie sollten sie deaktivieren."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Fehler in der NoJS-Erweiterung"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Grund"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+"Anlegen eines Konfigurationsordners für die Erweiterung nicht möglich: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+"Anlegen eines Konfigurationsordners für die Erweiterung nicht möglich."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Öffnen der Datenbank von der Erweiterung nicht möglich."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"Initialisierung der Datenbankstruktur für die Erweiterung nicht möglich."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instanz der Erweiterung"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Die Instanz von Midori's Erweiterungen für diese Erweiterung"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Anwendungsinstanz"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Die Midori-Anwendungsinstanz zu der diese Erweiterung gehört"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Datenbankinstanz"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Zeiger auf die sqllite-Datenbankinstanz die von dieser Erweiterung genutzt "
+"wird"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Datenbankpfad"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Pfad zu der sqllite-Datenbankinstanz die von dieser Erweiterung genutzt wird"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Alle Seiten erlauben"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Wenn wahr, wird diese Erweiterung die Richtlinien der einzelnen Seiten nicht "
+"überprüfen, sondern diese zulassen."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Nur Domains der zweiten Ebene"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Falls gesetzt, verkürzt diese Erweiterung jede Domain auf ihre »Second-Level-"
+"Domain«  (www.example.org wird zu example.org gekürzt)"
 
-#: ../extensions/mouse-gestures.c:297
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Unbekannte Domain-Richtlinie"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Richtlinie zur Nutzung bei unbekannten Domains."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Zeitweise annehmen"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Mausgesten"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Midori durch Bewegen der Maus steuern"
 
@@ -2595,9 +2930,8 @@ msgid "Customize Keyboard shortcuts"
 msgstr "Tastaturkürzel anpassen"
 
 #: ../extensions/shortcuts.c:275
-#, fuzzy
 msgid "Customize Sh_ortcuts…"
-msgstr "_Tastaturkürzel anpassen …"
+msgstr "Tastenkürzel anpassen…"
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2607,11 +2941,11 @@ msgstr "Tastaturkürzel"
 msgid "View and edit keyboard shortcuts"
 msgstr "Tastaturkürzel ansehen und bearbeiten"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Uhr in der Statusleiste"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Datum und Zeit in der Statusleiste anzeigen"
 
@@ -2627,39 +2961,43 @@ msgstr "Skripte"
 msgid "Netscape plugins"
 msgstr "Netscape-Module"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape-Module einschalten"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Funktionen in der Statusleiste"
 
 #: ../extensions/statusbar-features.c:260
 msgid "Easily toggle features on web pages on and off"
-msgstr "Funktionen auf Internetseiten leicht an- und abstellen"
+msgstr "Funktionen auf Internet-Seiten leicht ein- und ausschalten"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
-msgstr "Reiterleiste"
+msgstr "Tableiste"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
-msgstr "_Reiterleiste"
+msgstr "_Tableiste"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
-msgstr "Reiter in einer senkrechten Leiste anzeigen"
+msgstr "Tabs in einer senkrechten Leiste anzeigen"
 
 #: ../extensions/tabs-minimized.c:76
 msgid "Only Icons on Tabs by default"
-msgstr "Nur Symbole in Reitern anzeigen"
+msgstr "Nur Symbole in Tabs anzeigen"
 
 #: ../extensions/tabs-minimized.c:77
 msgid "New tabs have no label by default"
-msgstr "Neue Reiter haben keine Beschriftung"
+msgstr "Neue Tabs ohne Beschriftung"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Werkzeugleiste anpassen"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2667,279 +3005,214 @@ 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:433
 msgid "Available Items"
 msgstr "Verfügbare Elemente"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Angezeigte Elemente"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Werkzeugleiste anpassen …"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
-msgstr "Werkzeugleisteneditor"
+msgstr "Werkzeugleistenbearbeiter"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Werkzeugleisten leicht anpassen"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Cookies konnten nicht geladen werden\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Private Daten löschen"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Private Daten löschen"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Folgende Daten löschen:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
-msgstr "_Zuletzt geöffnete Seiten"
+msgstr "_Zuletzt geöffnete Tabs"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Private Daten beim _Beenden von Midori löschen"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:302
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Gespeicherte Anmeldungen und Passwörter"
 
-#: ../midori/midori-privatedata.c:304
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
-msgstr "Cookies und Webseitendaten"
+msgstr "Cookies und Internet-Seiten-Daten"
 
-#: ../midori/midori-privatedata.c:311
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
-msgstr "Symbole von Internetseiten"
+msgstr "Symbole von Internet-Seiten"
 
 #: ../midori/midori-viewcompletion.vala:18
 msgid "Open tabs"
-msgstr "Reiter öffnen"
+msgstr "Tabs öffnen"
 
-#: ../midori/midori-viewcompletion.vala:75
-#, fuzzy
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
-msgstr "_Zuletzt geöffnete Seiten"
+msgstr "Weitere geöffnete Tabs…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Verlauf konnte nicht geleert werden: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-#, fuzzy
-msgid "failed to ATTACH old db"
-msgstr "Fehler beim Anfügen der Lesezeichen"
-
-#: ../midori/midori-bookmarks.c:111
-#, fuzzy
-msgid "failed to import from old db"
-msgstr "Fehler beim Importieren der Lesezeichen"
-
-#: ../midori/midori-bookmarks.c:115
-#, fuzzy
-msgid "failed to rollback the transaction"
-msgstr "Transaktion konnte nicht rückgängig gemacht werden"
-
-#: ../midori/midori-bookmarks.c:119
-#, fuzzy
-msgid "failed to DETACH "
-msgstr "Fehler beim Abtrennen der Lesezeichen"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n"
 
-#: ../midori/midori-bookmarks.c:259
-#, fuzzy, c-format
-msgid "Couldn't create bookmarks table: %s\n"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
 msgstr "Lesezeichen konnte nicht aktualisiert werden: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
-#, fuzzy, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
-
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Entfernen des Lesezeichens fehlgeschlagen: %s\n"
 
-#: ../midori/midori-session.c:192
+#: ../midori/midori-session.c:217
 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/midori-session.c:361
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Die Konfiguration konnte nicht gespeichert werden. %s"
 
-#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Die Sitzung konnte nicht geladen werden: %s\n"
-
-#: ../midori/midori-session.c:412
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Die Sitzung konnte nicht gespeichert werden. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Der Papierkorb konnte nicht gespeichert werden. %s"
 
-#: ../midori/midori-frontend.c:314
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. "
-"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt."
+"Midori stürzte zum letzten Zeitpunkt der Nutzung ab. Sie können das Problem "
+"unter %s melden."
 
-#: ../midori/midori-frontend.c:324
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "_Einstellungen bearbeiten"
 
-#: ../midori/midori-frontend.c:328
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Alle Er_weiterungen ausschalten"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Absturzdialog anzeigen, nachdem Midori abgestürzt ist"
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
-msgstr "Alte Reiter verwerfen"
+msgstr "Alte Tabs verwerfen"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Letzten Abstürz-Verlauf anzeigen"
 
-#: ../midori/midori-frontend.c:406
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Im _Debugger ausführen"
+
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:439
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n"
 
-#: ../midori/midori-frontend.c:470
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Die Sitzung konnte nicht geladen werden: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Der Papierkorb konnte nicht geladen werden: %s\n"
 
-#: ../midori/midori-frontend.c:478
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Der Verlauf konnte nicht geladen werden: %s\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Folgende Fehler sind aufgetreten:"
 
-#: ../midori/midori-frontend.c:494
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorieren"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:252
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:297
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:667
-#, c-format, fuzzy
-msgid "SQL fails: %s"
-msgstr "SQL schlägt fehl: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121
-#, fuzzy
-msgid "Accept"
-msgstr "Cookies annehmen"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122
-#, fuzzy
-msgid "Accept for session"
-msgstr "Cookies annehmen"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123
-#, fuzzy
-msgid "Block"
-msgstr "Blockieren"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:156
-#, fuzzy, c-format
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
 msgid "Could not open database of extenstion: %s"
-msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:201
-#, fuzzy, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n"
+msgstr "Die Datenbank Erweiterung kann nicht geöffnet werden: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
-msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?"
+msgstr "Sollen wirkliche alle Cookie-Genehmigungen verworfen werden?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr "Alle Cookie Berechtigungen löschen?"
+msgstr "Alle Cookie-Genehmigungen verwerfen?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
-msgstr "Dieser Vorgang löscht alle Cookie Berechtigungen.  "
+msgstr ""
+"Alle Cookie-Genehmigungen werden verworfen. Sie werden dann für alle "
+"Internet-Seiten, die Sie besuchen, erneut um Genehmigung zum Speichern von "
+"Cookies gebeten werden."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
-msgstr "Cookieverwaltung"
+msgstr "Cookie-Zugriffsrechteverwaltung"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
-msgstr ""
+msgstr "Instanz der aktuellen Cookie-Zugriffsrechteverwaltung"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
-msgstr ""
+msgstr "Cookie-Genehmigungen einrichten"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2947,1024 +3220,358 @@ msgid ""
 "add a policy for a domain manually by entering the domain below, choosing "
 "the policy and clicking on <i>Add</i>."
 msgstr ""
+"Folgend finden Sie eine Liste von Internet-Seiten und den dazugehörigen "
+"Richtlinien. Durch Markieren und Betätigen von <i>Entfernen</i> können Sie "
+"eine Richtlinie entfernen. Sie können auch selbst Richtlinien für eine "
+"Domäne einrichten, indem Sie unten die Domäne eingeben, die Richtlinie "
+"festlegen und dann auf <i>Hinzufügen</i> klicken."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:561
-msgid "Domain"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-#, fuzzy
-msgid "Delete _all"
-msgstr "Alle löschen"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Richtlinie für nicht gelistete Cookies: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Nach Entscheidung fragen"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
 msgstr ""
+"Es ist ein schwerwiegender Fehler aufgetreten, der die weitere Ausführung "
+"der Cookie-Zugriffsrechteverwaltung verhindert. Sie sollten es deaktivieren."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:137
-msgid "Could not get path to configuration of extension: path is NULL"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:139
-msgid "Could not get path to configuration of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:145
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:147
-msgid "Could not create configuration folder for extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:164
-#, fuzzy
-msgid "Could not open database of extension."
-msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:197
-msgid "Could not set up database structure of extension."
-msgstr ""
+msgstr "Fehler in Erweiterung der Cookie-Zugriffsrechteverwaltung"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:318
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
+"Die globalen Cookie-Regeln für folgende Domäne konnten nicht ermittelt "
+"werden: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:493
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
-msgstr "Bis Ende der Session"
+msgstr "Bis die Sitzung endet"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
-#, c-format, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
 msgid "The website %s wants to store %d cookies."
-msgstr "Die Internetseite %s möchte %d Cookies speichern."
+msgstr "Die Internet-Seite %s möchte %d Cookies speichern."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:519
-#, c-format, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
 msgid "The website %s wants to store a cookie."
-msgstr "Die Internetseite möchte einen Cookie speichern"
+msgstr "Die Internet-Seite %s möchte einen Cookie speichern."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:523
-#, c-format, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr "Verschiedene Internetseiten möchten insgesamt %d Cookies speichern."
+msgstr "Mehrere Internet-Seiten möchten insgesamt %d Cookies speichern"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:532
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
-msgstr "_Akzeptieren"
+msgstr "_Annehmen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:533
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
-msgstr "Die letzte _Sitzung zurücksetzen"
+msgstr "Annehmen für diese Sitzung"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:534
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
-msgstr ""
+msgstr "Ab_lehnen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:535
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
-msgstr ""
+msgstr "Diesmal _ablehnen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:568
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
-msgstr ""
+msgstr "Pfad"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:582
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
-msgstr ""
+msgstr "Wert"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:593
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016
-#, fuzzy
-msgid "Extension instance"
-msgstr "Erweiterungen"
+msgstr "Auslaufdatum"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017
-msgid "The Midori extension instance for this extension"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
+"Richtlinie zur Nutzung mit nicht individuell konfigurierten Domains. Diese "
+"Einstellung betrifft nur zukünftige Einschränkungen der globalen Cookie-"
+"Richtlinien in den Midori-Einstellungen."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023
-#, fuzzy
-msgid "Application instance"
-msgstr "Anwendungen"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie-Sicherheitsverwaltung"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Cookie-Zugriffsrechte je Internet-Seite verwalten"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030
-msgid "Database instance"
-msgstr ""
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Fehler beim Abrufen des Anwendungssymbols in %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036
-msgid "Database path"
-msgstr ""
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Erstellung eines neuen Starters ist fehlgeschlagen (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043
-msgid "Ask for unknown policy"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120
-msgid "Undetermined"
-msgstr ""
-
-#: ../extensions/cookie-permissions/main.c:62
-#, fuzzy
-msgid "Cookie Security Manager"
-msgstr "Cookieverwaltung"
-
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr ""
-
-#~ msgid "Writing failed."
-#~ msgstr "Schreiben fehlgeschlagen."
-
-#~ msgid "_Window"
-#~ msgstr "_Fenster"
-
-#~ msgid "Custom..."
-#~ msgstr "Benutzerdefiniert …"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr ""
-#~ "Legt fest, wie gegenüber Seiten im Internet identifiziert werden soll"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Sanfter Bildlauf"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Legt fest ob der Bildlauf sanft schneller und langsamer wird"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Konsolenwarnungen in DATEINAME umleiten"
-
-#~ msgid "FILENAME"
-#~ msgstr "Dateiname"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Verknüpfung auf dem _Schreibtisch"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Treffer hervorheben"
-
-#~ 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 "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"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Starter erstellt"
 
-#~ 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"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Anzahl Spalten und Zeilen ändern"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Anzahl an Spalten und Zeilen eingeben:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Ungültige Eingabe für die Größe der Schnellwahl"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Vorschaubildgröße:"
-
-#~ msgid "Small"
-#~ msgstr "Klein"
-
-#~ msgid "Medium"
-#~ msgstr "Mittel"
-
-#~ msgid "Big"
-#~ msgstr "Groß"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Werbefilter einstellen…"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Nicht gefunden - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokument kann nicht angezeigt werden"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "96 Punkte pro Zoll erzwingen"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Eine Punktdichte von 96 DPI erzwingen"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Reiter mit Strg+Tab nach Nutzung wechseln"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Alte Cookies nach 1 Stunde löschen"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Alte Cookies after 1 Woche löschen"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Alte Cookies nach 1 Jahr löschen"
-
-#~ msgid "All cookies"
-#~ msgstr "Alle Profildateien"
-
-#~ msgid "Session cookies"
-#~ msgstr "Sitzungsprofile"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Übertragungsleiste anzeigen"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Die Übertragungsleiste anzeigen oder verbergen"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Suchmaschinen in Vervollständigung"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Bedienelemente der Leiste anzeigen"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Schnellwahl in neuen Reitern anzeigen"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Schnellwahl in neu geöffneten Reitern anzeigen"
-
-#~ msgid "Download Manager"
-#~ msgstr "Übertragungsmanager"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Öffne Seiten von außerhalb in:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Wo Seiten von außerhalb geöffnet werden sollen"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Welche Art von Profildateien (Cookies) angenommen werden"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maximales Alter von Cookiedaten"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Maximales Verlaufsalter"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Zuletzt heruntergeladene Dateien merken"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Die zuletzt heruntegeladenen Dateien speichern"
-
-#~ msgid "Appearance"
-#~ msgstr "Erscheinungsbild"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Benutzerprofile"
-
-#~ msgid "General"
-#~ msgstr "Allgemein"
-
-#~ msgid "Font settings"
-#~ msgstr "Schrifteinstellungen"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Navigationsleiste"
-
-#~ msgid "Interface"
-#~ msgstr "Oberfläche"
-
-#~ msgid "External applications"
-#~ msgstr "Externe Anwendungen"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Cookies beim Beenden von Midori löschen"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s von %s, %s/s"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Zielordner für die ausgewählte Erweiterung öffnen"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Nächster Reiter (Verlaufsgestützte Liste)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Voheriger Reiter (Verlaufsgestützte Liste)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Voheriger Reiter aus dem Verlauf"
-
-#~ msgid "Quit the application"
-#~ msgstr "Programm beenden"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Mit Übertragungs_manager herunterladen"
-
-#~ msgid "Pageholder"
-#~ msgstr "Seitenhalter"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Seitenhalter"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Eine oder mehrere Seiten gleichzeitig mit den Reitern offen lassen."
-
-#~ msgid "_Contents"
-#~ msgstr "_Inhalt"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Zeige die Dokumentation"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "Verweisziel _speichern"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "Verweisziel herunter_laden"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% geladen"
-
-#~ msgid "_Transferbar"
-#~ msgstr "_Übertragungsleiste"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Übertragungsleiste anzeigen"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Fortschritt im Adressfeld anzeigen"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Nach dem Zielordner fragen"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr ""
-#~ "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Bild herunterla_den"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Suchverlauf konnte nicht geleert werden: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Gewählte Leiste vom Fenster ablösen"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Bedienelemente anzeigen"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Rechtschreibprüfung"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Eine durch Kommas getrennte Liste von Sprachen, die für die "
-#~ "Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Aktuellen Reiter _Minimieren"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Den aktuellen Reiter minimieren"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Rechtschreibwörterbücher"
-
-#~ msgid "Console"
-#~ msgstr "Konsole"
-
-#~ msgid "Copy _All"
-#~ msgstr "_Alle kopieren"
-
-#~ msgid "Copy All"
-#~ msgstr "Alle kopieren"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Cookieverwaltung"
-
-#~ msgid "External Applications"
-#~ msgstr "Externe Anwendungen"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Sie können <b>%s</b> jetzt aus Ihrem Starter oder Menü starten"
 
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "URL-Schemata mit Anwendungen verknüpfen"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Fehler beim Erstellen eines Starters"
 
-#~ msgid ""
-#~ "Do you really want to remove '%s'?\n"
-#~ "\n"
-#~ "The file '%s' will be permanently lost.\n"
-#~ msgstr ""
-#~ "Möchten sie '%s' wirklich entfernen? \n"
-#~ "\n"
-#~ "Die Datei '%s' wird dauerhaft entfernt.\n"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Anwendungen"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Zuletzt besuchte Seiten"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Neues _Profil"
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Bereits besuchte Seiten erneut öffnen"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Erstellt ein neues, unabhängiges Profil und einen Starter"
 
-#~ msgid "Original cookies only"
-#~ msgstr "Nur ursprüngliche Profildateien"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Neue _App"
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Zuletzt besuchte Seiten merken"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Erstellt eine neue App für eine bestimmte Website"
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Die zuletzt besuchten Seiten speichern"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Fehler beim starten"
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Proxyrechner automatisch erkennen"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "_Starter erstellen"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Zwischenrechner automatisch über die Umgebung erkennen"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Web-App-Verwaltung"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "Reiter _wiederherstellen"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Internet-Seiten als Anwendungen installiert verwalten"
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "Reiter _minimieren"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Übertragungen"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Fehlerhafte Uhrzeit"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Alle entfernen"
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr ""
-#~ "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das "
-#~ "eingestellte Datum und die Uhrzeit."
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Das Heruntergeladene konnte nicht geöffnet werden: %s"
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "%2s in den Ordner %1s kopieren."
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Zielordner ö_ffnen"
 
-#~ msgid "New tabs open minimized"
-#~ msgstr "Neue Reiter werden minimiert geöffnet"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Verweisziel _kopieren"
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Anzahl Verknüpfungen ändern"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Die Datei »<b>%s</b>« wurde heruntergeladen."
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Anzahl an Verknüpfungen eingeben:"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "»<b>%s</b>« und %d andere Dateien wurden heruntergeladen."
 
-#~ msgid "Open _Link"
-#~ msgstr "Ver_weis öffnen"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Übertragung abgeschlossen"
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den "
-#~ "Ordner »%s«."
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Einige Dateien werden gerade heruntergeladen."
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "Midori _beenden"
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Auf dieser Plattform nicht verfügbar"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Die Übertragungen werden abgebrochen, wenn Midori beendet wird."
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Leisten_titel anzeigen"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Übertragungsverwaltung"
 
-#~ msgid "Options"
-#~ msgstr "Optionen"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Heruntergeladene Dateien anzeigen"
 
-#~ msgid "View Selection Source"
-#~ msgstr "Quelltext der Markierung anzeigen"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Die Datenbank konnte nicht aktualisiert werden: %s"
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Zeige den Quelltext der Markierung an"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Es konnte nicht aus der Datenbank ausgewählt werden: %s"
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Entwicklerwerkzeuge einschalten"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Fehler beim Importieren der vergangenen Sitzung: %s"
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Besondere Erweiterungen für Entwickler einschalten"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Gefleckt"
 
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Ermitteln der IP-Adressen von Verweisen im Voraus"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Tab- und Sitzungsverwaltung."
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Bilder automatisch verkleinern"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Einzelne Bilder automatisch angemessen verkleinern"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Diese Erweiterung stellt eine Aufgabenliste für Aktualisierungen und "
+"wiederkehrende Ereignisse zur Verfügung."
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Reiter unterschiedlich einfärben"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Fehler beim hinzufügen einer neuen Notiz zur Datenbank: %s\n"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Zuletzt eingegebene Formulareingaben merken"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Fehler beim entfernen der Notiz aus der Datenbank: %s\n"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Die letzten Formulareingaben speichern"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Fehler beim Umbenennen der Notiz:  %s\n"
 
-#~ msgid "Cache size"
-#~ msgstr "Zwischenspeichergröße"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Fehler beim Aktualisieren der Notiz: %s\n"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Die erlaubte Zwischenspeichergröße"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notizen"
 
-#~ msgid "Encoding"
-#~ msgstr "Zeichensatz"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Neue Notiz"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Der voreingestellte Zeichensatz"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Erstellt eine neue leere Notiz, ohne Verbindung zu geöffneten Seiten"
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Vergrößerbare Textfelder"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Neue Notiz"
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Sollen Textfelder vergrößerbar sein oder nicht"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Fehler beim auswählen der Notiz aus der Datenbank: %s\n"
 
-#~ msgid "Both"
-#~ msgstr "Beides"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Notiz umbenennen"
 
-#~ msgid "Both horizontal"
-#~ msgstr "Beides horizontal"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Notiz in die Zwischenablage kopieren"
 
-#~ msgid "Load on Startup"
-#~ msgstr "Beim Programmstart öffnen"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Notiz entfernen"
 
-#~ msgid "Configure _Toolbar…"
-#~ msgstr "Werkzeugleiste anpassen…"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Auswahl als Notiz kopieren"
 
-#~ msgid "Enable"
-#~ msgstr "_Einschalten"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Textausschnitte von Internet-Seiten als Notiz speichern"
 
-#~ msgid "_Disable"
-#~ msgstr "_Auschalten"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Werbeblocker"
 
-#~ msgid "Disable"
-#~ msgstr "_Auschalten"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Werbung anhand einer Filterliste blockieren"
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Schnellsuche"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Werbefilter einstellen"
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Schnell zu einem Wort oder Satz springen"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bild bloc_kieren"
 
-#~ msgid "Search"
-#~ msgstr "Suchen"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Verweis _blockieren"
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Warnung: Sie benutzen ein Administratorkonto!"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Regel bearbeiten"
 
-#~ msgid "%d days ago"
-#~ msgstr "Vor %d Tagen"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regel:"
index 0cfa2923fd666ca2866aa9248700440c7906b447..fd6493059ed857e86e8f7675a31e80e62364f948 100644 (file)
--- a/po/el.po
+++ b/po/el.po
 # This file is distributed under the same license as the midori package.
 # Evaggelos Balaskas <ebalaskas@ebalaskas.gr> 2008-2009
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori git version\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-08 19:09+0000\n"
-"PO-Revision-Date: 2013-01-18 14:47+0200\n"
-"Last-Translator: Γιώργος Στεφανάκης <nonviotale@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:43+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\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-Launchpad-Export-Date: 2014-11-27 05:46+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "X-Poedit-Country: GREECE\n"
 "Language: el\n"
-"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\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:162
-#: ../midori/midori-app.c:1442 ../midori/midori-websettings.c:201
-#: ../midori/midori-view.c:3816
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Περιηγητής Ιστού"
+
+#: ../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 "New Private Browsing Window"
-msgstr "Νέο Παράθυρο Ιδιωτικής Περιήγησης"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
-msgstr "Î\9dέα Îºαρτέλα"
+msgstr "Î\9dέα Î\9aαρτέλα"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
-msgstr "Νέο παράθυρο"
+msgstr "Νέο Παράθυρο"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "ΠεÏ\81ιηγηÏ\84ήÏ\82 Î\99Ï\83Ï\84οÏ\8d"
+msgid "New Private Browsing Window"
+msgstr "Î\9dέο Î Î±Ï\81άθÏ\85Ï\81ο Î\99διÏ\89Ï\84ικήÏ\82 Î ÎµÏ\81ιήγηÏ\83ηÏ\82"
 
 #: ../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:4123
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Ιδιωτική περιήγηση"
 
-#: ../midori/main.c:63
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Άνοιγμα ενός νέου παραθύρου ιδιωτικής περιήγησης"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "Διεύθυνση"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "Χρήση φακέλου ως φάκελος ρύθμισης"
+msgstr "Χρήση ΦΑΚΈΛΟΥ ως φακέλος ρύθμισης"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ΦΑΚΕΛΟΣ"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Ιδιωτική περιήγηση, οι τροποποιήσεις δεν αποθηκεύονται"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "Φορητή μορφή, όλα τα εκετελέσιμα αρχεία αποθηκεύονται σε ένα μέρος"
+msgstr ""
+"Σε φορητή λειτουργία, τα δημιουργούμενα κατά την εκτέλεση αρχεία "
+"αποθηκεύονται σε ένα μέρος."
 
-#: ../midori/main.c:100
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
-msgstr ""
+msgstr "Απλό GTK+ παράθυρο με WebKit, συναφές με το GtkLauncher"
 
-#: ../midori/main.c:102
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Εμφάνιση του διαλόγου διάγνωσης"
 
-#: ../midori/main.c:104
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
+"Εκτέλεση στο gdb και αποθήκευση ενός backtrace σε περίπτωση κατάρρευσης"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript"
 
-#: ../midori/main.c:108
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Αποθήκευση του συγκεκριμένου URI"
 
-#: ../midori/main.c:110
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Εκτέλεση της συγκεκριμένης εντολής"
 
-#: ../midori/main.c:112
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Εμφάνιση των διαθέσιμων εντολών προς εκτέλεση με e-/ --execute"
 
-#: ../midori/main.c:114
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Προβολή έκδοσης προγράμματος"
 
-#: ../midori/main.c:116
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Διευθύνσεις"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "ΜΟΤΙΒΟ"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας"
 
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ"
 
-#: ../midori/main.c:155
-#, c-format
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
-msgstr ""
+msgstr "Σφάλμα: το \"gdb\" δε μπορεί να βρεθεί\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Έλεγχος για νέα έκδοση στο:"
 
-#: ../midori/main.c:339
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Ένα άγνωστο σφάλμα προέκυψε"
 
-#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:542
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Αναπάντεχη ενέργεια '%s'."
-
-#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6103
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Σελιδοδείκτες"
 
-#: ../midori/midori-app.c:1351
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Προσθήκη σ_ελιδοδείκτη"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Επεκτάσεις"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../midori/midori-app.c:1354
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Δέσμες εντολών χρήστη"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Στυλ χρήστη"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Νέα _καρτέλα"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Μεταφορές"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Α_ρθρωμάτων netscape"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Κλειστές καρτέλες"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5242
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Νέο _παράθυρο"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Νέος _φάκελος"
 
-#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419
-#: ../midori/midori-app.c:1422
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Διευθύνσεις]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Κακοσχηματισμένο έγγραφο."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Άγνωστος τύπος συνδέσμου."
 
-#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Μετάβαση στην επόμενη σελίδα"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5386
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Μετάβαση στην επόμενη υπό-σελίδα"
 
-#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5327
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Αναζήτηση Ιστού..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Ανανέωση της τρέχουσας σελίδας"
 
-#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας"
 
-#: ../midori/midori-browser.c:527
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n"
 
-#: ../midori/midori-browser.c:622
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Αναπάντεχη ρύθμιση '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Αναπάντεχη ενέργεια '%s'."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Ιδιωτική περιήγηση)"
 
-#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Επιλογή [κειμένου]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: ../midori/midori-browser.c:828
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Νέος φάκελος"
 
-#: ../midori/midori-browser.c:828
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Επεξεργασία φακέλου"
 
-#: ../midori/midori-browser.c:830
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Νέος σελιδοδείκτης"
 
-#: ../midori/midori-browser.c:830
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Επεξεργασία σελιδοδείκτη"
 
-#: ../midori/midori-browser.c:864
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
 msgstr ""
-"Πληκτρολογήστε ένα όνομα γι'αυτόν τον σελιδοδείκτη και επιλέξτε που θα τον "
+"Πληκτρολογήστε ένα όνομα για αυτόν τον σελιδοδείκτη, και επιλέξτε που να τον "
 "αποθηκεύσετε."
 
-#: ../midori/midori-browser.c:920
-msgid "Add to _Speed Dial"
-msgstr "Προσθήκη στην _γρήγορη σύνδεση"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Πληκτρολογήστε ένα όνομα για αυτόν τον φάκελο, και επιλέξτε που να τον "
+"αποθηκεύσετε."
 
-#: ../midori/midori-browser.c:926
-msgid "Show in the tool_bar"
-msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84ην ÎµÏ\81γαλειο_θήκη"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Î\95μÏ\86άνιÏ\83η Ï\83Ï\84ην Î\9cÏ\80άÏ\81α_ Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¹ÎºÏ\84Ï\8eν"
 
-#: ../midori/midori-browser.c:934
-msgid "Run as _web application"
-msgstr "Î\95κÏ\84έλεÏ\83η Ï\89Ï\82 _διαδικÏ\84Ï\85ακή ÎµÏ\86αÏ\81μογή"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "ΠÏ\81οÏ\83θήκη Ï\83Ï\84ην _γÏ\81ήγοÏ\81η Ï\83Ï\8dνδεÏ\83η"
 
-#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4479
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Αποθήκευση αρχείου ως"
 
-#: ../midori/midori-browser.c:1060
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
-msgstr ""
+msgstr "Αποθήκευση συσχετιζόμενων πόρων"
 
-#: ../midori/midori-browser.c:1290
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Ένα νέο παράθυρο έχει ανοιχθεί"
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Μια νέα καρτέλα έχει ανοιχθεί"
 
-#: ../midori/midori-browser.c:1311
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Σφάλμα ανοίγματος εικόνας!"
 
-#: ../midori/midori-browser.c:1312
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr ""
 "Αδυναμία ανοίγματος επιλεγμένης εικόνας στον προεπιλεγμένο πρόγραμμα "
 "προβολής εικόνων."
 
-#: ../midori/midori-browser.c:1318
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Σφάλμα κατά την λήψη της εικόνας!"
 
-#: ../midori/midori-browser.c:1319
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Αδυναμία λήψης επιλεγμένης εικόνας."
 
-#: ../midori/midori-browser.c:1378
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Αποθήκευση αρχείου"
 
-#: ../midori/midori-browser.c:2353
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: ../midori/midori-browser.c:2480
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -363,133 +395,125 @@ msgstr ""
 "συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, "
 "θα προστεθεί αυτόματα."
 
-#: ../midori/midori-browser.c:2486 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Νέα ροή"
 
-#: ../midori/midori-browser.c:2521 ../midori/midori-browser.c:5402
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Προσθήκη ενός νέου σελιδοδείκτη"
 
-#: ../midori/midori-browser.c:3053 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Άδειο"
 
-#: ../midori/midori-browser.c:3450 ../midori/midori-browser.c:3451
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Εναλλαγή κειμένου κέρσορα πλοήγησης"
 
-#: ../midori/midori-browser.c:3453
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
+"Το πάτημα του F7 εναλλάσσει την «Περιήγηση δρομέα». Όταν είναι ενεργή, ένας "
+"κέρσορας κειμένου εμφανίζεται σε όλες τις ιστοσελίδες."
 
-#: ../midori/midori-browser.c:3456
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_Ενεργοποίηση Περιήγησης Δρομέα"
 
-#: ../midori/midori-browser.c:3883 ../midori/midori-browser.c:5850
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n"
-
-#: ../midori/midori-browser.c:4211 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Άνοιγμα όλων σε _καρτέλες"
 
-#: ../midori/midori-browser.c:4218 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513
-msgid "Open in New _Tab"
-msgstr "Άνοιγμα σε νέα_καρτέλα"
-
-#: ../midori/midori-browser.c:4221 ../midori/midori-view.c:2725
-#: ../midori/midori-view.c:4598 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Άνοιγμα σε νέο _παράθυρο"
 
-#: ../midori/midori-browser.c:4310
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4311
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4312
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4313
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4314
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4315
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4316
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Μιντόρι 0.2.6"
 
-#: ../midori/midori-browser.c:4334
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "_Εισαγωγή σελιδοδεικτών..."
 
-#: ../midori/midori-browser.c:4337 ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Εισαγωγή σελιδοδεικτών..."
 
-#: ../midori/midori-browser.c:4348
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Εφαρμογή:"
 
-#: ../midori/midori-browser.c:4413
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Εισαγωγή από αρχείο XBEL ή HTML"
 
-#: ../midori/midori-browser.c:4441
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Εισαγωγή από αρχείο"
 
-#: ../midori/midori-browser.c:4453
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Αποτυχία εισαγωγής σελιδοδεικτών"
 
-#: ../midori/midori-browser.c:4484
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Σελιδοδείκτες XBEL"
 
-#: ../midori/midori-browser.c:4489
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Σελιδοδείκτες Netscape"
 
-#: ../midori/midori-browser.c:4503
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4518
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Αποτυχία εξαγωγής σελιδοδεικτών"
 
-#: ../midori/midori-browser.c:4740
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Ένας ελαφρύς περιηγητής ιστού"
 
-#: ../midori/midori-browser.c:4741
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Δείτε στο about:version για πληροφορίες έκδοσης."
 
-#: ../midori/midori-browser.c:4743
+#: ../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 "
@@ -501,401 +525,416 @@ msgstr ""
 "License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 "
 "της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη."
 
-#: ../midori/midori-browser.c:4778
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Ευάγγελος Μπαλάσκας <ebalaskas@ebalaskas.gr> 2008,2009"
+msgstr ""
+"Ευάγγελος Μπαλάσκας <ebalaskas@ebalaskas.gr> 2008,2009\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Apazoglou Theodoros https://launchpad.net/~apazoglouthodoris\n"
+"  Balaskas Euaggelos https://launchpad.net/~ebalaskas-3\n"
+"  Dimitris Giouroukis https://launchpad.net/~digitalbckp\n"
+"  Efstathios Iosifidis https://launchpad.net/~diamond-gr\n"
+"  Euthymios Spentzos https://launchpad.net/~euthymios\n"
+"  Filippos Kolyvas https://launchpad.net/~fkol-k4\n"
+"  George Fragos https://launchpad.net/~anvo\n"
+"  Jim Spentzos https://launchpad.net/~jamesspentzos\n"
+"  John Brracciano https://launchpad.net/~john-bracciano\n"
+"  Stefanos Papanatsios https://launchpad.net/~stefan0spapanatsi0s\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Γιώργος Στεφανάκης https://launchpad.net/~nonviotale"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Διπλασίασε την τρέχουσα καρτέλα"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Άνοιγμα ενός νέου παραθύρου"
 
-#: ../midori/midori-browser.c:5246
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Άνοιγμα μίας νέας καρτέλας"
 
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Νέο παράθυρο ιδιωτικής περιήγησης"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Άνοιγμα αρχείου"
 
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Αποθήκευση Σελίδας ως..."
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Αποθήκευση σε αρχείου"
 
-#: ../midori/midori-browser.c:5257
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Προσθήκη σε γρήγορη σ_ύνδεση"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5261
-msgid "Create _Launcher"
-msgstr "Δημιουργία _εκκινητή"
-
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Εγγραφή σε _ροή νέων"
 
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Κλείσιμο καρτέλας"
 
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Κλείσιμο της τρέχουσας καρτέλας"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Κ_λείσιμο παραθύρου"
 
-#: ../midori/midori-browser.c:5277
-msgid "_Share"
-msgstr "_Κοινόχρηστο"
-
-#: ../midori/midori-browser.c:5278
-msgid "Share this page"
-msgstr "Μοιραστείτε αυτή την σελίδα"
-
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Εκτύπωση της τρέχουσας σελίδας"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Κλείσιμο _όλων των παραθύρων"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../midori/midori-browser.c:5311
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Εύρεση..."
 
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα"
 
-#: ../midori/midori-browser.c:5314
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Εύρεση επ_όμενο"
 
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Εύρεση _προηγούμενο"
 
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής"
 
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Εμφάνιση"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Εργαλειοθήκες"
 
-#: ../midori/midori-browser.c:5329
-msgid "Reload page without caching"
-msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη"
-
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Αύξηση του επίπεδου εστίασης"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Μείωση του επιπέδου εστίασης"
 
-#: ../midori/midori-browser.c:5346
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Κωδικοποίηση"
 
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Προβολή κ_ώδικα"
 
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Προβολή _Πηγής DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Περιήγηση κέρσορα κειμένου"
 
-#: ../midori/midori-browser.c:5355
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Εναλλαγή σε πλήρη οθόνη"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Μετακίνηση _αριστερά"
 
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Μετακίνηση _κάτω"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Μετακίνηση _επάνω"
 
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Μετακίνηση _δεξιά"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Αναγνώσιμο"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Μετάβαση στην προηγούμενη σελίδα"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Επόμενο ή Συνέχεια"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Μετάβαση στο επόμενο υποσέλιδο ή στην επόμενη σελίδα στο ιστορικό"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Αρχική σελίδα"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Μετάβαση στην αρχική σελίδα"
 
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Αναίρεση κλ_είσιμο καρτέλας"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Προσθήκη ενός νέου φ_ακέλου"
 
-#: ../midori/midori-browser.c:5410
-msgid "_Export bookmarks"
-msgstr "_Î\95ξαγÏ\89γή Ï\83ελιδοδεικÏ\84Ï\8eν"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Î\95ιÏ\83αγÏ\89γή Ï\83ελιδοδεικÏ\84Ï\8eν..."
 
-#: ../midori/midori-browser.c:5413 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Î\94ιαÏ\87είÏ\81ιÏ\83η Ï\84Ï\89ν Î¼Î·Ï\87ανÏ\8eν Î±Î½Î±Î¶Î®Ï\84ηÏ\83ηÏ\82"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Î\95ξαγÏ\89γή Ï\83ελιδοδεικÏ\84Ï\8eν..."
 
-#: ../midori/midori-browser.c:5416
-msgid "_Clear Private Data"
-msgstr "_Î\9aαθαÏ\81ιÏ\83μÏ\8cÏ\82 Ï\80Ï\81οÏ\83Ï\89Ï\80ικÏ\8eν Î´ÎµÎ´Î¿Î¼Î­Î½Ï\89ν"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Î\94ιαÏ\87είÏ\81ιÏ\83η Î¼Î·Ï\87ανÏ\8eν Î±Î½Î±Î¶Î®Ï\84ηÏ\83ηÏ\82..."
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Εκκαθάριση προσωπικών δεδομένων..."
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Εξέταση σελίδας"
 
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Προηγούμενη καρτέλα"
 
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Επόμε_νη καρτέλα"
 
-#: ../midori/midori-browser.c:5428
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Μετακίνηση καρτέλας στη _πρώτη θέση"
 
-#: ../midori/midori-browser.c:5430
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Μετακίνηση καρτέλας _πίσω"
 
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Μετακίνηση καρτέλας εμπρός"
 
-#: ../midori/midori-browser.c:5434
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Μετακίνηση καρτέλας στην _τελευταία θέση"
 
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Εστίαση στην _ισχύουσα καρτέλα"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Εστίαση στην _επόμενη προβολή"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Εμφάνιση μόνο του εικονιδίου της _τρέχουσας καρτέλας"
 
-#: ../midori/midori-browser.c:5446
-msgid "_Duplicate Current Tab"
-msgstr "_Διπλασίασε την τρέχουσα καρτέλα"
-
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Κλείσιμο των άλλ_ων καρτελών"
 
-#: ../midori/midori-browser.c:5452
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Επαναφορά της τελευταίας _συνεδρίας"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Σ_υχνές ερωτήσεις"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Αναφορά προβλήματος..."
 
-#: ../midori/midori-browser.c:5465 ../midori/midori-browser.c:6122
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Εργαλεία"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Μπάρα μενού"
 
-#: ../midori/midori-browser.c:5476
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Μπάρα περιήγησης"
 
-#: ../midori/midori-browser.c:5480
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Πλαϊνό _πλαίσιο"
 
-#: ../midori/midori-browser.c:5481
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Πλαϊνό πλαίσιο"
 
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Μπάρα σελιδοδείκτη"
 
-#: ../midori/midori-browser.c:5488
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Γραμμή κατάστασης"
 
-#: ../midori/midori-browser.c:5497 ../midori/midori-websettings.c:200
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Αυτόματα"
 
-#: ../midori/midori-browser.c:5500 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Παραδοσιακά Κινέζικα (BIG5)"
 
-#: ../midori/midori-browser.c:5503 ../midori/midori-websettings.c:125
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Απλοποιημένα Κινέζικα (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Ιαπωνικά (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Κορεάτικα (EUC-KR)"
 
-#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ρωσικά (KOI8-R)"
 
-#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5519 ../midori/midori-websettings.c:130
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Δυτικά (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Προσαρμοσμένο..."
 
-#: ../midori/midori-browser.c:6028
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Διαχωριστής"
 
-#: ../midori/midori-browser.c:6035
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Τοποθεσία..."
 
-#: ../midori/midori-browser.c:6037
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας"
 
-#: ../midori/midori-browser.c:6059
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Αναζήτηση ιστού..."
 
-#: ../midori/midori-browser.c:6061
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Εκκίνηση μίας αναζήτησης ιστού"
 
-#: ../midori/midori-browser.c:6088
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει"
 
-#: ../midori/midori-browser.c:6105
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών"
 
-#: ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
-msgstr " _Καρτέλες"
+msgstr "_Καρτέλες"
 
-#: ../midori/midori-browser.c:6140
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Μενού"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Μενού"
 
-#: ../midori/midori-browser.c:6938
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Αναπάντεχη ρύθμιση '%s'"
-
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Η ρύθμιση της επέκτασης '%s' δεν μπορεί να φορτωθεί: %s\n"
 
-#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n"
 
-#: ../midori/midori-locationaction.c:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Εξαγωγή πιστοποιητικού"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Άγνωστος δημιουργός υπογεγραμμένου πιστοποιητικού."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -903,54 +942,57 @@ msgstr ""
 "Το πιστοποιητικό δεν ταιριάζει με την αναμενόμενη ταυτότητα της ιστοσελίδας "
 "από την οποία έχει ληφθεί."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
-msgstr "Ο χρόνος ενεργοποίησης πιστοποιητικού εξακολουθεί να είναι στο μέλλον."
+msgstr ""
+"Ο χρόνος ενεργοποίησης πιστοποιητικού εξακολουθεί να είναι στο μέλλον."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Το πιστοποιητικό έχει λήξει"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
+"Το πιστοποιητικό ανακλήθηκε σύμφωνα με τη λίστα ανάκλησης πιστοποιητικών "
+"GTlsConnection."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Ο αλγόριθμος του πιστοποιητικού θεωρείται μη ασφαλής."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Παρουσιάστηκαν άλλα σφάλματα κατά τον έλεγχο του πιστοποιητικού."
 
-#: ../midori/midori-locationaction.c:1420
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Εξαγωγή πιστοποιητικού"
 
-#: ../midori/midori-locationaction.c:1435
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Αυτό-υπογραφόμενο"
 
-#: ../midori/midori-locationaction.c:1459
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Λεπτομέρειες ασφαλείας"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1542
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Επικόλληση και σ_υνέχεια"
 
-#: ../midori/midori-locationaction.c:1774
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Μη επαληθευμένο"
 
-#: ../midori/midori-locationaction.c:1782
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Επαληθευμένη και κρυπτογραφημένη σύνδεση"
 
-#: ../midori/midori-locationaction.c:1789
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Άνοιγμα, μη κρυπτογραφημένης σύνδεσης"
 
@@ -967,424 +1009,454 @@ msgstr "Κλείσιμο πλαισίου"
 msgid "Align sidepanel to the left"
 msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα  αριστερά"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Εμφάνιση γρήγορης κλήσης"
 
-#: ../midori/midori-websettings.c:107
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Εμφάνιση αρχικής σελίδας"
 
-#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών"
 
-#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Εμφάνιση κενής σελίδας"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Εμφάνιση προεπιλεγμένης μηχανής αναζήτησης"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Εμφάνιση προσαρμοσμένης σελίδας"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Ιαπωνικά (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "Προσαρμογή..."
-
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Νέα καρτέλα"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Νέο παράθυρο"
 
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Τρέχον καρτέλα"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Εικονίδια"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Μικρά εικονίδια"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Εικονίδια με κείμενο"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Κείμενο δίπλα στα εικονίδια"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Αυτόματα (Gnome ή περιβάλλον)"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP διακομιστής μεσολάβησης"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Κανένας διακομιστής μεσολάβησης"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Το στυλ της εργαλειοθήκης"
 
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Πάντα χρήση των δικών μου επιλογών γραμματοσειράς"
 
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 "Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του "
 "χρήστη"
 
-#: ../midori/midori-websettings.c:1309 ../midori/midori-websettings.c:1315
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n"
 
-#: ../midori/midori-websettings.c:1364
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s"
-
-#: ../midori/midori-websettings.c:1369 ../midori/midori-websettings.c:1480
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Μη έγκυρη τιμή ρύθμισης '%s'"
 
-#: ../midori/midori-tab.vala:118
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s"
 
-#: ../midori/midori-view.c:767 ../midori/midori-view.c:911
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Εμφάνιση _ετικέτας καρτέλας"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Κλείσιμο Καρτέλας προς τα Δ_εξιά"
+msgstr[1] "Κλείσιμο Καρτελών προς τα Δ_εξιά"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Κλείσιμο της άλλ_ης καρτέλας"
+msgstr[1] "Κλείσιμο των άλλ_ων καρτελών"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Έμπιστη ιστοσελίδα"
 
-#: ../midori/midori-view.c:909
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Άγνωστη ασφάλεια"
 
-#: ../midori/midori-view.c:1212
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s θέλει να σώσει μια βάση δεδομένων HTML5."
 
-#: ../midori/midori-view.c:1216 ../midori/midori-view.c:1248
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../midori/midori-view.c:1216 ../midori/midori-view.c:1248
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Αποδοχή"
 
-#: ../midori/midori-view.c:1244
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s θέλει να ξέρει τη θέση σας."
 
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' δεν βρέθηκε"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Η σελίδα '%s' δεν μπόρεσε να φορτωθεί:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Έλεγχος της διεύθυνσης για ορθογραφικά λάθη"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Σιγουρευτείτε ότι το καλώδιο ethernet είναι συνδεδεμένο ή η ασύρματη κάρτα "
+"ενεργοποιημένη"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Βεβαιωθείτε ότι οι ρυθμίσεις δικτύου είναι σωστές"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Προσπαθήστε ξανά"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "ΣÏ\86άλμα- %s"
+msgid "Oops - %s"
+msgstr "Î\9fÏ\85Ï\80Ï\82 - %s"
 
-#: ../midori/midori-view.c:1376
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Î\97 Ï\83ελίδα '%s' Î´ÎµÎ½ Î¼Ï\80οÏ\81εί Î½Î± Ï\86οÏ\81Ï\84Ï\89θεί."
+msgid "Something went wrong with '%s'."
+msgstr "Î\9aάÏ\84ι Ï\80ήγε Ï\83Ï\84Ï\81αβά Î¼Îµ '%s'."
 
-#: ../midori/midori-view.c:1378
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Δοκιμάστε ξανά"
 
-#: ../midori/midori-view.c:1580 ../midori/midori-view.c:2666
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Αποστολή μηνύματος στο: %s"
 
-#: ../midori/midori-view.c:2454
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Προσθήκη _μηχανής αναζήτησης..."
 
-#: ../midori/midori-view.c:2497 ../midori/midori-view.c:2801
-msgid "Inspect _Element"
-msgstr "Î\95ξέÏ\84αÏ\83η _Ï\83Ï\84οιÏ\87είου"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Î\86νοιγμα_Ï\83Ï\85νδέÏ\83μου"
 
-#: ../midori/midori-view.c:2549
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα"
 
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο"
 
-#: ../midori/midori-view.c:2554
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο"
 
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο"
 
-#: ../midori/midori-view.c:2560
-msgid "Open Link as Web A_pplication"
-msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή"
-
-#: ../midori/midori-view.c:2565
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Αντιγραφή συνδέσμου πρ_οορισμού"
 
-#: ../midori/midori-view.c:2571
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Αποθήκευση ως..."
 
-#: ../midori/midori-view.c:2580
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Άνοιγμα_εικόνας σε νέο παράθυρο"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα"
 
-#: ../midori/midori-view.c:2583
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Αντιγραφή εικό_νας"
 
-#: ../midori/midori-view.c:2586
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Αποθήκευση ει_κόνας"
 
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Άνοιγμα σε Πρόγραμμα _Προβολής Εικόνας"
 
-#: ../midori/midori-view.c:2596
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Αντιγραφή _διεύθυνσης βίντεο"
 
-#: ../midori/midori-view.c:2599
-msgid "Save _Video"
-msgstr "Αποθήκευση _βίντεο"
-
-#: ../midori/midori-view.c:2599
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Αποθήκευση _βίντεο"
 
-#: ../midori/midori-view.c:2625
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Αναζήτηση _με"
 
-#: ../midori/midori-view.c:2654
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Αναζήτηση στον ιστό"
 
-#: ../midori/midori-view.c:2674
-msgid "Open Address in New _Tab"
-msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα"
-
-#: ../midori/midori-view.c:2721
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Άνοιγμα _Πλαισίου σε Νέα Καρτέλα"
 
-#: ../midori/midori-view.c:2938
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Εξέταση _στοιχείου"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Άνοιγμα ή λήψη αρχείου από %s"
 
-#: ../midori/midori-view.c:2951
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Όνομα Αρχείου: %s"
 
-#: ../midori/midori-view.c:2956
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Τύπος αρχείου: '%s'"
 
-#: ../midori/midori-view.c:2958
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Τύπος αρχείου: %s ('%s')"
 
-#: ../midori/midori-view.c:2995
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Μέγεθος: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3006
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Άνοιγμα %s"
 
-#: ../midori/midori-view.c:3534
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Εξέταση σελίδα -%s"
 
-#: ../midori/midori-view.c:4048
-#, c-format
-msgid "No documentation installed"
-msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση"
-
-#: ../midori/midori-view.c:4124
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Ο Midori δεν αποθηκεύει προσωπικά δεδομένα:"
 
-#: ../midori/midori-view.c:4125
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Δεν αποθηκεύτηκαν ιστορικό ή cookies."
 
-#: ../midori/midori-view.c:4126
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Τα πρόσθετα είναι απενεργοποιημένα."
 
-#: ../midori/midori-view.c:4127
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "Απενεργοποιήθηκαν η αποθήκευση HTML5, η λανθάνουσα μνήμη της τοπική βάση "
 "δεδομένων και εφαρμογών."
 
-#: ../midori/midori-view.c:4128
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Ο Midori αποτρέπει τις ιστοσελίδες να απομνημονεύσουν τον χρήστη:"
 
-#: ../midori/midori-view.c:4129
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-view.c:4130
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Απενεργοποίηση προανάκτησης DNS."
 
-#: ../midori/midori-view.c:4131
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Η γλώσσα και η ζώνη ώρας δεν εμφανίζονται στις ιστοσελίδες."
 
-#: ../midori/midori-view.c:4132
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
 "Το Flash και άλλα πρόσθετα του Netscape δεν μπορούν να βρεθούν σε λίστα από "
 "ιστοσελίδες."
 
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε "
 "κατά την εκτέλεση."
 
-#: ../midori/midori-view.c:4220
-msgid "Page loading delayed"
-msgstr "Î\9aαθÏ\85Ï\83Ï\84έÏ\81ηÏ\83η Ï\86Ï\8cÏ\81Ï\84Ï\89Ï\83η Ï\83ελίδαÏ\82"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Î\97 Ï\86Ï\8cÏ\81Ï\84Ï\89Ï\83η Ï\84ηÏ\82 Ï\83ελίδαÏ\82 ÎºÎ±Î¸Ï\85Ï\83Ï\84έÏ\81ηÏ\83ε:"
 
-#: ../midori/midori-view.c:4221
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 "Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων "
 "εκκίνησης."
 
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Φόρτωση σελίδας"
 
-#: ../midori/midori-view.c:4388
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Κενή σελίδα"
 
-#: ../midori/midori-view.c:4602
-msgid "_Duplicate Tab"
-msgstr "_Διπλότυπη καρτέλα"
-
-#: ../midori/midori-view.c:4607
-msgid "Show Tab _Label"
-msgstr "Εμφάνιση _ετικέτας καρτέλας"
-
-#: ../midori/midori-view.c:4607
-msgid "Show Tab _Icon Only"
-msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας"
-
-#: ../midori/midori-view.c:4614
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Κλείσιμο της άλλ_ης καρτέλας"
-msgstr[1] "Κλείσιμο των άλλ_ων καρτελών"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5303
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "προηγούμενο"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5322
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "επόμενο"
 
-#: ../midori/midori-view.c:5335
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Εκτύπωση εικόνων παρασκηνίου"
 
-#: ../midori/midori-view.c:5336
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου"
 
-#: ../midori/midori-view.c:5361
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Χαρακτηριστικά"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s από %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1392,27 +1464,27 @@ msgstr[0] "%d δευτερόλεπτο"
 msgstr[1] "%d δευτερόλεπτα"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s απομένει"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Το αρχείο που κατέβηκε είναι εσφαλμένο."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1420,280 +1492,282 @@ msgstr ""
 "Το άθροισμα ελέγχου που παρέχεται με το σύνδεσμο δεν ταιριάζει. Αυτό "
 "σημαίνει ότι το αρχείο είναι μάλλον ελλιπές ή τροποποιήθηκε στη συνέχεια."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Το αρχείο \"%s\" δεν μπορεί να αποθηκευτεί σε αυτόν τον φάκελο."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Δεν έχετε δικαιώματα εγγραφής σε αυτή την τοποθεσία"
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Γρήγορη σύνδεση"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Κάντε click για προσθήκη συντόμευσης"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Εισάγεται διεύθυνση συντόμευσης"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Εισάγετε τίτλο συντόμευσης"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Εκκίνηση"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Κατά την εκκίνηση του midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Αρχική σελίδα:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Χρήση _τρέχουσας σελίδας"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Τρέχουσα σελίδα ως αρχική"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Αναλογική οικογένεια γραμματοσειράς"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr ""
 "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση "
 "του κειμένου"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
-msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
+msgstr ""
+"Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr ""
 "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού "
 "μεγέθους κειμένου"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr ""
 "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου "
 "σταθερού μεγέθους"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Ελάχιστο μέγεθος γραμματοσειράς"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Προτιμώμενη κωδικοποίηση"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Συμπεριφορά"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Αυτόματη φόρτωση εικόνων"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Ενεργοποίηση ορθογραφίας"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Ενεργοποίηση δεσμών εντολών"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Ενεργοποίηση υποστήριξης WebGL"
 
-#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Ενεργοποίηση αρθρωμάτων netscape"
-
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Εστίαση κειμένου και εικόνων"
 
-#: ../midori/midori-preferences.c:397
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα."
 
-#: ../midori/midori-preferences.c:398
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
 "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα "
 "παράθυρα"
 
-#: ../midori/midori-preferences.c:401
-msgid "Middle click opens Selection"
-msgstr "Το Î¼ÎµÏ\83αίο ÎºÎ»Î¹Îº Î±Î½Î¿Î¯Î³ÎµÎ¹ Ï\84ην Î\95Ï\80ιλογή"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "ΠÏ\81οεÏ\80ιλεγμένο ÎµÏ\80ίÏ\80εδο Î¶Î¿Ï\85μ"
 
-#: ../midori/midori-preferences.c:402
-msgid "Load an address from the selection via middle click"
-msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ"
-
-#: ../midori/midori-preferences.c:406
-msgid "Flash window on background tabs"
-msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+"Αρχικός παράγοντας για μεγένθυση των καρτελών που ανοίχτηκαν τώρα κατά"
 
-#: ../midori/midori-preferences.c:411
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Προτιμώμενες γλώσσες"
 
-#: ../midori/midori-preferences.c:415
+#: ../midori/midori-preferences.c:426
 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\""
+"πολυγλωσσικών ιστοσελίδων, για παράδειγμα  \"de\", \"ru,nl\" or \"en-"
+"us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Περιήγηση"
 
-#: ../midori/midori-preferences.c:428
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Θέμα:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Στυλ εργαλειοθήκης:"
 
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Άνοιγμα νέων σελίδων σε:"
 
-#: ../midori/midori-preferences.c:438
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Συμπεριφορά νέας καρτέλας:"
+
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Κουμπιά κλεισίματος στις καρτέλες"
 
-#: ../midori/midori-preferences.c:442
-msgid "Always Show Tabbar"
-msgstr "Εμφάνιση πάντα της γραμμής καρτελών"
-
-#: ../midori/midori-preferences.c:446
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων"
 
-#: ../midori/midori-preferences.c:447
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr ""
 "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την "
 "τελευταία"
 
-#: ../midori/midori-preferences.c:450
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Άνοιγμα των καρτελών στο παρασκήνιο"
 
-#: ../midori/midori-preferences.c:454
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Κειμενογράφος"
 
-#: ../midori/midori-preferences.c:459
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Διαχειριστής νέων"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:466
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Διακομιστής μεσολάβησης"
 
-#: ../midori/midori-preferences.c:473
-msgid "Hostname"
-msgstr "Όνομα διακομιστή"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URL"
 
-#: ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Πόρτα"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Υποστηριζόμενοι τύποι διακομιστών:"
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:493 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Προσωρινής μνήμης ιστού"
 
-#: ../midori/midori-preferences.c:494 ../midori/midori-preferences.c:497
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Το μέγιστο μέγεθος των προσωρινά αποθηκευμένων σελίδων στο δίσκο"
 
-#: ../midori/midori-preferences.c:499
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "ΜΒ"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Αναγνώριση ως"
 
-#: ../midori/midori-preferences.c:521
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Προσωπικό απόρρητο"
 
-#: ../midori/midori-preferences.c:523
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Διαγραφή παλιών cookies μετά από:"
 
-#: ../midori/midori-preferences.c:525 ../midori/midori-preferences.c:528
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies"
 
-#: ../midori/midori-preferences.c:532
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Αποδοχή Cookies μόνο από τα επισκεπτόμενους ιστότοπους"
 
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
-msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους "
+msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1701,36 +1775,40 @@ msgstr ""
 "Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ "
 "χρηστών για διαφημιστικούς λόγους."
 
-#: ../midori/midori-preferences.c:545
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:552
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Αφαίρεση λεπτομερειών referrer που αποστέλλονται σε ιστοσελίδες"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:554
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Εάν η κεφαλίδα  \"Referer\" θα πρέπει να συντομεύσει στο hostname"
 
-#: ../midori/midori-preferences.c:557
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Διαγραφή σελίδων από το ιστορικό μετά από:"
 
-#: ../midori/midori-preferences.c:559 ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού"
 
-#: ../midori/midori-preferences.c:599 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Διαχείριση των μηχανών αναζήτησης"
+
 #: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Προσθήκη μηχανής αναζήτησης"
@@ -1747,75 +1825,75 @@ msgstr "_Όνομα:"
 msgid "_Description:"
 msgstr "_Περιγραφή:"
 
-#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../midori/midori-searchaction.c:1122
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Μορφότυπο:"
 
-#: ../midori/midori-searchaction.c:1412
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Διαχείριση των μηχανών αναζήτησης"
 
-#: ../midori/midori-searchaction.c:1512
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Χρήση ως _προκαθορισμένο"
 
-#: ../midori/midori-searchaction.c:1623
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n"
 
-#: ../midori/midori-searchaction.c:1678
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Î\99στορικό"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "ΣελιδοδείκÏ\84εÏ\82 ÎºÎ±Î¹ Î¹στορικό"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s"
+msgid "Search for %s"
+msgstr "Αναζήτηση για %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Αποτυχία επιλογής από το ιστορικό: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Αναζήτηση για %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Αναζήτηση με..."
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Αναζήτηση με %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Άνοιγμα με"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Επιλέξτε μια εφαρμογή ή εντολή για να ανοίξει το \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα."
 
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Μη έγκυρο URI"
+
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
@@ -1837,120 +1915,140 @@ msgstr "Ταίριασμα πεζών"
 msgid "Close Findbar"
 msgstr "Κλείσιμο μπάρας εύρεσης"
 
-#: ../toolbars/midori-transferbar.c:110
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Το αρχείο '<b>%s</b>' έχει κατέβει."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d σελιδοδείκτης"
+msgstr[1] "%d σελιδοδείκτες"
 
-#: ../toolbars/midori-transferbar.c:115
-msgid "Transfer completed"
-msgstr "Η μεταφορά ολοκληρώθηκε"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d υποφάκελος"
+msgstr[1] "%d υποφάκελοι"
 
-#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Καθαρισμός όλων"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Κενός φάκελος"
 
-#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280
-msgid "Some files are being downloaded"
-msgstr "Μερικά αρχεία κατεβαίνουν"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Ο φάκελος περιέχει %s και κανέναν σελιδοδείκτη"
 
-#: ../toolbars/midori-transferbar.c:284
-msgid "_Quit Midori"
-msgstr "_Τερματισμός του Μιντόρι"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Ο φάκελος περιέχει %s"
 
-#: ../toolbars/midori-transferbar.c:286
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Ο φάκελος περιέχει %s και %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Î\91Ï\80έÏ\84Ï\85Ï\87ε Î· Ï\80Ï\81οÏ\83θήκη Ï\83ελιδοδείκÏ\84η: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Î\9f Ï\83ελιδοδείκÏ\84ηÏ\82 Î¿Î´Î·Î³ÎµÎ¯ Ï\83ε: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Αποτυχία ενημέρωσης σελιδοδείκτη: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s και κανένας σελιδοδείκτης"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s και %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Προσθήκη ενός νέου φακέλου"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Διαχωριστικό</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Άνοιγμα σε νέα_καρτέλα"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Αναζήτηση Σελιδοδεικτών"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Ιστορικό"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Σήμερα"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Χθες"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Μια βδομάδα πριν"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Καθαρισμός ολόκληρου του ιστορικού"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Αναζήτηση Ιστορικού"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Μεταφορές"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Άνοιγμα _φακέλου προορισμού"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Απαιτείται αυθεντικοποίηση"
@@ -1975,114 +2073,63 @@ msgstr "Συνθηματικό"
 msgid "_Remember password"
 msgstr "Α_πομνημόνευση συνθηματικού"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Το εικονίδιο Named '%s' δεν μπορεί να φορτωθεί"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθεί"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Κανένα"
 
-#: ../katze/katze-utils.c:422
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Επιλογή αρχείου"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Επιλογή φακέλου"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "Κανένα"
-
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 ώρα"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 ημέρα"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 Εβδομάδα"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 μήνας"
 
-#: ../katze/katze-utils.c:692
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 έτος"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Προτιμήσεις για %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Ρύθμιση φίλτρων διαφημίσεων"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Επεξεργασία κανόνα"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Κανόνας:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Φρ_αγή εικόνας"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Φρ_αγή συνδέσμου"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Εμποδιστής διαφημίσεων"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το "
 "εγκαταστήσετε;"
@@ -2106,71 +2153,71 @@ msgstr "_Εγκατάσταση στυλ χρήστη"
 msgid "Don't install"
 msgstr "Να μην εγκατασταθεί"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Δέσμες εντολών χρηστών"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Θέματα χρήστη"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Θέλετε να διαγράψετε το '%s';"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Διαγραφή δέσμης εντολών χρήστη"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Διαγραφή θεμάτων χρήστη"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Το αρχείο <b>%s</b> θα διαγραφεί μόνιμα."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Άνοιγμα στον κειμενογράφο"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Άνοιγμα φακέλου προορισμού"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Προσθήκη νέας επέκτασης"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Απομάκρυνση της επιλεγμένης επέκτασης"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Προσθήκες χρήστη"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Υποστήριξη για δέσμες εντολών χρήστη και στυλ χρήστη"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Χρωματιστές καρτέλες"
 
-#: ../extensions/colorful-tabs.c:204
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα"
 
@@ -2179,11 +2226,11 @@ msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα"
 msgid "Cookie Manager"
 msgstr "Διαχειριστής cookie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Διαγραφή όλων"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2191,31 +2238,31 @@ msgstr ""
 "Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα "
 "cookies που ταιριάζουν στο φίλτρο θα διαγραφούν."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Ανάπτυξη όλων"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Μάζεμα όλων"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Ερώτηση"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Στο τέλος της συνεδρίας"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2233,15 +2280,15 @@ msgstr ""
 "<b>Λήγει</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Όχι"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2250,20 +2297,20 @@ msgstr ""
 "<b>Τομέας</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:503
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Ανάπτυξη όλων"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Μάζεμα όλων"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Αναζήτηση Cookies ανά Όνομα ή Τομέα"
 
@@ -2283,26 +2330,45 @@ msgstr "Αντιγραφή διευθύνσεων από καρτέλες"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Αντιγραφή των διευθύνσεων όλων των καρτέλων στο πρόχειρο"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Καθυστέρηση φόρτωσης"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Καθυστέρηση σε δευτερόλεπτα μέχρι την φόρτωση της σελίδας:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Καθυστέρηση φόρτωσης σελίδας μέχρι να χρησιμοποιήσετε την μπάρα."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Διπλό κλικ για περισσότερες πληροφορίες"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr ""
-"Ένα σφάλμα προκλήθηκε κατα την απόπειρα κατεβάσματος ενός αρχείου με το "
-"ακόλουθω πρόσθετο:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Παρουσιάστηκε σφάλμα κατά τη λήψη ενός αρχείου με το ακόλουθο πρόσθετο:\n"
+"%s\n"
+"\n"
+"Σφάλμα:\n"
+"%s\n"
+"\n"
+"Συνεχίστε χωρίς αυτό το πρόσθετο."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2333,36 +2399,36 @@ msgstr "Κατέβασμα αρχείων με \"%s\" ή με χειροκίνη
 msgid "External Download Manager - CommandLine"
 msgstr "Εξωτερικός διαχειριστής μεταφορτώσεων - Γραμμή εντολών"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
 "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Τελευταία ενημέρωση: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Ροές νέων"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Προσθήκη ενός νέας ροής"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Διαγραφή ροής"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Ροές"
 
@@ -2371,48 +2437,49 @@ msgstr "_Ροές"
 msgid "Failed to find root element in feed XML data."
 msgstr "Αποτυχία εύρεσης root στοιχείου στα δεδομένα XML ροής."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Μορφή ροής που δεν υποστηρίζεται"
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Αποτυχία επεξεργασίας της XML ροής: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Αποτυχία εύρεσης στοιχείου \"channel\" στα δεδομένα RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Βρέθηκε έκδοση RSS που δεν υποστηρίζεται."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 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
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Η ροή '%s' ήδη υπάρχει"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Σφάλμα κατά την φόρτωση ροής '%s'"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Πλαίσιο ροής"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Ανάγνωση Atom / RSS ροών"
 
@@ -2433,127 +2500,411 @@ msgstr ""
 "Απαιτείται το κυρίως συνθηματικό\n"
 "για το άνοιγμα της βάσης δεδομένων"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Απομνημόνευση συνθηματικού σε αυτή τη σελίδα;"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Απομνημόνευση"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Όχι τώρα"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Ποτέ γι' αυτή τη σελίδα"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Φόρμα εναλλαγής από την κατάσταση ιστορικού"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία "
 "τρέχουσα καρτέλα."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "Ενεργοποίηση ιστορικού φόρμας μέσω συντόμευσης(Ctrl+Shift+F) ανά καρτέλα"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Ιστορικό δεδομένων φόρμας"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Αποθηκεύει το ιστορικό των δεδομένων που έχουν εισαχθεί σε φόρμες"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Αποτυχία επιλογής υποδείξεων\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Δεν υπάρχουν μη επισκεπτόμενες καρτέλες"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Λίστα-Ιστορικού"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Συμπεριφορά κλεισίματος καρτέλας"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Μην κάνεις τίποτα"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Μετάβαση στην τελευταία προσβληθείσα καρτέλα"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Μετάβαση στην νεότερη καρτέλα"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Επόμενη νέα καρτέλα (λίστα ιστορικού)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Επόμενη νέα καρτέλα από το ιστορικό"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Προηγούμενη νέα καρτέλα (λίστα ιστορικού)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Προηγούμενη νέα καρτέλα από ιστορικό"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Εμφάνιση καρτέλας στο παρασκήνιο (λίστα ιστορικού)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Εμφάνιση της τρέχουσας επιλεγμένης καρτέλας στο παρασκήνιο"
 
-#: ../extensions/history-list.vala:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Λίστα ιστορικού"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή "
 "κλείνονται οι καρτέλες"
 
-#: ../extensions/mouse-gestures.c:297
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Αποτυχία SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Αποδοχή"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Αποδοχή για αυτήν την συνεδρία"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Φραγή"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Αδυναμία ανοίγματος βάσης δεδομένων της επέκτασης: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Θέλετε πραγματικά να διαγράψετε όλα τα δικαιώματα του JavaScript;"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Διαγραφή όλων των δικαιωμάτων του JavaScript;"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Αυτή η ενέργεια θα διαγράψει όλα τα δικαιώματα του JavaScript. Θα σας "
+"ζητηθούν ξανά τα δικαιώματα για κάθε σελίδα που έχετε επισκεφθεί."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Παράδειγμα διαχειριστή"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Επιβεβαίωση NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domain"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Πολιτική"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Διαγραφή ό_λων"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "Να_επιτρέπονται τα script σε όλες τις ιστοσελίδες"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Μπλοκ_άρισμα script σε άγνωστους domains από προεπιλογή"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Ο_ρισμός δικαιωμάτων σε τομείς δεύτερου επιπέδου"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Να απαγορεύεται το %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Να επιτρέπεται το %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Να επιτραπεί το %s αυτή τη φορά"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Παράθυρο περιηγητή"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Προβολή"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Κατάσταση εικονιδίου μενού"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Απροσδιόριστο"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Επιτρέπεται"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Ανάμεικτες"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Απαγορεύεται"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Προέκυψε κρίσιμο σφάλμα που εμποδίζει την επέκταση NoJS να συνεχίσει. Θα "
+"πρέπει να την απενεργοποιήσετε."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Σφάλμα στην επέκταση NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Αιτία"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Αδυναμια δημιουργείας φακέλου ρυθμίσεων για την επέκταση:%s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Αδυναμία δημιουργείας φακέλου ρυθμίσεων για την επέκταση."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Αποτυχία κατά το άνοιγμα της βάσης των επεκτάσεων: %s"
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Αδυναμία δημιουργείας της δομής τηε βάσης δεδομέων για την επέκταση."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Παράδειγμα επέκτασης"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Το παράδειγμα επέκτασης του Midori για αυτή την επέκταση"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Παράδειγμα εφαρμογής"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Παράδειγμα βάσης δεδομένων"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Διαδρομή βάσης δεδομένων"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Να επιτρέπεται σε όλες τις ιστοσελίδες"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Αν είναι αληθινό, αυτή η επέκταση δε θα ελέγχει την πολιτική κάθε "
+"ιστοσελίδας αλλά θα τα επιτρέπει."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Μόνο δεύτερου επιπέδου"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Άγνωστη πολιτική τομέα"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Πολιτική για χρήση σε άγνωστους τομείς."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Προσωρινή αποδοχή"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Κινήσεις ποντικιού"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Χειρισμός του midori μετακινώντας το ποντίκι"
 
@@ -2566,8 +2917,8 @@ msgid "Customize Keyboard shortcuts"
 msgstr "Προσαρμογή συντομεύσεων πληκτρολογίου"
 
 #: ../extensions/shortcuts.c:275
-msgid "Customize Sh_ortcuts..."
-msgstr "Προσαρμογή σ_υντομεύσεων..."
+msgid "Customize Sh_ortcuts"
+msgstr "Προσαρμογή Συ_ντομεύσεων…"
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2577,11 +2928,11 @@ msgstr "Συντομεύσεις"
 msgid "View and edit keyboard shortcuts"
 msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Ρολόι στην γραμμή κατάστασης"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Εμφάνιση ημερομηνίας και ώρας στην γραμμή κατάστασης"
 
@@ -2597,6 +2948,10 @@ msgstr "Δέσμες εντολών"
 msgid "Netscape plugins"
 msgstr "Αρθρωμάτων netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Ενεργοποίηση αρθρωμάτων netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Γραμμή κατάστασης χαρακτηριστικών"
@@ -2607,15 +2962,15 @@ msgstr ""
 "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και "
 "απενεργοποίηση"
 
-#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Πλαίσιο καρτέλας"
 
-#: ../extensions/tab-panel.c:656
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Πλαίσιο κ_αρτέλας"
 
-#: ../extensions/tab-panel.c:674
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο"
 
@@ -2627,11 +2982,11 @@ msgstr "Μόνο εικονίδια στις καρτέλες εξ'ορισμο
 msgid "New tabs have no label by default"
 msgstr "Οι νέες καρτέλες δεν έχουν ετικέτα εξ'ορισμού"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Προσαρμογή εργαλειοθήκης"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2639,66 +2994,58 @@ msgstr ""
 "Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα "
 "αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά."
 
-#: ../extensions/toolbar-editor.c:427
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Διαθέσιμα αντικείμενα"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Εμφανίσιμα αντικείμενα"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Προσαρμογή Εργαλειοθήκης..."
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Επεξεργασία εργαλειοθήκης"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Εύκολη επεξεργασία της εμφάνισης της εργαλειοθήκης"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Αποτυχία φόρτωσης cookies\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Καθαρισμός προσωπικών δεδομένων"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Καθαρισμός προσωπικών δεδομένων"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Καθαρισμός των παρακάτω δεδομένων:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Τελευταίες ανοιχτές _καρτελές"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:302
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Αποθηκευμένες συνδέσεις και _συνθηματικά"
 
-#: ../midori/midori-privatedata.c:304
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Δεδομένα ιστοσελίδας και Cookies"
 
-#: ../midori/midori-privatedata.c:311
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Εικονίδια ιστότοπων"
 
@@ -2706,202 +3053,154 @@ msgstr "Εικονίδια ιστότοπων"
 msgid "Open tabs"
 msgstr "Ανοιχτές καρτέλες"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Περισσότερες ανοιχτές καρτέλες..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "αποτυχία ΠΡΟΣΑΡΤΗΣΗΣ της παλιάς βάσης δεδομένων"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "αποτυχία εισαγωγής από την παλιά βάση δεδομένων"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "αποτυχία επιστροφής της συναλλαγής"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "Αποτυχία αποσύνδεσης"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Αδυναμία δημιουργείας πίνακα σελιδοδεικτών: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Αδυναμία εισαγωγής από την παλιά βάση δεδομένων: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Αποτυχία ενημέρωσης σελιδοδείκτη: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Î\9fι Ï\83ελιδοδείκÏ\84εÏ\82 Î´ÎµÎ½ Î¼Ï\80Ï\8cÏ\81εÏ\83αν Î½Î± Î±Ï\80οθηκεÏ\85Ï\84οÏ\8dν. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Î\91δÏ\85ναμία Î±Ï\86αίÏ\81εÏ\83ηÏ\82 Ï\83ελιδοδείκÏ\84η: %s\n"
 
-#: ../midori/midori-session.c:188
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν "
 "μπορούν να επιβεβαιωθούν."
 
-#: ../midori/midori-session.c:357
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s"
 
-#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n"
-
-#: ../midori/midori-session.c:408
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:127
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s"
 
-#: ../midori/midori-frontend.c:312
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Το Μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό "
-"συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να "
-"επιλύσετε το πρόβλημα."
+"Ο MIdori κράσαρε την τελευταία φορά που εκκινήθηκε. Μπορείτε να αναφέρετε το "
+"πρόβλημα στο %s."
 
-#: ../midori/midori-frontend.c:322
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Τροποποίηση _προτιμήσεων"
 
-#: ../midori/midori-frontend.c:326
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Απενεργοποίηση όλων των επ_εκτάσεων"
 
-#: ../midori/midori-frontend.c:335
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Εμφάνιση διαλόγου μετά από αποτυχία"
 
-#: ../midori/midori-frontend.c:340
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Απόρριψη παλιών καρτελών"
 
-#: ../midori/midori-frontend.c:404
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Εμφάνιση τελευταίου αρχείου καταγραφής _κατάρρευσης"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Εκτέλεση στο πρόγραμμα  _αποσφαλμάτωσης"
+
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n"
 
-#: ../midori/midori-frontend.c:437
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n"
 
-#: ../midori/midori-frontend.c:468
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n"
 
-#: ../midori/midori-frontend.c:476
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n"
 
-#: ../midori/midori-frontend.c:487
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:"
 
-#: ../midori/midori-frontend.c:492
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "Α_γνόησε"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:235
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:279
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:584
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Αποτυχία SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:984
-msgid "Accept"
-msgstr "Αποδοχή"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:985
-msgid "Accept for session"
-msgstr "Αποδοχή για αυτήν την συνεδρία"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:986
-msgid "Block"
-msgstr "Φραγή"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:145
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Αποτυχία ανοίγματος της βάσης δεδομένων των επεκτάσεων: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:187
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr "Î\94ιαγÏ\81αÏ\86ή Ï\80αλιÏ\8eν cookies Î¼ÎµÏ\84ά Î±Ï\80Ï\8c:"
+msgstr "Î\94ιαγÏ\81αÏ\86ή Ï\8cλÏ\89ν Ï\84Ï\89ν Î´Î¹ÎºÎ±Î¹Ï\89μάÏ\84Ï\89ν Ï\84οÏ\85 cookie;"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
+"Αυτή η ενέργεια θα διαγράψει όλα τα δικαιώματα των cookie. Τα δικαιώματα θα "
+"σας ζητηθούν ξανά για κάθε ιστοσελίδα που επισκεφτήκατε."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Διαχειριστής cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr ""
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Ρύθμιση αδειών cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2910,460 +3209,348 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:489
-msgid "Domain"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712
-msgid "Policy"
-msgstr "Πολιτική"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-msgid "Delete _all"
-msgstr "Διαγραφή ό_λων"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Πολιτική για τα cookies από τομείς που δεν είναι στη λίστα: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749
-msgid "A_sk for policy if unknown for a domain"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Ερώτηση για απόφαση"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:83
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
 msgstr ""
+"Ένα κρίσιμο σφάλμα προέκυψε το οποίο εμποδίζει την επέκταση διαχειριστή "
+"δικαιωμάτων των cookie να συνέχισει. Θα πρέπει να την απενεργοποιήσετε."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:87
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
-msgstr ""
+msgstr "Σφάλμα στην επέκταση διαχειριστή διακαιωμάτων των cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:92
-msgid "Reason"
-msgstr "Αιτία"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:125
-msgid "Could not get path to configuration of extension: path is NULL"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:127
-msgid "Could not get path to configuration of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:133
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Αδυναμια δημιουργείας φακέλου ρυθμίσεων για την επέκταση:%s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:135
-msgid "Could not create configuration folder for extension."
-msgstr "Αδυναμία δημιουργείας φακέλου ρυθμίσεων για την επέκταση."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:150
-msgid "Could not open database of extension."
-msgstr "Αποτυχία κατά το άνοιγμα της βάσης των επεκτάσεων: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:183
-msgid "Could not set up database structure of extension."
-msgstr "Αδυναμία δημιουργείας της δομής τηε βάσης δεδομέων για την επέκταση."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:430
-msgid "Confirm storing cookie"
-msgstr "Î\95Ï\80ιβεβαίÏ\89Ï\83η Î±Ï\80οθήκεÏ\85Ï\83ηÏ\82 cookie"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Î\9cέÏ\87Ï\81ι Ï\84ον Ï\84εÏ\81μαÏ\84ιÏ\83μÏ\8c Ï\84ηÏ\82 Ï\83Ï\85νεδÏ\81ίαÏ\82"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:461
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Η ιστοσελίδα %s θέλει να αποθηκεύση %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:463
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Η ιστοσελίδα %s θέλει να αποθηκεύση ένα cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:467
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Πολλαπλές ιστοσελίδες θέλουν να αποθηκεύσουν στο σύνολο %d cookies."
 
-#. Create expander for details
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:479
-msgid "_Details"
-msgstr "_Λεπτομέρειες"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:496
-msgid "Path"
-msgstr "Διαδρομή"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:510
-msgid "Value"
-msgstr "Τιμή"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:521
-msgid "Expire date"
-msgstr "Ημερομηνία λήξης"
-
-#. Create buttons for dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:545
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Αποδοχή"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:548
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Αποδοχή για αυτή την _συνεδρία"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:550
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Άρ_νηση"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:881
-#, fuzzy
-msgid "Extension instance"
-msgstr "Επεκτάσεις"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Άρνηση _αυτή τη φορά"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:882
-msgid "The Midori extension instance for this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:888
-#, fuzzy
-msgid "Application instance"
-msgstr "Εκτός σύνδεσης προσωρινή μνήμη εφαρμογής"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:889
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:895
-msgid "Database instance"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Διαδρομή"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:896
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Τιμή"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:901
-msgid "Ask for unknown policy"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Ημερομηνία λήξης"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:902
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:983
-msgid "Undetermined"
-msgstr "Απροσδιόριστο"
-
 #: ../extensions/cookie-permissions/main.c:62
-#, fuzzy
 msgid "Cookie Security Manager"
-msgstr "Διαχειριστής cookie"
+msgstr "Διαχειριστής Ασφαλείας από Cookie"
 
 #: ../extensions/cookie-permissions/main.c:63
 msgid "Manage cookie permission per site"
-msgstr ""
-
-#~ msgid "Writing failed."
-#~ msgstr "Αποτυχία εγγραφής."
-
-#~ msgid "_Window"
-#~ msgstr "_Παράθυρο"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Κινητική κύλιση"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα "
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Ανακατεύθυνση μηνυμάτων κονσόλας στο συγκεκριμένο ΑΡΧΕΙΟ"
-
-#~ msgid "FILENAME"
-#~ msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας"
-
-#~ 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 "Εμφάνιση γραμμής μενού"
+msgstr "Διαχείριση των δικαιωμάτων των cookie ανά ιστοσελίδα"
 
-#~ 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 "Κατά την εκκίνηση του midori να φορτώνει:"
-
-#~ msgid "The homepage"
-#~ msgstr "Η αρχική σελίδα"
-
-#~ msgid "Show crash dialog"
-#~ msgstr "Εμφάνιση παραθύρου αποτυχίας"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Αποτυχία λήψης εικονιδίου εφαρμογής σε %s: %s"
 
-#~ msgid "An external text editor"
-#~ msgstr "Εξωτερικός κειμενογράφος"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "An external news aggregator"
-#~ msgstr "Εξωτερικός διαχειριστής νέων"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Αποτυχία δημιουργίας νέου εκκινητή (%s): %s"
 
-#~ msgid "Location entry Search"
-#~ msgstr "Διεύθυνση για αναζήτηση"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Ο εκκινητής δημουργήθηκε"
 
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Μπορείτε να \"τρέξετε\" το <b>%s</b> από τον εκκινητή σας ή το μενού"
 
-#~ msgid "The preferred character encoding"
-#~ msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Σφάλμα κατά τη δημιουργία εκκινητή"
 
-#~ msgid "Always show the tabbar"
-#~ msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Εφαρμογές"
 
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Νέο _Προφίλ"
 
-#~ msgid "Where to open new pages"
-#~ msgstr "Που να ανοίγουν οι νέες σελίδες"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Δημιουργεί ένα νέο, ανεξάρτητο προφίλ και έναν εκκινητή"
 
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Νέα _Εφαρμογή"
 
-#~ msgid "Open popups in tabs"
-#~ msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Δημιουργεί μια εφαρμογή για μια συγκεκριμένη ιστοσελίδα"
 
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Σφάλμα κατά την εκκίνηση"
 
-#~ msgid "Load and display images automatically"
-#~ msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Δημιουργία _εκκινητή"
 
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Διαχειριστής Εφαρμογών Ιστού"
 
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Διαχείριση των εγκαταστημένων ιστοσελίδων ως εφαρμογές"
 
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Μεταφορές"
 
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Καθαρισμός όλων"
 
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Αποτυχία ανοίγματος λήψης: %s"
 
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Άνοιγμα _φακέλου προορισμού"
 
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου"
 
-#~ msgid "Flash the browser window if a new tab was opened in the background"
-#~ msgstr ""
-#~ "Αναβόσβησε το παράθυρο του περιηγητή όταν μία καρτέλα ανοιχθεί στο "
-#~ "παρασκήνιο"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Το αρχείο '<b>%s</b>' έχει κατέβει."
 
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Να επιτρέπεται στις ιστοσελίδες να χρησιμοποιούν αποτύπωση OpenGL"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "Το '<b>%s</b>' και %d άλλα αρχεία έχουν ληφθεί."
 
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Η μεταφορά ολοκληρώθηκε"
 
-#~ msgid "Find inline while typing"
-#~ msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Μερικά αρχεία κατεβαίνουν"
 
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr ""
-#~ "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Τερματισμός του Μιντόρι"
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Ο τύπος του διακομιστής προς χρήση"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori."
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP διακομιστής μεσολάβησης"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Διαχειριστής Μεταφορών"
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Προβολή ληφθέντων αρχείων"
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "Η πόρτα του μεσολαβητή χρησιμοποιείται για HTTP συνδέσεις"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Αποτυχία ενημέρωσης βάσης δεδομένων: %s"
 
-#~ msgid "Identification string"
-#~ msgstr "Αλφαριθμητικό αναγνώρισης"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Αποτυχία επιλογής από τη βάση δεδομένων: %s"
 
-#~ msgid "The application identification string"
-#~ msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Clear private data"
-#~ msgstr "Καθαρισμός προσωπικών δεδομένων"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Διαχείριση καρτελών και συνεδριών"
 
-#~ msgid "Clear data"
-#~ msgstr "Καθαρισμός δεδομένων"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "Τα δεδομένα που επιλέχθηκαν για διαγραφή"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Αυτή η επέκταση παρέχει μια ουρά εργασιών για εργασίες ενημέρωσης ή "
+"περιοδικών γεγονότων."
 
-#~ msgid "Highlight Matches"
-#~ msgstr "Τονισμός των ταιριασμάτων"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Αποτυχία προσθήκης νέας σημείωσης στη βάση δεδομένων: %s\n"
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Σελιδοδείκτης"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Αποτυχία αφαίρεσης σημείωσης από την βάση δεδομένων: %s\n"
 
-#~ msgid "_Console"
-#~ msgstr "_Τερματικό"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Αποτυχία μετονομασίας σημείωσης: %s\n"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "Αρχικός φάκελος"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Αποτυχία ενημέρωσης σημείωσης: %s\n"
 
-#~ msgid "_Title:"
-#~ msgstr "_Τίτλος:"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Σημειώσεις"
 
-#~ msgid "_Folder:"
-#~ msgstr "_Φάκελος:"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Νέα Σημείωση"
 
-#~ msgid "Import bookmarks..."
-#~ msgstr "Εισαγωγή συνδέσμων..."
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Δημιουργεί μια νέα, κενή σημείωση, άσχετη με τις ανοιγμένες σελίδες"
 
-#~ msgid "Search with..."
-#~ msgstr "Αναζήτηση με..."
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Νέα σημείωση"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "Κλείσιμο άλλ_ων καρτελών"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Αδυναμία επιλογής από την βάση δεδομένων σημειώσεων: %s\n"
 
-#~ msgid "_Icon:"
-#~ msgstr "_Εικονίδιο:"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Μετονομασία σημείωσης"
 
-#~ msgid "Filter:"
-#~ msgstr "Φίλτρο:"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Αντιγραφή σημείωσης στο πρόχειρο"
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr ""
-#~ "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που "
-#~ "το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Αφαίρεση σημείωσης"
 
-#~ msgid "Customize _Toolbar..."
-#~ msgstr "Προσαρμογή _εργαλειοθήκης..."
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Αντιγραφή επιλογής ως σημείωση"
 
-#~ msgid "_Customize..."
-#~ msgstr "_Προσαρμογή..."
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+"Αποθήκευση των αποκομμάτων κειμένου από τις ιστοσελίδες ως σημειώσεις"
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "Ελαφρύς περιηγητής ιστού"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Εμποδιστής διαφημίσεων"
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη."
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα"
 
-#~ msgid "Cookies"
-#~ msgstr "Cookies"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Ρύθμιση φίλτρων διαφημίσεων"
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Άδειασμα των cookies"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Φρ_αγή εικόνας"
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "_Βάσεις δεδομένων HTML5"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Φρ_αγή συνδέσμου"
 
-#~ msgid "Not available: %s"
-#~ msgstr "Μη διαθέσιμα: %s"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Επεξεργασία κανόνα"
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Κανόνας:"
diff --git a/po/en_AU.po b/po/en_AU.po
new file mode 100644 (file)
index 0000000..63d4a75
--- /dev/null
@@ -0,0 +1,3425 @@
+# English (Australia) translation for midori
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-08-15 21:19+0000\n"
+"Last-Translator: Anthony Harrington <untaintableangel@ubuntu.com>\n"
+"Language-Team: English (Australia) <en_AU@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web Browser"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Browser"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Browse the Web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "New Tab"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "New Window"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "New Private Browsing Window"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Private Browsing"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Private Browsing"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL fails: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "The following errors occurred:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignore"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/en_CA.po b/po/en_CA.po
new file mode 100644 (file)
index 0000000..3391f8b
--- /dev/null
@@ -0,0 +1,3479 @@
+# English (Canada) translation for midori
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-08-23 14:10+0000\n"
+"Last-Translator: A_Bunny <Unknown>\n"
+"Language-Team: English (Canada) <en_CA@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web Browser"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Browser"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Browse the Web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "New Tab"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "New Window"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "New Private Browsing Window"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Private Browsing"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Private Browsing"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Open a new private browsing window"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Snapshot saved to: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Run ADDRESS as a web application"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Use FOLDER as configuration folder"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Private browsing, no changes are saved"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Portable mode, all runtime files are stored in one place"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Plain GTK+ window with WebKit, akin to GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Show a diagnostic dialog"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Run within gdb and save a backtrace on crash"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Run the specified filename as javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Take a snapshot of the specified URI"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Execute the specified command"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "List available commands to execute with -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Display program version"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Addresses"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Block URIs according to regular expression PATTERN"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Reset Midori after SECONDS seconds of inactivity"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Error: \"gdb\" can't be found\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Please report comments, suggestions and bugs to:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Check for new versions at:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "An unknown error occured"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bookmarks"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Add Boo_kmark"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Extensions"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_History"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Userscripts"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "User_styles"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "New _Tab"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Transfers"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape p_lugins"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Closed Tabs"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "New _Folder"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Addresses]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "File not found."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Malformed document."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Unrecognized bookmark format."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Go to the next page"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Go to the next sub-page"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Web Search…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Reload the current page"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Stop loading the current page"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Failed to update title: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Value '%s' is invalid for %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Unexpected setting '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Unexpected action '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Private Browsing)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Failed to insert new history item: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "New Folder"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Edit Folder"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "New Bookmark"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Edit Bookmark"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Type a name for this bookmark, and choose where to keep it."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Type a name for this folder, and choose where to keep it."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Show in Bookmarks _Bar"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Add to _Speed Dial"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Save file as"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Save associated _resources"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "A new window has been opened"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "A new tab has been opened"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Error opening the image!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Can not open selected image in the default viewer."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Error downloading the image!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Can not download selected image."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Save file"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Reload page without caching"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Open file"
+
+#: ../midori/midori-browser.c:2692
+msgid ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+msgstr ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "New feed"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Add a new bookmark"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Empty"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Toggle text cursor navigation"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Enable Caret Browsing"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Open all in _Tabs"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Open in New _Window"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Import bookmarks…"
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Import bookmarks"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Application:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Import from XBEL or HTML file"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Import from a file"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Failed to import bookmarks"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL Bookmarks"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Netscape Bookmarks"
+
+#: ../midori/midori-browser.c:4546
+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:4558
+msgid "Failed to export bookmarks"
+msgstr "Failed to export bookmarks"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "A lightweight web browser."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "See about:version for version info."
+
+#: ../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 ""
+"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:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  A_Bunny https://launchpad.net/~vlinfield1\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicate Current Tab"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_File"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Open a new window"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Open a new tab"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "New P_rivate Browsing Window"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Open a file"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Save Page As…"
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Save to a file"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Add to Speed _dial"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Subscribe to News _feed"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Close Tab"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Close the current tab"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "C_lose Window"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Print the current page"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Close a_ll Windows"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Find…"
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Find a word or phrase in the page"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Find _Next"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Find _Previous"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Configure the application preferences"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_View"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Toolbars"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Increase the zoom level"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Decrease the zoom level"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Encoding"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "View So_urce"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Ca_ret Browsing"
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Toggle fullscreen view"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Scroll _Left"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Scroll _Down"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Scroll _Up"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Scroll _Right"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Readable"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Go"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Go back to the previous page"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Go to the previous sub-page"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Go to your homepage"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Empty Trash"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Undo _Close Tab"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Add a new _folder"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Import bookmarks…"
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Export bookmarks…"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Manage Search Engines…"
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Clear Private Data…"
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "_Inspect Page"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Next Tab"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Move Tab to _first position"
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "Move Tab _Backward"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "_Move Tab Forward"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Move Tab to _last position"
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "Focus _Current Tab"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Focus _Next view"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "Only show the Icon of the _Current Tab"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Close Ot_her Tabs"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "Open last _session"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Help"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Frequent Questions"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_Report a Problem…"
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Tools"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Menubar"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "_Navigationbar"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "Side_panel"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Sidepanel"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "_Bookmarkbar"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "_Statusbar"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automatic"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinese Traditional (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinese Simplified (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanese (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Korean (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Russian (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Custom…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Failed to initialize history: %s"
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Location…"
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Open a particular location"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_Web Search…"
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Run a web search"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Reopen a previously closed tab or window"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Show the saved bookmarks"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tabs"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Show a list of all open tabs"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Menu"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Menu"
+
+#: ../midori/midori-extension.c:341
+#, 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:894 ../extensions/addons.c:1680
+#, 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:1325
+msgid "Export certificate"
+msgstr "Export certificate"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "The signing certificate authority is not known."
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "The certificate's activation time is still in the future."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "The certificate has expired"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "The certificate's algorithm is considered insecure."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Some other error occurred validating the certificate."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Export certificate"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Self-signed"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Security details"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr "Paste and p_roceed"
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Not verified"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Verified and encrypted connection"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Open, unencrypted connection"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Align sidepanel to the right"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Close panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Align sidepanel to the left"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Show Speed Dial"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Show Homepage"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Show last open tabs"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Show last tabs without loading"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Show Blank Page"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Show default Search Engine"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Show custom page"
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japanese (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "New tab"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "New window"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Current tab"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Default"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Icons"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Small icons"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Text"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Icons and text"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Text beside icons"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatic (GNOME or environment)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "HTTP proxy server"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "No proxy server"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "The style of the toolbar"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Always use my font choices"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Override fonts picked by websites with user preferences"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "The configuration could not be loaded: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Invalid configuration value '%s'"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Failed to inject stylesheet: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Show Tab _Label"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Show Tab _Icon Only"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Close Ot_her Tab"
+msgstr[1] "Close Ot_her Tabs"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Trust this website"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Security unknown"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s wants to save an HTML5 database."
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Deny"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Allow"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s wants to know your location."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' can't be found"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "The page '%s' couldn't be loaded:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Check the address for typos"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verify that your network settings are correct"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Try Again"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Oops - %s"
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Something went wrong with '%s'."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Try again"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Send a message to %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Add _search engine..."
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Open _Link"
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Open Link in New _Tab"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Open Link in _Foreground Tab"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Open Link in _Background Tab"
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Open Link in New _Window"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Copy Link de_stination"
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Save _As…"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Open _Image in New Window"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Open _Image in New Tab"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Copy Im_age"
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Save I_mage"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Open in Image _Viewer"
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Copy Video _Address"
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Download _Video"
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Open Address in New _Tab"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Search _with"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Search the Web"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Open _Frame in New Tab"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspect _Element"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Open or download file from %s"
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "File Name: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "File Type: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "File Type: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Size: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Open %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspect page - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori doesn't store any personal data:"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "No history or web cookies are being saved."
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Extensions are disabled."
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "HTML5 storage, local database and application caches are disabled."
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori prevents websites from tracking the user:"
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Referrer URLs are stripped down to the hostname."
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS prefetching is disabled."
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "The language and timezone are not revealed to websites."
+
+#: ../midori/midori-view.c:3906
+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:3949
+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:3999
+msgid "Page loading delayed:"
+msgstr "Page loading delayed:"
+
+#: ../midori/midori-view.c:4000
+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:4002
+msgid "Load Page"
+msgstr "Load Page"
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Blank page"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "previous"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "next"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Print background images"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Whether background images should be printed"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Features"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s of %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s remaining"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "The downloaded file is erroneous."
+
+#: ../midori/midori-download.vala:221
+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."
+
+#: ../midori/midori-download.vala:366
+#, 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-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "You don't have permission to write in this location."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "There is not enough free space to download \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "The file needs %s but only %s are left."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Speed Dial"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Click to add a shortcut"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Enter shortcut address"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Enter shortcut title"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Are you sure you want to delete this shortcut?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Startup"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "When Midori starts:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Use _current page"
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Use current page as homepage"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Fonts"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Proportional Font Family"
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "The default font family used to display text"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "The default font size used to display text"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Fixed-width Font Family"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "The font family used to display fixed-width text"
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "The font size used to display fixed-width text"
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Minimum Font Size"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "The minimum font size used to display text"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Preferred Encoding"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Behavior"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Load images automatically"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Enable Spell Checking"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Enable scripts"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Enable WebGL support"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom Text and Images"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Allow scripts to open popups"
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Whether scripts are allowed to open popup windows automatically"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Default Zoom Level"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Initial factor to enlarge newly opened tabs by"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Preferred languages"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Save downloaded files to:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Browsing"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Toolbar Style:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Open new pages in:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "New tab behavior:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Close Buttons on Tabs"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Open Tabs next to Current"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Open tabs in the background"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Text Editor"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "News Aggregator"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Network"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxy server"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Supported proxy types:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Web Cache"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "The maximum size of cached pages on disk"
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identify as"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privacy"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Delete old Cookies after:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "The maximum number of days to save cookies for"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Only accept Cookies from sites you visit"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Block cookies sent by third-party websites"
+
+#: ../midori/midori-preferences.c:599
+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:606
+msgid "Enable offline web application cache"
+msgstr "Enable offline web application cache"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Enable HTML5 local storage support"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Whether the \"Referer\" header should be shortened to the hostname"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Delete pages from history after:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "The maximum number of days to save the history for"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Extensions"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Manage Search Engines"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Add search engine"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Edit search engine"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Name:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Description:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Address:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Token:"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Manage Search Engines"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Use as _default"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "The search engines couldn't be loaded. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "The search engines couldn't be saved. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bookmarks and History"
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Search for %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Failed to select from history: %s"
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Search with…"
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Search with %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Open with"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Choose an application or command to open \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Could not run external program."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Invalid URI"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Inline Find:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Previous"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Next"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Match Case"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Close Findbar"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d bookmark"
+msgstr[1] "%d bookmarks"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subfolder"
+msgstr[1] "%d subfolders"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Empty folder"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Folder containing %s and no bookmark"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Folder containing %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Folder containing %s and %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bookmark leading to: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s and no bookmark"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Edit the selected bookmark"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Delete the selected bookmark"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Add a new folder"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Separator</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Open in New _Tab"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Search Bookmarks"
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "History"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Today"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#: ../panels/midori-history.c:137
+#, 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:140
+msgid "A week ago"
+msgstr "A week ago"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Failed to remove history item: %s\n"
+
+#: ../panels/midori-history.c:312
+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:358
+msgid "Bookmark the selected history item"
+msgstr "Bookmark the selected history item"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Delete the selected history item"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Clear the entire history"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Search History"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"A username and a password are required\n"
+"to open this location:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Username"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Password"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Remember password?"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "None"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "Property '%s' is invalid for %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Choose file"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Choose folder"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 hour"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 day"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 week"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 month"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 year"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Preferences for %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+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:223
+msgid "_Install user script"
+msgstr "_Install user script"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+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:229
+msgid "_Install user style"
+msgstr "_Install user style"
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Don't install"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Userscripts"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Userstyles"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Error"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Do you want to delete '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Delete user script"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Delete user style"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file <b>%s</b> will be permanently deleted."
+msgstr "The file <b>%s</b> will be permanently deleted."
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr "Open in Text Editor"
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr "Open Target Folder"
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr "Add new addon"
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr "Remove selected addon"
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr "User addons"
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Can't monitor folder '%s': %s"
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr "Support for userscripts and userstyles"
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Colorful Tabs"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Tint each tab distinctly"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Cookie Manager"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Delete All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr "Expand All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Collapse All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+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:573
+msgid "Question"
+msgstr "Question"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+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:668
+msgid "At the end of the session"
+msgstr "At the end of the session"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Yes"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "No"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Name"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Expand All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Collapse All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Search Cookies by Name or Domain"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "List, view and delete cookies"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr "Copy Tab _Addresses"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Copy Addresses of Tabs"
+
+#: ../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"
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Delayed load"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Delay page load until you actually use the tab."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "External Download Manager - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Download files with Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "External Download Manager - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Download files with SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Command:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Download files with \"%s\" or a custom command"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "External Download Manager - CommandLine"
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "Failed to find required Atom \"entry\" elements in XML data."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Last updated: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Feeds"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Add new feed"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Delete feed"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Feeds"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Failed to find root element in feed XML data."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Unsupported feed format."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Failed to parse XML feed: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Failed to find \"channel\" element in RSS XML data."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Unsupported RSS version found."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Failed to find required RSS \"item\" elements in XML data."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Failed to find required RSS \"channel\" elements in XML data."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Feed '%s' already exists"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Error loading feed '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Feed Panel"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Read Atom/ RSS feeds"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Failed to add form value: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Form history"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Master password required\n"
+"to open password database"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Remember password on this page?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Remember"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Not now"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Never for this page"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Toggle form history state"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Activate or deactivate form history for the current tab."
+
+#: ../extensions/formhistory/formhistory.c:598
+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:655
+msgid "Form history filler"
+msgstr "Form history filler"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Stores history of entered form data"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Failed to select suggestions\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "There are no unvisited tabs"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "History-List"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Tab closing behavior"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Switch to last viewed tab"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Switch to newest tab"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Flash window on background tabs"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Next new Tab (History List)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Next new tab from history"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Previous new Tab (History List)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Previous new tab from history"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Display tab in background (History List)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Display the current selected tab in background"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "History List"
+
+#: ../extensions/history-list.vala:649
+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/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL fails: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Accept"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Accept for session"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Block"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Failed to execute database statement: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domain"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Policy"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Delete _all"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Undetermined"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Reason"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Could not create configuration folder for extension: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Could not create configuration folder for extension."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Could not open database of extension."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Could not set up database structure of extension."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Extension instance"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "The Midori extension instance for this extension"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Application instance"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "The Midori application instance this extension belongs to"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Database instance"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Pointer to sqlite database instance used by this extension"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Database path"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Path to sqlite database instance used by this extension"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Mouse Gestures"
+
+#: ../extensions/mouse-gestures.c:514
+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"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Customize Keyboard shortcuts"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Customize Sh_ortcuts…"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "View and edit keyboard shortcuts"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Statusbar Clock"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Display date and time in the statusbar"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Images"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Scripts"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape plugins"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Enable Netscape plugins"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Statusbar Features"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Easily toggle features on web pages on and off"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Tab Panel"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "T_ab Panel"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Show tabs in a vertical panel"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Only Icons on Tabs by default"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "New tabs have no label by default"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Customize Toolbar"
+
+#: ../extensions/toolbar-editor.c:417
+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:433
+msgid "Available Items"
+msgstr "Available Items"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Displayed Items"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Customize Toolbar…"
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Toolbar Editor"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Easily edit the toolbar layout"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Clear Private Data"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Clear private data"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Clear the following data:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Last open _tabs"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Clear private data when _quitting Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Saved logins and _passwords"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies and Website data"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Website icons"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Open tabs"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "More open tabs…"
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Failed to clear history: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Failed to remove old history items: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Failed to add bookmark item: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Failed to update bookmark: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Failed to remove bookmark item: %s\n"
+
+#: ../midori/midori-session.c:217
+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/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "The configuration couldn't be saved. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "The trash couldn't be saved. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Modify _preferences"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Disable all _extensions"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Show a dialog after Midori crashed"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Discard old tabs"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Show last crash _log"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Run in _debugger"
+
+#: ../midori/midori-frontend.c:461
+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/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Bookmarks could not be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "The session couldn't be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "The trash could not be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "The history could not be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "The following errors occurred:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignore"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Could not open database of extenstion: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Do you really want to delete all cookie permissions?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Delete all cookie permissions?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Cookie permission manager"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instance of current cookie permission manager"
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Configure cookie permission"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Error in cookie permission manager extension"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr "Could not determine global cookie policy to set for domain: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Till session end"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "The website %s wants to store %d cookies."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "The website %s wants to store a cookie."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Multiple websites want to store %d cookies in total."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Accept"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Accept for this _session"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "De_ny"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Deny _this time"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Path"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Value"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Expire date"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie Security Manager"
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Manage cookie permission per site"
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Failed to fetch application icon in %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Launcher created"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "You can now run <b>%s</b> from your launcher or menu"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Error creating launcher"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applications"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "New _Profile"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Creates a new, independant profile and a launcher"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "New _App"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Creates a new app for a specific site"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Error launching"
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Create _Launcher"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Web App Manager"
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Manage websites installed as applications"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transfers"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Clear All"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Open Destination _Folder"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copy Link Loc_ation"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "The file '<b>%s</b>' has been downloaded."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' and %d other files have been downloaded."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transfer completed"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Some files are being downloaded"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Quit Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "The transfers will be cancelled if Midori quits."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Transfer Manager"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "View downloaded files"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Advertisement blocker"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Block advertisements according to a filter list"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configure Advertisement filters"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_ock image"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_ock link"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Edit rule"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Rule:"
index f7151ce43ef26ca25f092970084daa82ed7764a9..54a9b605d4fdf6b3325714b914a9ed589d1a2230 100644 (file)
 # This file is distributed under the same license as the midori package.
 # Bastien Nocera <hadess@hadess.net> 2008
 # Abigail Brady <morwen@evilmagic.org> 2008
-# 
+#
 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"
-"PO-Revision-Date: 2010-01-24 14:14+1100\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-09-06 13:12+0000\n"
+"Last-Translator: Alfredo Hernández <Unknown>\n"
 "Language-Team: British English <en_GB@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/midori.desktop.in.h:1
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web Browser"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Browser"
+
+#: ../data/midori.desktop.in.h:4
 msgid "Browse the Web"
 msgstr "Browse the Web"
 
-#: ../data/midori.desktop.in.h:2
+#: ../data/midori.desktop.in.h:5
 msgid "Internet;WWW;Explorer"
 msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "New Tab"
 
-#: ../data/midori.desktop.in.h:4
-msgid "Web Browser"
-msgstr "Web Browser"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "New Window"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "New Private Browsing Window"
 
 #: ../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
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Private Browsing"
 
-#: ../midori/main.c:96 ../midori/main.c:102
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "The configuration couldn't be loaded: %s\n"
-
-#: ../midori/main.c:150
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Value '%s' is invalid for %s"
-
-#: ../midori/main.c:155 ../midori/main.c:259
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Invalid configuration value '%s'"
-
-#: ../midori/main.c:380
-#, 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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Failed to remove history item: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "The bookmarks couldn't be saved. %s"
-
-#: ../midori/main.c:633
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "The configuration couldn't be saved. %s"
-
-#: ../midori/main.c:668
-#, 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
-#, 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
-#, 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: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:1134
-msgid "Modify _preferences"
-msgstr "Modify _preferences"
-
-#: ../midori/main.c:1138
-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
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "The session couldn't be loaded: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Open a new private browsing window"
 
-#: ../midori/main.c:1538
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Snapshot saved to: %s\n"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Run ADDRESS as a web application"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Use FOLDER as configuration folder"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1957
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Private browsing, no changes are saved"
 
-#: ../midori/main.c:1959
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Portable mode, all runtime files are stored in one place"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Plain GTK+ window with WebKit, akin to GtkLauncher"
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Show a diagnostic dialogue"
 
-#: ../midori/main.c:1961
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Run within gdb and save a backtrace on crash"
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Run the specified filename as javascript"
 
-#: ../midori/main.c:1963
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Take a snapshot of the specified URI"
 
-#: ../midori/main.c:1965
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Execute the specified command"
 
-#: ../midori/main.c:1967
+#: ../midori/main.c:101
 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:103
 msgid "Display program version"
 msgstr "Display program version"
 
-#: ../midori/main.c:1971
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Addresses"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Block URIs according to regular expression PATTERN"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Reset Midori after SECONDS seconds of inactivity"
 
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:1980
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Redirects console warnings to the specified FILENAME"
-
-#: ../midori/main.c:1980
-msgid "FILENAME"
-msgstr "FILENAME"
-
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Addresses]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Error: 'gdb' can't be found\n"
 
-#: ../midori/main.c:2087
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Please report comments, suggestions and bugs to:"
 
-#: ../midori/main.c:2089
+#: ../midori/main.c:164
 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:2175
-msgid "Cookies and Website data"
-msgstr "Cookies and Website data"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "Web Cache"
-
-#: ../midori/main.c:2182
-msgid "Website icons"
-msgstr "Website icons"
-
-#: ../midori/main.c:2288
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr "An unknown error occured"
-
-#: ../midori/main.c:2395
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "An instance of Midori is already running but not responding.\n"
-
-#: ../midori/main.c:2431
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Bookmarks couldn't be loaded: %s\n"
-
-#: ../midori/main.c:2479
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "The wastebasket couldn't be loaded: %s\n"
-
-#: ../midori/main.c:2492
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "The history couldn't be loaded: %s\n"
-
-#: ../midori/main.c:2508
-msgid "The following errors occured:"
-msgstr "The following errors occured:"
-
-#: ../midori/main.c:2524
-msgid "_Ignore"
-msgstr "_Ignore"
-
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Bookmark"
+msgstr "An unknown error occurred"
 
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
 
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Add Boo_kmark"
 
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Console"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensions"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_History"
 
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Homepage"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Userscripts"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "User_styles"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "New _Tab"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transfers"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape p_lugins"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Closed Tabs"
 
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "New _Folder"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Addresses]"
+
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Malformed document."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Unrecognised bookmark format."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Writing failed."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Go forward to the next page"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Go to the next sub-page"
 
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Web Search…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Reload the current page"
 
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stop loading the current page"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Value '%s' is invalid for %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Unexpected setting '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Unexpected action '%s'."
 
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Private Browsing)"
 
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Toplevel folder"
-
-#: ../midori/midori-browser.c:774
-msgid "New folder"
-msgstr "New folder"
-
-#: ../midori/midori-browser.c:774
-msgid "Edit folder"
-msgstr "Edit folder"
-
-#: ../midori/midori-browser.c:776
-msgid "New bookmark"
-msgstr "New bookmark"
-
-#: ../midori/midori-browser.c:776
-msgid "Edit bookmark"
-msgstr "Edit bookmark"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Failed to insert new history item: %s\n"
 
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Title:"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Select [text]"
 
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Address:"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bookmarks"
 
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Folder:"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "New Folder"
 
-#: ../midori/midori-browser.c:877
-msgid "Add to _Speed Dial"
-msgstr "Add to _Speed Dial"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Edit Folder"
 
-#: ../midori/midori-browser.c:890
-msgid "Show in the tool_bar"
-msgstr "Show in the tool_bar"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "New Bookmark"
 
-#: ../midori/midori-browser.c:905
-msgid "Run as _web application"
-msgstr "Run as _web application"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Edit Bookmark"
 
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "The file \"%s\" can't be saved in this folder."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Type a name for this bookmark, and choose where to keep it."
 
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "You don't have permission to write in this location."
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Type a name for this folder, and choose where to keep it."
 
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "There is not enough free space to download \"%s\"."
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Show in Bookmarks _Bar"
 
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "The file needs %s but only %s are left."
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Add to _Speed Dial"
 
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Save file as"
 
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "New Window"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Save associated _resources"
 
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1608
 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
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "A new tab has been opened"
 
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Error opening the image!"
 
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1630
 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
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Error downloading the image!"
 
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Can not download selected image."
 
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Save file"
 
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Reload page without caching"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Open file"
 
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2692
 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,145 +377,130 @@ msgid ""
 "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 labelled 'New Subscription', 'New News Feed' or similar. "
+"Alternatively, you can 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:2698 ../extensions/feed-panel/main.c:350
 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:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Add a new bookmark"
 
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Empty"
 
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Toggle text cursor navigation"
 
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Failed to insert new history item: %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
 
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Enable Caret Browsing"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Open in New _Window"
 
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4239
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Import bookmarks…"
 
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Import bookmarks"
 
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Application:"
 
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Import from XBEL or HTML file"
 
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Import from a file"
 
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Failed to import bookmarks"
 
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL Bookmarks"
 
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape Bookmarks"
 
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4546
 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:4558
 msgid "Failed to export bookmarks"
 msgstr "Failed to export bookmarks"
 
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
-msgid "Clear Private Data"
-msgstr "Clear Private Data"
-
-#: ../midori/midori-browser.c:4560
-msgid "_Clear private data"
-msgstr "_Clear private data"
-
-#: ../midori/midori-browser.c:4573
-msgid "Clear the following data:"
-msgstr "Clear the following data:"
-
-#: ../midori/midori-browser.c:4583
-msgid "Last open _tabs"
-msgstr "Last open _tabs"
-
-#: ../midori/midori-browser.c:4609
-msgid "Clear private data when _quitting Midori"
-msgstr "Clear private data when _quitting Midori"
-
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "A lightweight web browser."
 
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "See about:version for version info."
 
-#: ../midori/midori-browser.c:4807
+#: ../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 "
@@ -675,1526 +512,1501 @@ msgstr ""
 "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:4780
 msgid "translator-credits"
 msgstr ""
 "Bastien Nocera <hadess@hadess.net>\n"
-"Abigail Brady <morwen@evilmagic.org>"
+"Abigail Brady <morwen@evilmagic.org>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Alfredo Hernández https://launchpad.net/~aldomann\n"
+"  Andi Chandler https://launchpad.net/~bing\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
+"  Chris Hills https://launchpad.net/~chaz-chaz6\n"
+"  Jeff Bailes https://launchpad.net/~thepizzaking\n"
+"  Marcus Lundgren https://launchpad.net/~marcus-lundgren\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicate Current Tab"
 
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_File"
 
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Open a new window"
 
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Open a new tab"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "New P_rivate Browsing Window"
 
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Open a file"
 
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Save Page As…"
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Save to a file"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Add to Speed _dial"
 
-#: ../midori/midori-browser.c:5235
-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:5241
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Subscribe to News _feed"
 
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Close Tab"
 
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Close the current tab"
 
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "C_lose Window"
 
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Print the current page"
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Close a_ll Windows"
 
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Find…"
 
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configure the application preferences"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_View"
 
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5141
 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:5156
 msgid "Increase the zoom level"
 msgstr "Increase the zoom level"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Decrease the zoom level"
 
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Encoding"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "View So_urce"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "View _DOM Source"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Ca_ret Browsing"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Toggle fullscreen view"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Scroll _Left"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Scroll _Down"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Scroll _Up"
 
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Scroll _Right"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Readable"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Go"
 
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Go back to the previous page"
 
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Go forward to the next page"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Go to the next sub-page"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Next or Forward"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Go to the next sub-page or next page in history"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Homepage"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Go to your homepage"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
-msgstr "Empty Wastebasket"
+msgstr "Empty Bin"
 
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Undo _Close Tab"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Add a new _folder"
 
-#: ../midori/midori-browser.c:5375
-msgid "_Export bookmarks"
-msgstr "_Export bookmarks"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Import bookmarks…"
 
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Manage Search Engines"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Export bookmarks…"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Manage Search Engines…"
 
-#: ../midori/midori-browser.c:5381
-msgid "_Clear Private Data"
-msgstr "_Clear Private Data"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Clear Private Data"
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspect Page"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Previous Tab"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Move Tab to _first position"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Move Tab _Backwards"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Move Tab Forwards"
 
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Move Tab to _last position"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Focus _Current Tab"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Focus _Next view"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Only show the Icon of the _Current Tab"
 
-#: ../midori/midori-browser.c:5407
-msgid "_Duplicate Current Tab"
-msgstr "_Duplicate Current Tab"
-
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Close Ot_her Tabs"
 
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Open last _session"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Help"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Frequent Questions"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Report a Problem…"
 
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Tools"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menubar"
 
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigationbar"
 
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Side_panel"
 
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Sidepanel"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Bookmarkbar"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusbar"
 
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatic"
 
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinese (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinese Traditional (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinese Simplified (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japanese (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russian (KOI8-R)"
 
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Custom…"
 
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Failed to initialise history: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separator"
 
-#: ../midori/midori-browser.c:5992
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Location…"
 
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Open a particular location"
 
-#: ../midori/midori-browser.c:6016
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Web Search…"
 
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Run a web search"
 
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Show the saved bookmarks"
 
-#: ../midori/midori-browser.c:6079
-msgid "_Tools"
-msgstr "_Tools"
-
-#: ../midori/midori-browser.c:6095
-msgid "_Window"
-msgstr "_Window"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tabs"
 
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:5939
 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:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
-#: ../midori/midori-browser.c:6927
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Unexpected setting '%s'"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "Export certificate"
 
-#: ../midori/midori-locationaction.c:412
-msgid "Search with…"
-msgstr "Search with…"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "The signing certificate authority is not known."
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Failed to select from history\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"The certificate does not match the expected identity of the site from which "
+"it was retrieved."
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "Search for %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "The certificate's activation time is still in the future."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "The certificate has expired"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "The certificate's algorithm is considered insecure."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Some other error occurred validating the certificate."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Export certificate"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Self-signed"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Security details"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Paste and p_roceed"
 
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Not verified"
 
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Verified and encrypted connection"
 
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1814
 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
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 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:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Close panel"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Align sidepanel to the left"
 
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Show Speed Dial"
 
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Show Homepage"
 
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Show last open tabs"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Show last tabs without loading"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Show Blank Page"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Show default Search Engine"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Show custom page"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanese (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "New tab"
 
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "New window"
 
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Current tab"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Default"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Icons"
 
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Small icons"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Icons and text"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text beside icons"
 
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatic (GNOME or environment)"
 
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP proxy server"
 
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "No proxy server"
 
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Remember last window size"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "The style of the toolbar"
 
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Whether to save the last window size"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Always use my font choices"
 
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Last window width"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Override fonts picked by websites with user preferences"
 
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "The last saved window width"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "The configuration couldn't be loaded: %s\n"
 
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Last window height"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Invalid configuration value '%s'"
 
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "The last saved window height"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Failed to inject stylesheet: %s"
 
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Last panel position"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Show Tab _Label"
 
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "The last saved panel position"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Show Tab _Icon Only"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Last panel page"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Close Tab to the R_ight"
+msgstr[1] "Close Tabs to the R_ight"
 
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "The last saved panel page"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Close Ot_her Tab"
+msgstr[1] "Close Ot_her Tabs"
 
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Last Web search"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Trust this website"
 
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "The last saved Web search"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Security unknown"
 
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Show Menubar"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s wants to save an HTML5 database."
 
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Whether to show the menubar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Deny"
 
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Show Navigationbar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Allow"
 
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Whether to show the navigationbar"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s wants to know your location."
 
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Show Bookmarkbar"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' can't be found"
 
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Whether to show the bookmarkbar"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "The page '%s' couldn't be loaded:"
 
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Show Panel"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Check the address for typos"
 
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Whether to show the panel"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
 
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Show Statusbar"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verify that your network settings are correct"
 
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Whether to show the statusbar"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Try Again"
 
-#: ../midori/midori-websettings.c:519
-msgid "Toolbar Style:"
-msgstr "Toolbar Style:"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Oops - %s"
 
-#: ../midori/midori-websettings.c:520
-msgid "The style of the toolbar"
-msgstr "The style of the toolbar"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Something went wrong with '%s'."
 
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Toolbar Items"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Try again"
 
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "The items to show on the toolbar"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Send a message to %s"
 
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Compact Sidepanel"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Add _search engine..."
 
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Whether to make the sidepanel compact"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Open _Link"
 
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Align sidepanel on the right"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Open Link in New _Tab"
 
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Whether to align the sidepanel on the right"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Open Link in _Foreground Tab"
 
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Open panels in separate windows"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Open Link in _Background Tab"
 
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Whether to always open panels in separate windows"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Open Link in New _Window"
 
-#: ../midori/midori-websettings.c:580
-msgid "When Midori starts:"
-msgstr "When Midori starts:"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Copy Link de_stination"
 
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "What to do when Midori starts"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Save _As…"
 
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Open _Image in New Window"
 
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "The homepage"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Open _Image in New Tab"
 
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Show crash dialogue"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Copy Im_age"
 
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Show a dialogue after Midori crashed"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Save I_mage"
 
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Save downloaded files to:"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Open in Image _Viewer"
 
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "The folder downloaded files are saved to"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Copy Video _Address"
 
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Text Editor"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Download _Video"
 
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "An external text editor"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Open Address in New _Tab"
 
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "News Aggregator"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Search _with"
 
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "An external news aggregator"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Search the Web"
 
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Location entry Search"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Open _Frame in New Tab"
 
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "The search to perform inside the location entry"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspect _Element"
 
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "Preferred Encoding"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Open or download file from %s"
 
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "The preferred character encoding"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "File Name: %s"
 
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Always Show Tabbar"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "File Type: '%s'"
 
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Always show the tabbar"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "File Type: %s ('%s')"
 
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Close Buttons on Tabs"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Size: %s"
 
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Whether tabs have close buttons"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Open %s"
 
-#: ../midori/midori-websettings.c:709
-msgid "Open new pages in:"
-msgstr "Open new pages in:"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspect page - %s"
 
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Where to open new pages"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori doesn't store any personal data:"
 
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Middle click opens Selection"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "No history or web cookies are being saved."
 
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Load an address from the selection via middle click"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Extensions are disabled."
 
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Open tabs in the background"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "HTML5 storage, local database and application caches are disabled."
 
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Whether to open new tabs in the background"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori prevents websites from tracking the user:"
 
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Open Tabs next to Current"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Referrer URLs are stripped down to the hostname."
 
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS prefetching is disabled."
 
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Open popups in tabs"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "The language and timezone are not revealed to websites."
 
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Whether to open popup windows in tabs"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "Flash and other Netscape plugins cannot be listed by websites."
 
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Load images automatically"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr "Version numbers in brackets show the version used at runtime."
 
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Load and display images automatically"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Page loading delayed:"
 
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Enable scripts"
+#: ../midori/midori-view.c:4000
+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-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Enable embedded scripting languages"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Load Page"
 
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Enable Netscape plugins"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Blank page"
 
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Enable embedded Netscape plugin objects"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "previous"
 
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Enable Spell Checking"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "next"
 
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Enable spell checking while typing"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Print background images"
 
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Enable HTML5 database support"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Whether background images should be printed"
 
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Whether to enable HTML5 database support"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Features"
 
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Enable HTML5 local storage support"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s of %s"
 
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Whether to enable HTML5 local storage support"
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
 
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Enable offline web application cache"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
 
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Whether to enable offline web application cache"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
 
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Flash window on background tabs"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Flash the browser window if a new tab was opened in the background"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Enable WebGL support"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Allow websites to use OpenGL rendering"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Zoom Text and Images"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Whether to zoom text and images"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Find inline while typing"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Whether to automatically find inline while typing"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Kinetic scrolling"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Whether scrolling should kinetically move according to speed"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Delete old Cookies after:"
-
-#: ../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:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Only accept Cookies from sites you visit"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Block cookies sent by third-party websites"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Delete pages from history after:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "The maximum number of days to save the history for"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Proxy server"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "The type of proxy server to use"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "HTTP Proxy Server"
-
-#: ../midori/midori-websettings.c:963
-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
-msgid "Identify as"
-msgstr "Identify as"
-
-#: ../midori/midori-websettings.c:1015
-msgid "What to identify as to web pages"
-msgstr "What to identify as to web pages"
-
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Identification string"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "The application identification string"
-
-#: ../midori/midori-websettings.c:1048
-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:1064
-msgid "Clear private data"
-msgstr "Clear private data"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "The private data selected for deletion"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Clear data"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "The data selected for deletion"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Strip referrer details sent to websites"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Whether the \"Referer\" header should be shortened to the hostname"
-
-#: ../midori/midori-websettings.c:1146
-msgid "Always use my font choices"
-msgstr "Always use my font choices"
-
-#: ../midori/midori-websettings.c:1147
-msgid "Override fonts picked by websites with user preferences"
-msgstr "Override fonts picked by websites with user preferences"
-
-#: ../midori/midori-view.c:1360
-#, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "%s wants to save an HTML5 database."
-
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Deny"
-msgstr "_Deny"
-
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Allow"
-msgstr "_Allow"
-
-#: ../midori/midori-view.c:1392
-#, c-format
-msgid "%s wants to know your location."
-msgstr "%s wants to know your location."
-
-#: ../midori/midori-view.c:1485
-#, c-format
-msgid "Error - %s"
-msgstr "Error - %s"
-
-#: ../midori/midori-view.c:1486
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "The page '%s' couldn't be loaded."
+msgid " - %s remaining"
+msgstr " - %s remaining"
 
-#: ../midori/midori-view.c:1488
-msgid "Try again"
-msgstr "Try again"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
 #, c-format
-msgid "Send a message to %s"
-msgstr "Send a message to %s"
-
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
-msgid "Inspect _Element"
-msgstr "Inspect _Element"
-
-#: ../midori/midori-view.c:2480
-msgid "Open Link in New _Tab"
-msgstr "Open Link in New _Tab"
-
-#: ../midori/midori-view.c:2484
-msgid "Open Link in _Foreground Tab"
-msgstr "Open Link in _Foreground Tab"
-
-#: ../midori/midori-view.c:2485
-msgid "Open Link in _Background Tab"
-msgstr "Open Link in _Background Tab"
-
-#: ../midori/midori-view.c:2488
-msgid "Open Link in New _Window"
-msgstr "Open Link in New _Window"
-
-#: ../midori/midori-view.c:2491
-msgid "Open Link as Web A_pplication"
-msgstr "Open Link as Web A_pplication"
-
-#: ../midori/midori-view.c:2496
-msgid "Copy Link de_stination"
-msgstr "Copy Link de_stination"
-
-#: ../midori/midori-view.c:2512
-msgid "Open _Image in New Tab"
-msgstr "Open _Image in New Tab"
-
-#: ../midori/midori-view.c:2515
-msgid "Copy Image _Address"
-msgstr "Copy Image _Address"
-
-#: ../midori/midori-view.c:2518
-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:2528
-msgid "Copy Video _Address"
-msgstr "Copy Video _Address"
-
-#: ../midori/midori-view.c:2531
-msgid "Save _Video"
-msgstr "Save _Video"
-
-#: ../midori/midori-view.c:2531
-msgid "Download _Video"
-msgstr "Download _Video"
-
-#: ../midori/midori-view.c:2557
-msgid "Search _with"
-msgstr "Search _with"
-
-#: ../midori/midori-view.c:2589
-msgid "_Search the Web"
-msgstr "_Search the Web"
-
-#: ../midori/midori-view.c:2606
-msgid "Open Address in New _Tab"
-msgstr "Open Address in New _Tab"
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Open or download file"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "The downloaded file is erroneous."
 
-#: ../midori/midori-view.c:2929
-#, c-format
-msgid "File Type: '%s'"
-msgstr "File Type: '%s'"
+#: ../midori/midori-download.vala:221
+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."
 
-#: ../midori/midori-view.c:2931
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "File Type: %s ('%s')"
-msgstr "File Type: %s ('%s')"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "The file '%s' can't be saved in this folder."
 
-#: ../midori/midori-view.c:2935
-#, c-format
-msgid "File Name: %s"
-msgstr "File Name: %s"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "You don't have permission to write in this location."
 
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "Open %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr "There is not enough free space to download '%s'."
 
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Inspect page - %s"
+msgid "The file needs %s but only %s are left."
+msgstr "The file needs %s but only %s are left."
 
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Speed Dial"
 
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Click to add a shortcut"
 
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Enter shortcut address"
 
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Enter shortcut title"
 
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-speeddial.vala:192
 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:4167
-msgid "Extensions are disabled."
-msgstr "Extensions are disabled."
-
-#: ../midori/midori-view.c:4168
-msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "HTML5 storage, local database and application caches are disabled."
-
-#: ../midori/midori-view.c:4169
-msgid "Midori prevents websites from tracking the user:"
-msgstr "Midori prevents websites from tracking the user:"
-
-#: ../midori/midori-view.c:4170
-msgid "Referrer URLs are stripped down to the hostname."
-msgstr "Referrer URLs are stripped down to the hostname."
-
-#: ../midori/midori-view.c:4171
-msgid "DNS prefetching is disabled."
-msgstr "DNS prefetching is disabled."
-
-#: ../midori/midori-view.c:4172
-msgid "The language and timezone are not revealed to websites."
-msgstr "The language and timezone are not revealed to websites."
-
-#: ../midori/midori-view.c:4173
-msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Flash and other Netscape plugins cannot be listed by websites."
-
-#: ../midori/midori-view.c:4222
-msgid "Version numbers in brackets show the version used at runtime."
-msgstr "Version numbers in brackets show the version used at runtime."
-
-#: ../midori/midori-view.c:4278
-msgid "Page loading delayed"
-msgstr "Page loading delayed"
-
-#: ../midori/midori-view.c:4279
-msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "Loading delayed either due to a recent crash or startup preferences."
-
-#: ../midori/midori-view.c:4280
-msgid "Load Page"
-msgstr "Load Page"
-
-#: ../midori/midori-view.c:4446
-msgid "Blank page"
-msgstr "Blank page"
-
-#: ../midori/midori-view.c:4708
-msgid "_Duplicate Tab"
-msgstr "_Duplicate Tab"
-
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Label"
-msgstr "Show Tab _Label"
-
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Icon Only"
-msgstr "Show Tab _Icon Only"
-
-#: ../midori/midori-view.c:4719
-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
-msgid "Print background images"
-msgstr "Print background images"
-
-#: ../midori/midori-view.c:5565
-msgid "Whether background images should be printed"
-msgstr "Whether background images should be printed"
-
-#: ../midori/midori-view.c:5597
-msgid "Features"
-msgstr "Features"
-
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Startup"
 
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "When Midori starts:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Use _current page"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Use current page as homepage"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proportional Font Family"
 
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Fixed-width Font Family"
 
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Minimum Font Size"
 
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "The minimum font size used to display text"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Preferred Encoding"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Behaviour"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Load images automatically"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Enable Spell Checking"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Enable scripts"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Enable WebGL support"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom Text and Images"
+
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Allow scripts to open popups"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Whether scripts are allowed to open popup windows automatically"
 
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Default Zoom Level"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Initial factor to enlarge newly opened tabs by"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Preferred languages"
+
+#: ../midori/midori-preferences.c:426
+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 preferred languages for rendering multilingual "
+"webpages, for example 'de', 'ru,nl' or 'en-us;q=1.0, fr-fr;q=0.667'"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Save downloaded files to:"
+
 #. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Browsing"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Theme:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Toolbar Style:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Open new pages in:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "New tab behaviour:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Close Buttons on Tabs"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Open Tabs next to Current"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Open tabs in the background"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Text Editor"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "News Aggregator"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Network"
 
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Hostname"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxy server"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Supported proxy types:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Web Cache"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "The maximum size of cached pages on disk"
+
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:902
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identify as"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privacy"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Delete old Cookies after:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "The maximum number of days to save cookies for"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Only accept Cookies from sites you visit"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Block cookies sent by third-party websites"
+
+#: ../midori/midori-preferences.c:599
+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:606
+msgid "Enable offline web application cache"
+msgstr "Enable offline web application cache"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Enable HTML5 local storage support"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Whether the 'Referer' header should be shortened to the hostname"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Delete pages from history after:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "The maximum number of days to save the history for"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Extensions"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Manage Search Engines"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Add search engine"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Edit search engine"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Icon:"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Address:"
 
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Token:"
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Manage Search Engines"
 
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Use as _default"
 
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Open with"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "The search engines couldn't be loaded. %s\n"
 
-#: ../midori/sokoke.c:362
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Choose an application or command to open \"%s\":"
+msgid "The search engines couldn't be saved. %s"
+msgstr "The search engines couldn't be saved. %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/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bookmarks and History"
 
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
+msgid "Search for %s"
+msgstr "Search for %s"
 
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
+msgid "Failed to select from history: %s"
+msgstr "Failed to select from history: %s"
 
-#: ../midori/sokoke.c:1597
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Search with…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s of %s"
+msgid "Search with %s"
+msgstr "Search with %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Open with"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Choose an application or command to open '%s':"
 
-#. 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:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Could not run external program."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Invalid URI"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "_Inline Find:"
 
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Previous"
 
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Next"
 
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Match Case"
 
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Highlight Matches"
-
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Close Findbar"
 
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "The file '<b>%s</b>' has been downloaded."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d bookmark"
+msgstr[1] "%d bookmarks"
 
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Transfer completed"
-
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "The downloaded file is erroneous."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subfolder"
+msgstr[1] "%d subfolders"
 
-#: ../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."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Empty folder"
 
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "Clear All"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Folder containing %s and no bookmark"
 
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
-msgid "Some files are being downloaded"
-msgstr "Some files are being downloaded"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Folder containing %s"
 
-#: ../toolbars/midori-transferbar.c:377
-msgid "_Quit Midori"
-msgstr "_Quit Midori"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Folder containing %s and %s"
 
-#: ../toolbars/midori-transferbar.c:379
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "The transfers will be cancelled if Midori quits."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bookmark leading to: %s"
 
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Bookmarks"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s and no bookmark"
 
-#: ../panels/midori-bookmarks.c:257
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Failed to add bookmark item: %s\n"
+msgid "%s and %s"
+msgstr "%s and %s"
 
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Edit the selected bookmark"
 
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Delete the selected bookmark"
 
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Add a new folder"
 
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Open in New _Tab"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Search Bookmarks"
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "History"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Today"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "A week ago"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Failed to remove history item: %s\n"
+
+#: ../panels/midori-history.c:312
 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:358
 msgid "Bookmark the selected history item"
 msgstr "Bookmark the selected history item"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Delete the selected history item"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Clear the entire history"
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
-msgstr "Transfers"
-
-#: ../panels/midori-transfers.c:469
-msgid "Open Destination _Folder"
-msgstr "Open Destination _Folder"
-
-#: ../panels/midori-transfers.c:472
-msgid "Copy Link Loc_ation"
-msgstr "Copy Link Loc_ation"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Search History"
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2220,187 +2032,149 @@ msgstr "Password"
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Named icon '%s' couldn't be loaded"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Stock icon '%s' couldn't be loaded"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Animation frames are broken"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "None"
 
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:529
 #, 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
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Choose file"
 
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Choose folder"
 
-#: ../katze/katze-utils.c:610
-msgid "None"
-msgstr "None"
-
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hour"
 
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 day"
 
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 week"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 month"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 year"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
-msgstr "Preferences for %s"
-
-#: ../extensions/adblock.c:473
-msgid "Configure Advertisement filters"
-msgstr "Configure Advertisement filters"
-
-#: ../extensions/adblock.c:504
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"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
-msgid "Edit rule"
-msgstr "Edit rule"
-
-#: ../extensions/adblock.c:896
-msgid "_Rule:"
-msgstr "_Rule:"
-
-#: ../extensions/adblock.c:950
-msgid "Bl_ock image"
-msgstr "Bl_ock image"
-
-#: ../extensions/adblock.c:955
-msgid "Bl_ock link"
-msgstr "Bl_ock link"
+msgstr "Preferences for %s"
 
-#: ../extensions/adblock.c:1670
-msgid "Advertisement blocker"
-msgstr "Advertisement blocker"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
 
-#: ../extensions/adblock.c:1671
-msgid "Block advertisements according to a filter list"
-msgstr "Block advertisements according to a filter list"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
 
 #. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "This page appears to contain a user script. Do you wish to install it?"
-
 #: ../extensions/addons.c:222
+msgid ""
+"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:223
 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:228
 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?"
+msgstr ""
+"This page appears to contain a user style. Do you wish to install it?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Install user style"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Don't install"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Userscripts"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Userstyles"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Error"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Do you want to delete '%s'?"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Delete user script"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Delete user style"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "The file <b>%s</b> will be permanently deleted."
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Open in Text Editor"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Open Target Folder"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Add new addon"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Remove selected addon"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "User addons"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Can't monitor folder '%s': %s"
 
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Support for userscripts and userstyles"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Colourful Tabs"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Tint each tab distinctly"
 
@@ -2409,11 +2183,11 @@ msgstr "Tint each tab distinctly"
 msgid "Cookie Manager"
 msgstr "Cookie Manager"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Delete All"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2421,31 +2195,31 @@ 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:116
 msgid "Expand All"
 msgstr "Expand All"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Collapse All"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Question"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 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:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2462,15 +2236,16 @@ msgstr ""
 "<b>Secure</b>: %s\n"
 "<b>Expires</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Yes"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "No"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2479,74 +2254,137 @@ msgstr ""
 "<b>Domain</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Name"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expand All"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Collapse All"
 
-#: ../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 ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Search Cookies by Name or Domain"
 
 #: ../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"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Delayed load"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Delay page load until you actually use the tab."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Double click for more information"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "This extension shows glib error messages in systray."
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "External Download Manager - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Download files with Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "External Download Manager - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Download files with SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Command:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Download files with '%s' or a custom command"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "External Download Manager - CommandLine"
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "Failed to find required Atom 'entry' elements in XML data."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "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:367
 #, 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:620
 msgid "Feeds"
 msgstr "Feeds"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Add new feed"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Delete feed"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Feeds"
 
@@ -2555,60 +2393,60 @@ msgstr "_Feeds"
 msgid "Failed to find root element in feed XML data."
 msgstr "Failed to find root element in feed XML data."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Unsupported feed format."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Failed to parse XML feed: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "Failed to find \"channel\" element in RSS XML data."
+msgstr "Failed to find 'channel' element in RSS XML data."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Unsupported RSS version found."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Failed to find required RSS 'item' elements in XML data."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Failed to find required RSS 'channel' elements in XML data."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Feed '%s' already exists"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Error loading feed '%s'"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Feed Panel"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Read Atom/ RSS feeds"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "Failed to add form value: %s\n"
 
-#: ../extensions/formhistory/formhistory.c:95
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "Form history"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
@@ -2616,116 +2454,409 @@ msgstr ""
 "A username and a password are required\n"
 "to open this location:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Remember password on this page?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Remember"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Not now"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Never for this page"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Toggle form history state"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Activate or deactivate form history for the current tab."
 
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Failed to execute database statement: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:629
+#: ../extensions/formhistory/formhistory.c:598
 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
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Form history filler"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 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/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Failed to select suggestions\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "There are no unvisited tabs"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "History-List"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Tab closing behaviour"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Switch to last viewed tab"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Switch to newest tab"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Flash window on background tabs"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Next new Tab (History List)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Next new tab from history"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Previous new Tab (History List)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Previous new tab from history"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Display tab in background (History List)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 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:648
 msgid "History List"
 msgstr "History List"
 
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Move to the last used tab when switching or closing tabs"
 
-#: ../extensions/mouse-gestures.c:301
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL fails: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Accept"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Accept for session"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Block"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Could not open database of extension: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Failed to execute database statement: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Do you really want to delete all JavaScript permissions?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Delete all JavaScript permissions?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Manager instance"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instance to global NoJS manager"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configure NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domain"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Policy"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Delete _all"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "A_llow scripts at all sites"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Bloc_k scripts at unknown domains by default"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "S_et permissions on second-level domain"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Deny %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Allow %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Allow %s this session"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Browser window"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "The Midori browser instance this view belongs to"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "View"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "The Midori view instance this view belongs to"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Menu icon state"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "State of menu icon to show in status bar"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Undetermined"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Allowed"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mixed"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Denied"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Error in NoJS extension"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Reason"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Could not create configuration folder for extension: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Could not create configuration folder for extension."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Could not open database of extension."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Could not set up database structure of extension."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Extension instance"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "The Midori extension instance for this extension"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Application instance"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "The Midori application instance this extension belongs to"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Database instance"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Pointer to sqlite database instance used by this extension"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Database path"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Path to sqlite database instance used by this extension"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Allow all sites"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"If true this extension will not check policy for each site but allow them."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Only second level"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Unknown domain policy"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Policy to use for unknown domains."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Accept temporarily"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
-#: ../extensions/mouse-gestures.c:302
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Control Midori by moving the mouse"
 
@@ -2733,59 +2864,63 @@ msgstr "Control Midori by moving the mouse"
 msgid "Reload page or stop loading"
 msgstr "Reload page or stop loading"
 
-#: ../extensions/shortcuts.c:176
+#: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
 msgstr "Customise Keyboard shortcuts"
 
-#: ../extensions/shortcuts.c:283
+#: ../extensions/shortcuts.c:275
 msgid "Customize Sh_ortcuts…"
 msgstr "Customise Sh_ortcuts…"
 
-#: ../extensions/shortcuts.c:320
+#: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: ../extensions/shortcuts.c:321
+#: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
 msgstr "View and edit keyboard shortcuts"
 
-#: ../extensions/status-clock.c:174
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Statusbar Clock"
 
-#: ../extensions/status-clock.c:175
+#: ../extensions/status-clock.c:169
 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:152
 msgid "Images"
 msgstr "Images"
 
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
 msgid "Scripts"
 msgstr "Scripts"
 
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
 msgstr "Netscape plugins"
 
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Enable Netscape plugins"
+
+#: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Statusbar Features"
 
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
 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:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Tab Panel"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "T_ab Panel"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Show tabs in a vertical panel"
 
@@ -2797,11 +2932,11 @@ msgstr "Only Icons on Tabs by default"
 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:401
 msgid "Customize Toolbar"
 msgstr "Customise Toolbar"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2809,469 +2944,565 @@ msgstr ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Available Items"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Displayed Items"
 
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar…"
-msgstr "Customise _Toolbar…"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Customise Toolbar…"
 
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize…"
-msgstr "_Customise…"
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Toolbar Editor"
 
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Easily edit the toolbar layout"
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Cache HTTP communication on disk"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Lightweight web browser"
-
-#~ msgid "Reset the last _session"
-#~ msgstr "Reset the last _session"
-
-#~ msgid "No filename specified"
-#~ msgstr "No filename specified"
-
-#~ msgid "Cookies"
-#~ msgstr "Cookies"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'Flash' Cookies"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 _Databases"
-
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "The specified configuration folder is invalid."
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% loaded"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Don't save any private data while browsing"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Add shortcut to speed dial"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Add shortcut to the desktop"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Subscribe to this news feed"
-
-#~ msgid "Close this window"
-#~ msgstr "Close this window"
-
-#~ msgid "Quit the application"
-#~ msgstr "Quit the application"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Undo the last modification"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Redo the last modification"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Cut the selected text"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Copy the selected text"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Paste text from the clipboard"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Delete the selected text"
-
-#~ msgid "Select all text"
-#~ msgstr "Select all text"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Find the next occurrence of a word or phrase"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Find the previous occurrence of a word or phrase"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Reset the zoom level"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "View the source code of the page"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Scroll to the left"
-
-#~ msgid "Scroll down"
-#~ msgstr "Scroll down"
-
-#~ msgid "Scroll up"
-#~ msgstr "Scroll up"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Scroll to the right"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Clear Private Data"
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Delete the contents of the wastebasket"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Clear private data"
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Open the last closed tab"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Clear the following data:"
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Add a new bookmark folder"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Last open _tabs"
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Add, edit and remove search engines…"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Clear private data when _quitting Midori"
 
-#~ msgid "Clear private data…"
-#~ msgstr "Clear private data…"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Saved logins and _passwords"
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Inspect page details and access developer tools…"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies and Website data"
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Switch to the previous tab"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Website icons"
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Focus the current tab"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Open tabs"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Only show the icon of the current tab"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "More open tabs…"
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplicate the current tab"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Failed to clear history: %s\n"
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Close all tabs except the current tab"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Failed to remove old history items: %s\n"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Open the tabs saved in the last session"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Failed to add bookmark item: %s\n"
 
-#~ msgid "_Contents"
-#~ msgstr "_Contents"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Failed to update bookmark: %s\n"
 
-#~ msgid "Show the documentation"
-#~ msgstr "Show the documentation"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Failed to remove bookmark item: %s\n"
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Show the Frequently Asked Questions"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"No root certificate file is available. SSL certificates cannot be verified."
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Open Midori's bug tracker"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "The configuration couldn't be saved. %s"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Show information about the program"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "The Bin couldn't be saved. %s"
 
-#~ msgid "Show menubar"
-#~ msgstr "Show menubar"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Show navigationbar"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Modify _preferences"
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Show sidepanel"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Disable all _extensions"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Show bookmarkbar"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Show a dialogue after Midori crashed"
 
-#~ msgid "_Transferbar"
-#~ msgstr "_Transferbar"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Discard old tabs"
 
-#~ msgid "Show transferbar"
-#~ msgstr "Show transferbar"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Show last crash _log"
 
-#~ msgid "Show statusbar"
-#~ msgstr "Show statusbar"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Run in _debugger"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Failed to execute database statement\n"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "An instance of Midori is already running but not responding.\n"
 
-#~ msgid "Show Blank page"
-#~ msgstr "Show Blank page"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Bookmarks couldn't be loaded: %s\n"
 
-#~ msgid "All cookies"
-#~ msgstr "All cookies"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "The session couldn't be loaded: %s\n"
 
-#~ msgid "Session cookies"
-#~ msgstr "Session cookies"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "The Bin couldn't be loaded: %s\n"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Show Transferbar"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "The history couldn't be loaded: %s\n"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Whether to show the transferbar"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "The following errors occurred:"
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Show progress in location entry"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignore"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Whether to show loading progress in the location entry"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Could not open database of extension: %s"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Search engines in location completion"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Do you really want to delete all cookie permissions?"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Whether to show search engines in the location completion"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Delete all cookie permissions?"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Show operating controls of the panel"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"This action will delete all cookie permissions. You will once again be asked "
+"for permissions for each website you visit."
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Whether to show the operating controls of the panel"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Cookie permission manager"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Show speed dial in new tabs"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instance of current cookie permission manager"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Show speed dial in newly opened tabs"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Configure cookie permission"
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Ask for the destination folder"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Below is a list of all websites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Whether to ask for the destination folder when downloading a file"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Policy for cookies from domains not in the list: "
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Whether to show a notification when a transfer has been completed"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Ask for a decision"
 
-#~ msgid "Download Manager"
-#~ msgstr "Download Manager"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension from continuing. You should disable it."
 
-#~ msgid "An external download manager"
-#~ msgstr "An external download manager"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Error in cookie permission manager extension"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Open external pages in:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr "Could not determine global cookie policy to set for domain: %s"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Where to open externally opened pages"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Until session end"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Accept cookies"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "The website %s wants to store %d cookies."
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "What type of cookies to accept"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "The website %s wants to store a cookie."
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maximum cookie age"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Multiple websites want to store %d cookies in total."
 
-#~ msgid "Maximum history age"
-#~ msgstr "Maximum history age"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Accept"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Remember last downloaded files"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Accept for this _session"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Whether the last downloaded files are saved"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "De_ny"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Not found - %s"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Deny _this time"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Save Link destination"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Path"
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Download Link destination"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Value"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Download with Download _Manager"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Expiry date"
 
-#~ msgid "Download I_mage"
-#~ msgstr "Download I_mage"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Set number of columns and rows"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie Security Manager"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Enter number of columns and rows:"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Manage cookie permission per site"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Invalid input for the size of the speed dial"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Failed to fetch application icon in %s: %s"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Thumb size:"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Small"
-#~ msgstr "Small"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Failed to create new launcher (%s): %s"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Launcher created"
 
-#~ msgid "Big"
-#~ msgstr "Big"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "You can now run <b>%s</b> from your launcher or menu"
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Document cannot be displayed"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Error creating launcher"
 
-#~ msgid "General"
-#~ msgstr "General"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applications"
 
-#~ msgid "Appearance"
-#~ msgstr "Appearance"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "New _Profile"
 
-#~ msgid "Font settings"
-#~ msgstr "Font settings"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Creates a new, independant profile and a launcher"
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Enforce 96 dots per inch"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "New _App"
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Enforce a video dot density of 96 DPI"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Creates a new app for a specific site"
 
-#~ msgid "Interface"
-#~ msgstr "Interface"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Error launching"
 
-#~ msgid "Navigationbar"
-#~ msgstr "Navigationbar"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Create _Launcher"
 
-#~ msgid "Applications"
-#~ msgstr "Applications"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Web App Manager"
 
-#~ msgid "External applications"
-#~ msgstr "External applications"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Manage websites installed as applications"
 
-#~ msgid "Web Cookies"
-#~ msgstr "Web Cookies"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transfers"
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Delete cookies when quitting Midori"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Clear All"
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Delete old cookies after 1 hour"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Failed to open download: %s"
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Delete old cookies after 1 week"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Open Destination _Folder"
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Delete old cookies after 1 month"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copy Link Loc_ation"
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Delete old cookies after 1 year"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "The file '<b>%s</b>' has been downloaded."
 
-#~ msgid "days"
-#~ msgstr "days"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' and %d other files have been downloaded."
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configure _Advertisement filters…"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transfer completed"
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Open target folder for selected addon"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Some files are being downloaded"
 
-#~ msgid "Not available: %s"
-#~ msgstr "Not available: %s"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Quit Midori"
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Resource files not installed"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "The transfers will be cancelled if Midori quits."
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Next Tab (History List)"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Transfer Manager"
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Previous Tab (History List)"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "View downloaded files"
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Previous tab from history"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Failed to update database: %s"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Switch tabs with Ctrl+Tab sorted by last usage"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Failed to select from database: %s"
 
-#~ msgid "Pageholder"
-#~ msgstr "Pageholder"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Failed to import legacy session: %s"
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Pageholder"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ 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/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Tab and session management."
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Failed to get current time: %s\n"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Recently visited pages"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"This extension provides a task queue for update jobs or recurring events."
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Reopen pages that you visited earlier"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Failed to add new note to database: %s\n"
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Detach chosen panel from the window"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Falied to remove note from database: %s\n"
 
-#~ msgid "Show operating _controls"
-#~ msgstr "Show operating _controls"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Falied to rename note: %s\n"
 
-#~ msgid "Original cookies only"
-#~ msgstr "Original cookies only"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Falied to update note: %s\n"
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Remember last visited pages"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notes"
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Whether the last visited pages are saved"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "New Note"
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Detect proxy server automatically"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Creates a new empty note, urelated to opened pages"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr ""
-#~ "Whether to detect the proxy server automatically from the environment"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "New note"
 
-#~ msgid "Open _Link"
-#~ msgstr "Open _Link"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Failed to select from notes database: %s\n"
 
-#~ msgid "Open Image in New Wi_ndow"
-#~ msgstr "Open Image in New Wi_ndow"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Rename note"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Restore Tab"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copy note to clipboard"
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimise Tab"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Remove note"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Spell Checking"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copy selection as note"
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Spelling dictionaries:"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Save text clips from websites as notes"
 
-#~ 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\""
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Advertisement blocker"
 
-#~ 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."
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Block advertisements according to a filter list"
 
-#~ msgid "Console"
-#~ msgstr "Console"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configure Advertisement filters"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Erroneous clock time"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_ock image"
 
-#~ 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."
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_ock link"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Cookie Manager"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Edit rule"
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Not available on this platform"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Rule:"
index 3df22e17cfa4b7bfe9d2c7ef222455ac69794731..15c51e202254e097563e8010c25f823477c77b3c 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
 # Copyright (C) 2012 Midori
 # This file is distributed under the same license as the Midori package.
 # Michael Moroni <michael.moroni@mailoo.org>, 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 <michael.moroni@mailoo.org>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:44+0000\n"
+"Last-Translator: Michael Moroni <michael.moroni@openmailbox.org>\n"
 "Language-Team: Esperanto\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-Launchpad-Export-Date: 2014-11-27 05:46+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/midori.desktop.in.h:1
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Retumilo"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Retumilo Midori"
+
+#: ../data/midori.desktop.in.h:4
 msgid "Browse the Web"
 msgstr "Retumi"
 
-#: ../data/midori.desktop.in.h:2
+#: ../data/midori.desktop.in.h:5
 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:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nova langeto"
 
-#: ../data/midori.desktop.in.h:4
-msgid "Web Browser"
-msgstr "Retumilo"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nova fenestro"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nova fenestro por privata retumado"
 
 #: ../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
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 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"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Malfermi novan fenestron por privata retumado"
 
-#: ../midori/main.c:1480
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Ekrankopio konservita ĉe: %s\n"
 
-#: ../midori/main.c:1891
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Ruli ADRESON kiel retaplikaĵo"
 
-#: ../midori/main.c:1891
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESON"
 
-#: ../midori/main.c:1894
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Uzi DOSIERUJON kiel agorddosierujon"
 
-#: ../midori/main.c:1894
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "DOSIERUJON"
 
-#: ../midori/main.c:1897
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
+msgstr "Privata retumado, neniu ŝanĝo estas konservata"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr ""
 
-#: ../midori/main.c:1899
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
+msgstr "Montri diagnozan dialogon"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
 
-#: ../midori/main.c:1901
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
-msgstr ""
+msgstr "Ruli la specifitan dosiernomon kiel Ĝavaskripto"
 
-#: ../midori/main.c:1903
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
-msgstr ""
+msgstr "Ekrankopii la specifitan URI"
 
-#: ../midori/main.c:1905
+#: ../midori/main.c:99
 msgid "Execute the specified command"
-msgstr ""
+msgstr "Ruli la specifitan komandon"
 
-#: ../midori/main.c:1907
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
-msgstr ""
+msgstr "Listigi disponeblajn komandojn ruleblajn per -e/--execute"
 
-#: ../midori/main.c:1909
+#: ../midori/main.c:103
 msgid "Display program version"
-msgstr ""
+msgstr "Montri version de programaro"
 
-#: ../midori/main.c:1911
+#: ../midori/main.c:105
 msgid "Addresses"
-msgstr ""
+msgstr "Adresoj"
 
-#: ../midori/main.c:1913
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
-msgstr ""
+msgstr "Forbari URI laŭ la regula esprimo SERĈŜABLONO"
 
-#: ../midori/main.c:1913
+#: ../midori/main.c:107
 msgid "PATTERN"
-msgstr ""
+msgstr "SERĈŜABLONO"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1917
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
+msgstr "Rekomencigi Midori post SEKUNDOJ sekundoj de neagado"
 
-#: ../midori/main.c:1917
+#: ../midori/main.c:111
 msgid "SECONDS"
-msgstr ""
-
-#: ../midori/main.c:1920
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr ""
-
-#: ../midori/main.c:1920
-msgid "FILENAME"
-msgstr ""
+msgstr "SEKUNDOJ"
 
-#: ../midori/main.c:1985
-msgid "[Addresses]"
-msgstr ""
-
-#: ../midori/main.c:1995
-msgid "The specified configuration folder is invalid."
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
 msgstr ""
 
-#: ../midori/main.c:2023
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
-msgstr ""
+msgstr "Bonvole raportu komentojn, sugestojn kaj cimojn ĉe:"
 
-#: ../midori/main.c:2025
+#: ../midori/main.c:164
 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 ""
+msgstr "Kontrolu pri novaj versioj ĉe:"
 
-#: ../midori/main.c:2224
+#: ../midori/main.c:358
 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"
+msgstr "Nekonata eraro okazis"
 
-#: ../midori/midori-app.c:1331
-msgid "_Bookmark"
-msgstr "_Legosigno"
-
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Legosignoj"
 
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Aldoni legosignon"
 
-#: ../midori/midori-app.c:1334
-msgid "_Console"
-msgstr ""
-
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Etendaĵoj"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Kronologio"
 
-#: ../midori/midori-app.c:1337
-msgid "_Homepage"
-msgstr "_Hejmpaĝo"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Uzantskriptoj"
 
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Stiloj de uzanto"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nova lange_to"
 
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transigoj"
 
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "_Kromprogramo de Netscape"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Fermitaj langetoj"
 
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "No_va fenestro"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nova _dosierujo"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresoj]"
+
+#: ../midori/midori-array.c:549
 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
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Miskreita dokumento"
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 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:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Iri antaŭen al sekvan paĝon"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Iri al la sekva subpaĝo"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
 
-#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170
-#: ../midori/midori-browser.c:5179
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Refreŝigi la aktualan paĝon"
 
-#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Haltigi refreŝigado de la aktuala paĝo"
 
-#: ../midori/midori-browser.c:455
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Ĝisdatigado de titolo fiaskis: %s\n"
 
-#: ../midori/midori-browser.c:468
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Valoro '%s' nevalidas por %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Neatendita agordo '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Neatendita ago '%s'."
 
-#: ../midori/midori-browser.c:558
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (privata retumado)"
 
-#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701
-msgid "Toplevel folder"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Enmetado de nova kronologiero fiaskis: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
 msgstr ""
 
-#: ../midori/midori-browser.c:758
-msgid "New folder"
-msgstr "Nova dosierujo"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Legosignoj"
 
-#: ../midori/midori-browser.c:758
-msgid "Edit folder"
-msgstr "Redakti dosierujon"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:760
-msgid "New bookmark"
-msgstr "Nova legosigno"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:760
-msgid "Edit bookmark"
-msgstr "Redakti legosignon"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:791
-msgid "_Title:"
-msgstr "_Titolo:"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adreso:"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239
-msgid "_Folder:"
-msgstr "_Dosierujo:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:850
+#: ../midori/midori-browser.c:1185
 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
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Konservi dosieron kiel"
 
-#: ../midori/midori-browser.c:1293
-msgid "New Window"
-msgstr "Nova fenestro"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1608
 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
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Nova langeto estas malfermita"
 
-#: ../midori/midori-browser.c:1331
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Eraro dum malfermado de bildo!"
 
-#: ../midori/midori-browser.c:1332
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Ne povas malfermi elektitan bildon en apriora montrilo."
 
-#: ../midori/midori-browser.c:1338
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Eraro dum elŝutado de bildo!"
 
-#: ../midori/midori-browser.c:1339
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Ne povas elŝuti elektitan bildon."
 
-#: ../midori/midori-browser.c:1442
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Konservi dosieron"
 
-#: ../midori/midori-browser.c:2293
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Reŝargi paĝon sen kaŝmemorigi"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Malfermi dosieron"
 
-#: ../midori/midori-browser.c:2425
+#: ../midori/midori-browser.c:2692
 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,2271 +377,3064 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nova fluo"
 
-#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239
-#: ../panels/midori-bookmarks.c:426
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Aldoni novan legosignon"
 
-#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Malplena"
 
-#: ../midori/midori-browser.c:3393
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 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:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
 
-#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742
-#: ../panels/midori-history.c:799
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Malfermi en nova _fenestro"
 
-#: ../midori/midori-browser.c:4126
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Aroro"
 
-#: ../midori/midori-browser.c:4127
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakaso"
 
-#: ../midori/midori-browser.c:4128
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opero"
 
-#: ../midori/midori-browser.c:4129
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konkeroro"
 
-#: ../midori/midori-browser.c:4130
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epifanio"
 
-#: ../midori/midori-browser.c:4131
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Fajrfokso (%s)"
 
-#: ../midori/midori-browser.c:4152
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importi legosignojn…"
 
-#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importi legosignojn"
 
-#: ../midori/midori-browser.c:4166
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplikaĵo:"
 
-#: ../midori/midori-browser.c:4231
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importi el XBEL- aŭ HTML- dosiero"
 
-#: ../midori/midori-browser.c:4266
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importi el dosiero"
 
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Importado de legosignoj fiaskis"
 
-#: ../midori/midori-browser.c:4313
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL-legosignoj"
 
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape-legosignoj"
 
-#: ../midori/midori-browser.c:4332
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr ""
+msgstr "Midori nur povas elporti al XBEL (*.xbel) kaj Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4347
+#: ../midori/midori-browser.c:4558
 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 ""
+msgstr "Elportado de legosignoj fiaskis"
 
-#: ../midori/midori-browser.c:4473
-msgid "_Clear private data"
-msgstr ""
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Malpeza retumilo."
 
-#: ../midori/midori-browser.c:4486
-msgid "Clear the following data:"
-msgstr ""
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Vidu about:version pri informoj de la versio."
 
-#: ../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
+#: ../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 ""
+"Ĉi tiu biblioteko estas libera. Vi povas redistribui ĝin kaj/aŭ ŝanĝi ĝin "
+"sub la terminoj de la Malpligranda Ĝenerala Publika GNO-permesilo kiel "
+"publikigita de la Libera Programaro Fondaĵo, aŭ versio 2.1 de la permesilo "
+"aŭ (laŭvole) iu ajn plinova versio."
 
-#: ../midori/midori-browser.c:4722
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
+"Launchpad Contributions:\n"
+"  Arturo Torres Sánchez https://launchpad.net/~r2d2.art2005\n"
+"  Cary Hartline https://launchpad.net/~caryhartline\n"
+"  Michael Moroni https://launchpad.net/~airon90\n"
+"  Pietro von Herts https://launchpad.net/~esperanton\n"
+"  Wiccio https://launchpad.net/~sissach1"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duobligi aktualan langeton"
 
-#: ../midori/midori-browser.c:5086
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Dosiero"
 
-#: ../midori/midori-browser.c:5089
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Malfermi en nova fenestro"
 
-#: ../midori/midori-browser.c:5092
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Malfermi en nova langeto"
 
-#: ../midori/midori-browser.c:5094
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nova fenestro por privata retumado"
 
-#: ../midori/midori-browser.c:5098
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Malfermi dosieron"
 
-#: ../midori/midori-browser.c:5100
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Kon_servi paĝon kiel…"
 
-#: ../midori/midori-browser.c:5101
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Konservi en dosiero"
 
-#: ../midori/midori-browser.c:5103
+#: ../midori/midori-browser.c:5084
 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
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
-msgstr ""
+msgstr "Aboni al novaĵ_fluo"
 
-#: ../midori/midori-browser.c:5119
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Fermi lan_geton"
 
-#: ../midori/midori-browser.c:5120
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Fermi aktualan langeton"
 
-#: ../midori/midori-browser.c:5122
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Fermi fenes_tron"
 
-#: ../midori/midori-browser.c:5126
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Presi la aktualan paĝon"
 
-#: ../midori/midori-browser.c:5128
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Fermi ĉiujn fenes_trojn"
 
-#: ../midori/midori-browser.c:5131
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../midori/midori-browser.c:5154
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Trovi…"
 
-#: ../midori/midori-browser.c:5155
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Trovi vorton aŭ frazon en la paĝo"
 
-#: ../midori/midori-browser.c:5157
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Trovi _sekvan"
 
-#: ../midori/midori-browser.c:5160
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Trovi _antaŭan"
 
-#: ../midori/midori-browser.c:5164
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Agordi aplikaĵon"
 
-#: ../midori/midori-browser.c:5166
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Vidi"
 
-#: ../midori/midori-browser.c:5167
+#: ../midori/midori-browser.c:5141
 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
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Altigi la pligrandignivelon"
 
-#: ../midori/midori-browser.c:5185
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Malaltigi la pligrandignivelon"
 
-#: ../midori/midori-browser.c:5189
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "Kod_ado"
 
-#: ../midori/midori-browser.c:5191
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Vidi font_on"
 
-#: ../midori/midori-browser.c:5194
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Baskuligi la tutekranan vidon"
 
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
-msgstr ""
+msgstr "Ru_lumi maldekstren"
 
-#: ../midori/midori-browser.c:5203
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
-msgstr ""
+msgstr "Rulu_mi malsupren"
 
-#: ../midori/midori-browser.c:5206
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
-msgstr ""
+msgstr "Rulumi s_upren"
 
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
-msgstr ""
+msgstr "Rulumi dekst_ren"
 
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Legebla"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "I_ri"
 
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
-msgstr ""
-
-#: ../midori/midori-browser.c:5218
-msgid "Go forward to the next page"
-msgstr ""
+msgstr "Iri malantaŭen al antaŭan paĝon"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
+msgstr "Iri al la antaŭan subpaĝo"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
 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"
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
 msgstr ""
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Hejmpaĝo"
+
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Iri al via hejmpaĝo"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
-msgstr ""
+msgstr "Malplenigi rubujon"
 
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
-msgstr ""
+msgstr "Malfari fermon de lan_geto"
 
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
+msgstr "Aldoni no_van dosierujon"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5247
-msgid "_Export bookmarks"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines"
 msgstr ""
 
-#: ../midori/midori-browser.c:5253
-msgid "_Clear Private Data"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
 msgstr ""
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
-msgstr ""
+msgstr "Ekzamen_i paĝon"
 
-#: ../midori/midori-browser.c:5260
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
-msgstr ""
+msgstr "_Antaŭa langeto"
 
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
+msgstr "Sekva la_ngeto"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
-msgstr ""
+msgstr "Movi langeton _malantaŭen"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
+msgstr "_Movi langeton antaŭen"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
-msgstr ""
+msgstr "Enfokusigi a_ktualan langeton"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
-msgstr ""
+msgstr "Enfokusigi sekva_n vidon"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
-msgstr ""
-
-#: ../midori/midori-browser.c:5279
-msgid "_Duplicate Current Tab"
-msgstr ""
+msgstr "Montri nur la piktogramon de la a_ktala langeto"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
-msgstr ""
+msgstr "Fermi alia_jn langetojn"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
-msgstr ""
+msgstr "Malfermi lastan _seancon"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
-msgstr ""
+msgstr "_Helpo"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
-msgstr ""
+msgstr "O_ftaj demandoj"
 
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
-msgstr ""
+msgstr "_Raporti problemon..."
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Iloj"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
-msgstr ""
+msgstr "_Menubreto"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
-msgstr ""
+msgstr "_Navigadbreto"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
-msgstr ""
+msgstr "Flanka _panelo"
 
-#: ../midori/midori-browser.c:5314
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
-msgstr ""
+msgstr "Flanka panelo"
 
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
-msgstr ""
+msgstr "Legosigno_breto"
 
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
-msgstr ""
+msgstr "_Statobreto"
 
-#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
-msgstr ""
+msgstr "_Aŭtomata"
 
-#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr ""
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Tradicia ĉina (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Simpligita ĉina (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
-msgstr ""
+msgstr "Japana (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
-msgstr ""
+msgstr "Korea (EUC-KR)"
 
-#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
-msgstr ""
+msgstr "Rusa (KOI8-R)"
 
-#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
-msgstr ""
+msgstr "Unikoda (UTF-8)"
 
-#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
-msgstr ""
+msgstr "Okcidenta (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
+msgstr "Propra..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
 msgstr ""
 
-#: ../midori/midori-browser.c:5858
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
-msgstr ""
+msgstr "Di_sigilo"
 
-#: ../midori/midori-browser.c:5865
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
-msgstr ""
+msgstr "_Loko"
 
-#: ../midori/midori-browser.c:5867
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
-msgstr ""
+msgstr "Malfermi specifan lokon"
 
-#: ../midori/midori-browser.c:5889
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
-msgstr ""
+msgstr "Ret_serĉi..."
 
-#: ../midori/midori-browser.c:5891
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
-msgstr ""
+msgstr "Retserĉi"
 
-#: ../midori/midori-browser.c:5918
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
-msgstr ""
+msgstr "Remalfermi antaŭe fermitan langeton aŭ fenestron"
 
-#: ../midori/midori-browser.c:5935
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
-msgstr ""
+msgstr "Montri la konservitajn legosignojn"
 
-#: ../midori/midori-browser.c:5952
-msgid "_Tools"
-msgstr ""
-
-#: ../midori/midori-browser.c:5968
-msgid "_Window"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:5970
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
-msgstr ""
+msgstr "Montri liston de ĉiuj malfermitaj langetoj"
 
-#: ../midori/midori-browser.c:5984
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
-msgstr ""
+msgstr "_Menuo"
 
-#: ../midori/midori-browser.c:5986
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
-msgstr ""
-
-#: ../midori/midori-browser.c:6659
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr ""
+msgstr "Menuo"
 
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr ""
+msgstr "La agordoj de la etendaĵo '%s' ne ŝargeblis: %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:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "La agordoj de la etendaĵo '%s' ne konserveblis: %s\n"
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "Elporti atestilon"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:472
-#, c-format
-msgid "Failed to select from history\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:558
-#, c-format
-msgid "Search for %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:592
-#, c-format
-msgid "Search with %s"
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "La atestilo eksvalidiĝis"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
 msgstr ""
+"La atestilo estis senvalidigita laŭ la listo de sevalidigo de atestiloj de "
+"GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "La algoritmo de la atestilo estas konsiderata nesekure."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Kelkaj eraroj okazis dum validigo de atestilo."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Elporti atestilon"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Memsubskribita"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Detaloj pri sekureco"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1359
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
-msgstr ""
+msgstr "Alglui kaj i_ri"
 
-#: ../midori/midori-locationaction.c:1727
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
-msgstr ""
+msgstr "Ne kontrolata"
 
-#: ../midori/midori-locationaction.c:1747
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
-msgstr ""
+msgstr "Kontrolata kaj ĉifrata konekto"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Malfermita neĉifrata konekto"
 
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
-msgstr ""
+msgstr "Ĝisrandigi flankan panelon dekstren"
 
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
-msgstr ""
+msgstr "Fermi panelon"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
-msgstr ""
+msgstr "Ĝisrandigi flankan panelon maldekstren"
 
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
-msgstr ""
+msgstr "Montri rapidan vokujon"
 
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
+msgstr "Montri hejmpaĝo"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Montri laste malfermitajn langetojn"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Montri lastajn langetojn sen ŝargi"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:233
-msgid "Japanese (SHIFT_JIS)"
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
 msgstr ""
 
-#: ../midori/midori-websettings.c:253
-msgid "New tab"
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japana (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Nova langeto"
+
+#: ../midori/midori-websettings.c:173
 msgid "New window"
-msgstr ""
+msgstr "Nova fenestro"
 
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
-msgstr ""
+msgstr "Aktuala langeto"
 
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:189
 msgid "Default"
-msgstr ""
+msgstr "Apriora"
 
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
-msgstr ""
+msgstr "Piktogramoj"
 
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
-msgstr ""
+msgstr "Malgrandaj piktogramoj"
 
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:192
 msgid "Text"
-msgstr ""
+msgstr "Teksto"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
-msgstr ""
+msgstr "Piktogramoj kaj teksto"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
-msgstr ""
+msgstr "Teksto apud piktogramoj"
 
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
-msgstr ""
+msgstr "Aŭtomata (GNOME aŭ ĉirkaŭaĵo)"
 
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
-msgstr ""
+msgstr "HTTP-prokurilo"
 
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
-msgstr ""
+msgstr "Neniu prokurilo"
 
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
-msgstr ""
+msgstr "Safari"
 
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
-msgstr ""
+msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
-msgstr ""
+msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:365
-msgid "Remember last window size"
-msgstr ""
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "La stilo de la ilobreto"
 
-#: ../midori/midori-websettings.c:366
-msgid "Whether to save the last window size"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
 msgstr ""
 
-#: ../midori/midori-websettings.c:374
-msgid "Last window width"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 
-#: ../midori/midori-websettings.c:375
-msgid "The last saved window width"
-msgstr ""
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "La agordoj ne ŝargeblas: %s\n"
 
-#: ../midori/midori-websettings.c:383
-msgid "Last window height"
-msgstr ""
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Nevalida agordvaloro '%s'"
 
-#: ../midori/midori-websettings.c:384
-msgid "The last saved window height"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:409
-msgid "Last panel position"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
 msgstr ""
 
-#: ../midori/midori-websettings.c:410
-msgid "The last saved panel position"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
 msgstr ""
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:419
-msgid "Last panel page"
-msgstr ""
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:420
-msgid "The last saved panel page"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
 msgstr ""
 
-#: ../midori/midori-websettings.c:428
-msgid "Last Web search"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
 msgstr ""
 
-#: ../midori/midori-websettings.c:429
-msgid "The last saved Web search"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
 msgstr ""
 
-#: ../midori/midori-websettings.c:438
-msgid "Show Menubar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
 msgstr ""
 
-#: ../midori/midori-websettings.c:439
-msgid "Whether to show the menubar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
 msgstr ""
 
-#: ../midori/midori-websettings.c:447
-msgid "Show Navigationbar"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
 msgstr ""
 
-#: ../midori/midori-websettings.c:448
-msgid "Whether to show the navigationbar"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
 msgstr ""
 
-#: ../midori/midori-websettings.c:456
-msgid "Show Bookmarkbar"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:457
-msgid "Whether to show the bookmarkbar"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
 msgstr ""
 
-#: ../midori/midori-websettings.c:465
-msgid "Show Panel"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
 msgstr ""
 
-#: ../midori/midori-websettings.c:466
-msgid "Whether to show the panel"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
 msgstr ""
 
-#: ../midori/midori-websettings.c:474
-msgid "Show Statusbar"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr ""
 
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the statusbar"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:484
-msgid "Toolbar Style:"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
 msgstr ""
 
-#: ../midori/midori-websettings.c:485
-msgid "The style of the toolbar"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
 msgstr ""
 
-#: ../midori/midori-websettings.c:494
-msgid "Toolbar Items"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:495
-msgid "The items to show on the toolbar"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
 msgstr ""
 
-#: ../midori/midori-websettings.c:503
-msgid "Compact Sidepanel"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
 msgstr ""
 
-#: ../midori/midori-websettings.c:504
-msgid "Whether to make the sidepanel compact"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:519
-msgid "Align sidepanel on the right"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:520
-msgid "Whether to align the sidepanel on the right"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:535
-msgid "Open panels in separate windows"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
 msgstr ""
 
-#: ../midori/midori-websettings.c:536
-msgid "Whether to always open panels in separate windows"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
 msgstr ""
 
-#: ../midori/midori-websettings.c:545
-msgid "When Midori starts:"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
 msgstr ""
 
-#: ../midori/midori-websettings.c:546
-msgid "What to do when Midori starts"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
 msgstr ""
 
-#: ../midori/midori-websettings.c:555
-msgid "Homepage:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:556
-msgid "The homepage"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
 msgstr ""
 
-#: ../midori/midori-websettings.c:571
-msgid "Show crash dialog"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:572
-msgid "Show a dialog after Midori crashed"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
 msgstr ""
 
-#: ../midori/midori-websettings.c:580
-msgid "Save downloaded files to:"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
 msgstr ""
 
-#: ../midori/midori-websettings.c:581
-msgid "The folder downloaded files are saved to"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
 msgstr ""
 
-#: ../midori/midori-websettings.c:589
-msgid "Text Editor"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:590
-msgid "An external text editor"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
 msgstr ""
 
-#: ../midori/midori-websettings.c:605
-msgid "News Aggregator"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
 msgstr ""
 
-#: ../midori/midori-websettings.c:606
-msgid "An external news aggregator"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:614
-msgid "Location entry Search"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
 msgstr ""
 
-#: ../midori/midori-websettings.c:615
-msgid "The search to perform inside the location entry"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:623
-msgid "Preferred Encoding"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:624
-msgid "The preferred character encoding"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
 msgstr ""
 
-#: ../midori/midori-websettings.c:634
-msgid "Always Show Tabbar"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
 msgstr ""
 
-#: ../midori/midori-websettings.c:635
-msgid "Always show the tabbar"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:643
-msgid "Close Buttons on Tabs"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:644
-msgid "Whether tabs have close buttons"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:669
-msgid "Open new pages in:"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:670
-msgid "Where to open new pages"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
 msgstr ""
 
-#: ../midori/midori-websettings.c:679
-msgid "Middle click opens Selection"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:680
-msgid "Load an address from the selection via middle click"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:688
-msgid "Open tabs in the background"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:689
-msgid "Whether to open new tabs in the background"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-websettings.c:697
-msgid "Open Tabs next to Current"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:698
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
 msgstr ""
 
-#: ../midori/midori-websettings.c:706
-msgid "Open popups in tabs"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
 
-#: ../midori/midori-websettings.c:707
-msgid "Whether to open popup windows in tabs"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 
-#: ../midori/midori-websettings.c:717 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:718
-msgid "Load and display images automatically"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 
-#: ../midori/midori-websettings.c:725 ../extensions/statusbar-features.c:143
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, 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-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Vi ne estas rajtigita por skribi en ĉi tiu loko."
+
+#: ../midori/midori-download.vala:371
+#, 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-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "La dosiero postulas %s sed nur %s restas."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Kiam Midori startas:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Hejmpaĝo:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr ""
 
-#: ../midori/midori-websettings.c:726
-msgid "Enable embedded scripting languages"
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Konservi elŝutitajn dosierojn en:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Stilo de ilobreto:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Malfermi novajn paĝojn en:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Butono por fermi en langetoj"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Tekstredaktilo"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Retkaŝmemoro"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privateco"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Kuketoj konservas datumojn pri ensaluto, konservataj ludoj aŭ uzantprofiloj "
+"por reklamaj celoj."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Etendaĵoj"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Mastrumi serĉilojn"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adreso:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "La serĉilo ne ŝargeblis. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "La serĉilo ne konserveblis. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Serĉi %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Serĉi per..."
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Serĉi per %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
 msgstr ""
 
-#: ../midori/midori-websettings.c:733 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:734
-msgid "Enable embedded Netscape plugin objects"
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
 msgstr ""
 
-#: ../midori/midori-websettings.c:749
-msgid "Enable Spell Checking"
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
 msgstr ""
 
-#: ../midori/midori-websettings.c:750
-msgid "Enable spell checking while typing"
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
 msgstr ""
 
-#: ../midori/midori-websettings.c:756
-msgid "Enable HTML5 database support"
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:757
-msgid "Whether to enable HTML5 database support"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
 msgstr ""
 
-#: ../midori/midori-websettings.c:763
-msgid "Enable HTML5 local storage support"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
 msgstr ""
 
-#: ../midori/midori-websettings.c:764
-msgid "Whether to enable HTML5 local storage support"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:770
-msgid "Enable offline web application cache"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:771
-msgid "Whether to enable offline web application cache"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:787
-msgid "Flash window on background tabs"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
 msgstr ""
 
-#: ../midori/midori-websettings.c:788
-msgid "Flash the browser window if a new tab was opened in the background"
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:796
-msgid "Enable WebGL support"
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
 msgstr ""
 
-#: ../midori/midori-websettings.c:797
-msgid "Allow websites to use OpenGL rendering"
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
 msgstr ""
 
-#: ../midori/midori-websettings.c:823
-msgid "Zoom Text and Images"
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
 msgstr ""
 
-#: ../midori/midori-websettings.c:824
-msgid "Whether to zoom text and images"
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
 msgstr ""
 
-#: ../midori/midori-websettings.c:839
-msgid "Find inline while typing"
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Malfermi en nova lange_to"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
 msgstr ""
 
-#: ../midori/midori-websettings.c:840
-msgid "Whether to automatically find inline while typing"
+#: ../panels/midori-history.c:111
+msgid "History"
 msgstr ""
 
-#: ../midori/midori-websettings.c:855
-msgid "Kinetic scrolling"
+#: ../panels/midori-history.c:133
+msgid "Today"
 msgstr ""
 
-#: ../midori/midori-websettings.c:856
-msgid "Whether scrolling should kinetically move according to speed"
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
 msgstr ""
 
-#: ../midori/midori-websettings.c:864
-msgid "Delete old Cookies after:"
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
 msgstr ""
 
-#: ../midori/midori-websettings.c:865
-msgid "The maximum number of days to save cookies for"
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "La kronologiero ne forigeblis: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
 msgstr ""
 
-#: ../midori/midori-websettings.c:881
-msgid "Only accept Cookies from sites you visit"
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
 msgstr ""
 
-#: ../midori/midori-websettings.c:882
-msgid "Block cookies sent by third-party websites"
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
 msgstr ""
 
-#: ../midori/midori-websettings.c:896
-msgid "Delete pages from history after:"
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
 msgstr ""
 
-#: ../midori/midori-websettings.c:897
-msgid "The maximum number of days to save the history for"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
 msgstr ""
 
-#: ../midori/midori-websettings.c:912
-msgid "Proxy server"
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
 msgstr ""
 
-#: ../midori/midori-websettings.c:913
-msgid "The type of proxy server to use"
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:922
-msgid "HTTP Proxy Server"
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
 msgstr ""
 
-#: ../midori/midori-websettings.c:923
-msgid "The proxy server used for HTTP connections"
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
 msgstr ""
 
-#: ../midori/midori-websettings.c:938
-msgid "Port"
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
 msgstr ""
 
-#: ../midori/midori-websettings.c:939
-msgid "The proxy server port used for HTTP connections"
+#: ../katze/katze-utils.c:386
+msgid "None"
 msgstr ""
 
-#: ../midori/midori-websettings.c:957
-msgid "The maximum size of cached pages on disk"
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
 msgstr ""
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:974
-msgid "Identify as"
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
 msgstr ""
 
-#: ../midori/midori-websettings.c:975
-msgid "What to identify as to web pages"
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
 msgstr ""
 
-#: ../midori/midori-websettings.c:991
-msgid "Identification string"
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
 msgstr ""
 
-#: ../midori/midori-websettings.c:992
-msgid "The application identification string"
+#: ../katze/katze-utils.c:747
+msgid "1 day"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1008
-msgid "Preferred languages"
+#: ../katze/katze-utils.c:748
+msgid "1 week"
 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\""
+#: ../katze/katze-utils.c:749
+msgid "1 month"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1024
-msgid "Clear private data"
+#: ../katze/katze-utils.c:750
+msgid "1 year"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1025
-msgid "The private data selected for deletion"
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1040
-msgid "Clear data"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1041
-msgid "The data selected for deletion"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
 msgstr ""
 
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1090
-msgid "Strip referrer details sent to websites"
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 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"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1106
-msgid "Always use my font choices"
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1107
-msgid "Override fonts picked by websites with user preferences"
+#: ../extensions/addons.c:229
+msgid "_Install user style"
 msgstr ""
 
-#: ../midori/midori-view.c:1307
-#, c-format
-msgid "%s wants to save an HTML5 database."
+#: ../extensions/addons.c:237
+msgid "Don't install"
 msgstr ""
 
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
-msgid "_Deny"
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
 msgstr ""
 
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
-msgid "_Allow"
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
 msgstr ""
 
-#: ../midori/midori-view.c:1339
-#, c-format
-msgid "%s wants to know your location."
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
 msgstr ""
 
-#: ../midori/midori-view.c:1430
+#: ../extensions/addons.c:411
 #, c-format
-msgid "Error - %s"
+msgid "Do you want to delete '%s'?"
 msgstr ""
 
-#: ../midori/midori-view.c:1431
-#, c-format
-msgid "The page '%s' couldn't be loaded."
+#: ../extensions/addons.c:417
+msgid "Delete user script"
 msgstr ""
 
-#: ../midori/midori-view.c:1433
-msgid "Try again"
+#: ../extensions/addons.c:418
+msgid "Delete user style"
 msgstr ""
 
-#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514
+#: ../extensions/addons.c:421
 #, c-format
-msgid "Send a message to %s"
+msgid "The file <b>%s</b> will be permanently deleted."
 msgstr ""
 
-#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663
-msgid "Inspect _Element"
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
 msgstr ""
 
-#: ../midori/midori-view.c:2397
-msgid "Open Link in New _Tab"
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
 msgstr ""
 
-#: ../midori/midori-view.c:2401
-msgid "Open Link in _Foreground Tab"
+#: ../extensions/addons.c:630
+msgid "Add new addon"
 msgstr ""
 
-#: ../midori/midori-view.c:2402
-msgid "Open Link in _Background Tab"
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
 msgstr ""
 
-#: ../midori/midori-view.c:2405
-msgid "Open Link in New _Window"
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
 msgstr ""
 
-#: ../midori/midori-view.c:2408
-msgid "Open Link as Web A_pplication"
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
 msgstr ""
 
-#: ../midori/midori-view.c:2413
-msgid "Copy Link de_stination"
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
 msgstr ""
 
-#: ../midori/midori-view.c:2429
-msgid "Open _Image in New Tab"
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
 msgstr ""
 
-#: ../midori/midori-view.c:2432
-msgid "Copy Image _Address"
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
 msgstr ""
 
-#: ../midori/midori-view.c:2435
-msgid "Save I_mage"
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
 msgstr ""
 
-#: ../midori/midori-view.c:2438
-msgid "Open in Image _Viewer"
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Forigi ĉiujn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
 msgstr ""
 
-#: ../midori/midori-view.c:2445
-msgid "Copy Video _Address"
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Etendi ĉiujn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Maletendi ĉiujn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Ĉu vi vere volas forigi ĉiujn kuketojn?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Demando"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
 msgstr ""
 
-#: ../midori/midori-view.c:2448
-msgid "Save _Video"
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
 msgstr ""
 
-#: ../midori/midori-view.c:2448
-msgid "Download _Video"
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:2474
-msgid "Search _with"
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Jes"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Ne"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
 msgstr ""
+"<b>Domajno</b>: %s\n"
+"<b>Kuketoj</b>: %d"
 
-#: ../midori/midori-view.c:2506
-msgid "_Search the Web"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Nomo"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Etendi ĉiujn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Maletendi ĉiujn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
 msgstr ""
 
-#: ../midori/midori-view.c:2522
-msgid "Open Address in New _Tab"
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
 msgstr ""
 
-#: ../midori/midori-view.c:2814
-msgid "Open or download file"
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
 msgstr ""
 
-#: ../midori/midori-view.c:2833
-#, c-format
-msgid "File Type: '%s'"
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
 msgstr ""
 
-#: ../midori/midori-view.c:2835
-#, c-format
-msgid "File Type: %s ('%s')"
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
 msgstr ""
 
-#: ../midori/midori-view.c:2839
-#, c-format
-msgid "File Name: %s"
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
 msgstr ""
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2858
-#, c-format
-msgid "Open %s"
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
 msgstr ""
 
-#: ../midori/midori-view.c:3483
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
 #, c-format
-msgid "Inspect page - %s"
+msgid ""
+"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."
 msgstr ""
 
-#: ../midori/midori-view.c:3784
-msgid "Speed Dial"
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
 msgstr ""
 
-#: ../midori/midori-view.c:3785 ../midori/midori-view.c:3881
-msgid "Click to add a shortcut"
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
 msgstr ""
 
-#: ../midori/midori-view.c:3786
-msgid "Enter shortcut address"
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
 msgstr ""
 
-#: ../midori/midori-view.c:3787
-msgid "Enter shortcut title"
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
 msgstr ""
 
-#: ../midori/midori-view.c:3788
-msgid "Are you sure you want to delete this shortcut?"
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
 msgstr ""
 
-#: ../midori/midori-view.c:3950
+#: ../extensions/external-download-manager.vala:304
 #, c-format
-msgid "No documentation installed"
+msgid "Download files with \"%s\" or a custom command"
 msgstr ""
 
-#: ../midori/midori-view.c:4026
-msgid "Midori doesn't store any personal data:"
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
 msgstr ""
 
-#: ../midori/midori-view.c:4027
-msgid "No history or web cookies are being saved."
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-view.c:4028
-msgid "Extensions are disabled."
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-view.c:4029
-msgid "HTML5 storage, local database and application caches are disabled."
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
 msgstr ""
 
-#: ../midori/midori-view.c:4030
-msgid "Midori prevents websites from tracking the user:"
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Fluoj"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Aldoni novan fluon"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Forigi fluon"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Flouj"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
 msgstr ""
 
-#: ../midori/midori-view.c:4031
-msgid "Referrer URLs are stripped down to the hostname."
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
 msgstr ""
 
-#: ../midori/midori-view.c:4032
-msgid "DNS prefetching is disabled."
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:4033
-msgid "The language and timezone are not revealed to websites."
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 
-#: ../midori/midori-view.c:4034
-msgid "Flash and other Netscape plugins cannot be listed by websites."
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
 msgstr ""
 
-#: ../midori/midori-view.c:4071
-msgid "Version numbers in brackets show the version used at runtime."
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-view.c:4126
-msgid "Page loading delayed"
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
 msgstr ""
 
-#: ../midori/midori-view.c:4127
-msgid "Loading delayed either due to a recent crash or startup preferences."
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
 msgstr ""
 
-#: ../midori/midori-view.c:4128
-msgid "Load Page"
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
 msgstr ""
 
-#: ../midori/midori-view.c:4267
-msgid "Blank page"
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
 msgstr ""
 
-#: ../midori/midori-view.c:4529
-msgid "_Duplicate Tab"
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
 msgstr ""
 
-#: ../midori/midori-view.c:4534
-msgid "Show Tab _Label"
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
 msgstr ""
 
-#: ../midori/midori-view.c:4534
-msgid "Show Tab _Icon Only"
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
 msgstr ""
 
-#: ../midori/midori-view.c:4540
-msgid "Close ot_her Tabs"
-msgstr ""
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Ĉu memorigi pasvorton por ĉi tiu paĝo?"
 
-#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5311
-msgid "previous"
-msgstr ""
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Memorigi"
 
-#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5330
-msgid "next"
-msgstr ""
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ne nun"
 
-#: ../midori/midori-view.c:5343
-msgid "Print background images"
-msgstr ""
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Neniam por ĉi tiu paĝo"
 
-#: ../midori/midori-view.c:5344
-msgid "Whether background images should be printed"
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
 msgstr ""
 
-#: ../midori/midori-view.c:5376
-msgid "Features"
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
 msgstr ""
 
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
 msgstr ""
 
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
 msgstr ""
 
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
 msgstr ""
 
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
+#: ../extensions/history-list.vala:289
+msgid "History-List"
 msgstr ""
 
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
 msgstr ""
 
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr ""
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Fari nenion"
 
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
 msgstr ""
 
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr ""
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Ŝalti al plej nova langeto"
 
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
 msgstr ""
 
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
 msgstr ""
 
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
 msgstr ""
 
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
 msgstr ""
 
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
 msgstr ""
 
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
 msgstr ""
 
-#. Page "Network"
-#: ../midori/midori-preferences.c:454
-msgid "Network"
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
 msgstr ""
 
-#: ../midori/midori-preferences.c:461
-msgid "Hostname"
+#: ../extensions/history-list.vala:648
+msgid "History List"
 msgstr ""
 
-#: ../midori/midori-preferences.c:485
-msgid "MB"
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
 msgstr ""
 
-#: ../midori/sokoke.c:412
-msgid "Open with"
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
 msgstr ""
 
-#: ../midori/sokoke.c:420
-#, c-format
-msgid "Choose an application or command to open \"%s\":"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
 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."
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
 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"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
 msgstr ""
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
-msgid "?B"
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
 msgstr ""
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
-#, c-format
-msgid " (%s/s)"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
 msgstr ""
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
-#, c-format
-msgid " - %s remaining"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
 msgstr ""
 
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:263
-msgid "_Inline Find:"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
 msgstr ""
 
-#: ../toolbars/midori-findbar.c:289
-msgid "Previous"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
 msgstr ""
 
-#: ../toolbars/midori-findbar.c:295
-msgid "Next"
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
 msgstr ""
 
-#: ../toolbars/midori-findbar.c:299
-msgid "Match Case"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
 msgstr ""
 
-#: ../toolbars/midori-findbar.c:308
-msgid "Highlight Matches"
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
 msgstr ""
 
-#: ../toolbars/midori-findbar.c:319
-msgid "Close Findbar"
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:122
+#: ../extensions/nojs/nojs-view.c:261
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
+msgid "Allow %s this session"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
 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."
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
-msgid "Clear All"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
-msgid "Some files are being downloaded"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:374
-msgid "_Quit Midori"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:376
-msgid "The transfers will be cancelled if Midori quits."
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:113
-msgid "Bookmarks"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:256
-#, c-format
-msgid "Failed to add bookmark item: %s\n"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:434
-msgid "Edit the selected bookmark"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:442
-msgid "Delete the selected bookmark"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:457
-msgid "Add a new folder"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631
-msgid "<i>Separator</i>"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
 msgstr ""
 
-#: ../panels/midori-history.c:110
-msgid "History"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
 msgstr ""
 
-#: ../panels/midori-history.c:157 ../panels/midori-history.c:188
-msgid "Today"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
 msgstr ""
 
-#: ../panels/midori-history.c:159 ../panels/midori-history.c:190
-msgid "Yesterday"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
 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] ""
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
 
-#: ../panels/midori-history.c:164 ../panels/midori-history.c:183
-msgid "A week ago"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
 msgstr ""
 
-#: ../panels/midori-history.c:359
-msgid "Are you sure you want to remove all history items?"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
 msgstr ""
 
-#: ../panels/midori-history.c:405
-msgid "Bookmark the selected history item"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
 msgstr ""
 
-#: ../panels/midori-history.c:414
-msgid "Delete the selected history item"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
 msgstr ""
 
-#: ../panels/midori-history.c:422
-msgid "Clear the entire history"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
 msgstr ""
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
 msgstr ""
 
-#: ../panels/midori-transfers.c:467
-msgid "Open Destination _Folder"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
 msgstr ""
 
-#: ../panels/midori-transfers.c:470
-msgid "Copy Link Loc_ation"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:210
-msgid "Authentication Required"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:226
+#: ../extensions/nojs/nojs.c:749
 msgid ""
-"A username and a password are required\n"
-"to open this location:"
+"If true this extension will not check policy for each site but allow them."
 msgstr ""
 
-#: ../katze/katze-http-auth.c:240
-msgid "Username"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:253
-msgid "Password"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:267
-msgid "_Remember password"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
 msgstr ""
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
 msgstr ""
 
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
 msgstr ""
 
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr ""
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Musgestoj"
 
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
-#, c-format
-msgid "Property '%s' is invalid for %s"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
 msgstr ""
 
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
-#: ../extensions/addons.c:308
-msgid "Choose file"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
 msgstr ""
 
-#: ../katze/katze-utils.c:500
-msgid "Choose folder"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
 msgstr ""
 
-#: ../katze/katze-utils.c:604
-msgid "None"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
 msgstr ""
 
-#: ../katze/katze-utils.c:719
-msgid "1 hour"
-msgstr ""
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Klavkombinoj"
 
-#: ../katze/katze-utils.c:720
-msgid "1 day"
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
 msgstr ""
 
-#: ../katze/katze-utils.c:721
-msgid "1 week"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
 msgstr ""
 
-#: ../katze/katze-utils.c:722
-msgid "1 month"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
 msgstr ""
 
-#: ../katze/katze-utils.c:723
-msgid "1 year"
-msgstr ""
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Bildoj"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
-#, c-format
-msgid "Preferences for %s"
-msgstr ""
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skriptoj"
 
-#: ../extensions/adblock.c:467
-msgid "Configure Advertisement filters"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Kromprogramoj de Netscape"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
 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."
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
 msgstr ""
 
-#: ../extensions/adblock.c:846
-msgid "Edit rule"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
 msgstr ""
 
-#: ../extensions/adblock.c:860
-msgid "_Rule:"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
 msgstr ""
 
-#: ../extensions/adblock.c:914
-msgid "Bl_ock image"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
 msgstr ""
 
-#: ../extensions/adblock.c:919
-msgid "Bl_ock link"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
 msgstr ""
 
-#: ../extensions/adblock.c:1538
-msgid "Advertisement blocker"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
 msgstr ""
 
-#: ../extensions/adblock.c:1539
-msgid "Block advertisements according to a filter list"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
 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?"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
 msgstr ""
 
-#: ../extensions/addons.c:222
-msgid "_Install user script"
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
 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?"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Disponeblaj eroj"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
 msgstr ""
 
-#: ../extensions/addons.c:228
-msgid "_Install user style"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
 msgstr ""
 
-#: ../extensions/addons.c:236
-msgid "Don't install"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Redaktilo de ilobretoj"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
 msgstr ""
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
-msgid "Userscripts"
-msgstr ""
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Forigi privatajn datumojn"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
-msgid "Userstyles"
-msgstr ""
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Forigi privatajn datumojn"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
-msgid "Error"
-msgstr ""
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Forigi la sekvajn datumojn:"
 
-#: ../extensions/addons.c:421
-#, c-format
-msgid "Do you want to delete '%s'?"
-msgstr ""
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Lastaj malfermitaj lange_toj"
 
-#: ../extensions/addons.c:427
-msgid "Delete user script"
-msgstr ""
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Forigi privatajn datumojn _kiam eliranta de Midori"
 
-#: ../extensions/addons.c:428
-msgid "Delete user style"
-msgstr ""
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Konservitaj ensalutoj kaj _pasvortoj"
 
-#: ../extensions/addons.c:431
-#, c-format
-msgid "The file <b>%s</b> will be permanently deleted."
-msgstr ""
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Kuketoj kaj datumoj de retejoj"
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
-msgid "Open in Text Editor"
-msgstr ""
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Piktogramoj de retejoj"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
-msgid "Open Target Folder"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
 msgstr ""
 
-#: ../extensions/addons.c:638
-msgid "Add new addon"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
 msgstr ""
 
-#: ../extensions/addons.c:664
-msgid "Remove selected addon"
-msgstr ""
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Forigado de la kronologio fiaskis: %s\n"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
-msgid "User addons"
-msgstr ""
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "La malnovaj kronologieroj ne forigeblis: %s\n"
 
-#: ../extensions/addons.c:1826
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Can't monitor folder '%s': %s"
+msgid "Failed to add bookmark item: %s\n"
 msgstr ""
 
-#: ../extensions/addons.c:1915
-msgid "Support for userscripts and userstyles"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:201
-msgid "Colorful Tabs"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:202
-msgid "Tint each tab distinctly"
-msgstr ""
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr "Neniu ĉefatestildosiero disponeblas. SSL-atestiloj ne kontroleblas."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:73
-#: ../extensions/cookie-manager/main.c:35
-msgid "Cookie Manager"
-msgstr ""
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "La agordoj ne konserveblis. %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
-msgid "Delete All"
-msgstr ""
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "La rubujo ne konserveblis. %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
-msgid "Expand All"
-msgstr ""
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Redakti a_gordojn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
-msgid "Collapse All"
-msgstr ""
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Malŝalti ĉiujn _etendaĵojn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
-msgid "Do you really want to delete all cookies?"
-msgstr ""
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Montri dialogon post kolapso de Midori"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:574
-msgid "Question"
-msgstr ""
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Ignori malnovajn langetojn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
-msgid "Only cookies which match the filter will be deleted."
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:671
-msgid "At the end of the session"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Apero de Midori estas jam rulanta sed ĝi ne estas respondanta.\n"
+
+#: ../midori/midori-frontend.c:494
 #, c-format
-msgid ""
-"<b>Host</b>: %s\n"
-"<b>Name</b>: %s\n"
-"<b>Value</b>: %s\n"
-"<b>Path</b>: %s\n"
-"<b>Secure</b>: %s\n"
-"<b>Expires</b>: %s"
-msgstr ""
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "La legosignoj ne ŝargeblis: %s\n"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
-msgid "Yes"
-msgstr ""
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "La seanco ne ŝargeblis: %s\n"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
-msgid "No"
-msgstr ""
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "La rubujo ne ŝargeblis: %s\n"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../midori/midori-frontend.c:533
 #, c-format
-msgid ""
-"<b>Domain</b>: %s\n"
-"<b>Cookies</b>: %d"
-msgstr ""
+msgid "The history couldn't be loaded: %s\n"
+msgstr "La kronologio ne ŝargeblis: %s\n"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
-msgid "Name"
-msgstr ""
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "La sekvaj eraroj okazis:"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
-msgid "_Expand All"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignori"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
-msgid "_Collapse All"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
 msgstr ""
 
-#: ../extensions/cookie-manager/main.c:36
-msgid "List, view and delete cookies"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
 msgstr ""
 
-#: ../extensions/copy-tabs.c:38
-msgid "Copy Tab _Addresses"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
 msgstr ""
 
-#: ../extensions/copy-tabs.c:95
-msgid "Copy Addresses of Tabs"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
 msgstr ""
 
-#: ../extensions/copy-tabs.c:96
-msgid "Copy the addresses of all tabs to the clipboard"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:209
-msgid "Failed to find required Atom \"entry\" elements in XML data."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
 msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:315
-msgid "Failed to find required Atom \"feed\" elements in XML data."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 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."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:653
-msgid "Feeds"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:706
-msgid "Add new feed"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:713
-msgid "Delete feed"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:795
-msgid "_Feeds"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
-msgid "Failed to find root element in feed XML data."
+msgid "The website %s wants to store a cookie."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
-msgid "Unsupported feed format."
+msgid "Multiple websites want to store %d cookies in total."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:265
-#, c-format
-msgid "Failed to parse XML feed: %s"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:46
-msgid "Failed to find \"channel\" element in RSS XML data."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:51
-msgid "Unsupported RSS version found."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:148
-msgid "Failed to find required RSS \"item\" elements in XML data."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
-msgid "Failed to find required RSS \"channel\" elements in XML data."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:131
-#, c-format
-msgid "Feed '%s' already exists"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:208
-#, c-format
-msgid "Error loading feed '%s'"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:518
-msgid "Feed Panel"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:519
-msgid "Read Atom/ RSS feeds"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:39
-#, c-format
-msgid "Failed to add form value: %s\n"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:95
-msgid "Form history"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:112
-msgid ""
-"Master password required\n"
-"to open password database"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:292
-msgid "Remember password on this page?"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:297
-msgid "Remember"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:298
-msgid "Not now"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:299
-msgid "Never for this page"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:435
-msgid "Toggle form history state"
+#: ../extensions/apps.vala:191
+msgid "Applications"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:436
-msgid "Activate or deactivate form history for the current tab."
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:547
-#: ../extensions/formhistory/formhistory.c:551
-#, c-format
-msgid "Failed to execute database statement: %s\n"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:627
-msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+#: ../extensions/apps.vala:213
+msgid "New _App"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:666
-msgid "Form history filler"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:667
-msgid "Stores history of entered form data"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
-#: ../extensions/formhistory/formhistory-js-frontend.c:106
-#, c-format
-msgid "Failed to select suggestions\n"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Krei _lanĉilon"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
 msgstr ""
 
-#: ../extensions/history-list.vala:197
-msgid "There are no unvisited tabs"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
 msgstr ""
 
-#: ../extensions/history-list.vala:235
-#, c-format
-msgid "History-List"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
 msgstr ""
 
-#: ../extensions/history-list.vala:275
-msgid "Tab closing behavior"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
 msgstr ""
 
-#: ../extensions/history-list.vala:283
-msgid "Do nothing"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
 msgstr ""
 
-#: ../extensions/history-list.vala:289
-msgid "Switch to last viewed tab"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
 msgstr ""
 
-#: ../extensions/history-list.vala:295
-msgid "Switch to newest tab"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
 msgstr ""
 
-#: ../extensions/history-list.vala:423
-msgid "Next new Tab (History List)"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
 msgstr ""
 
-#: ../extensions/history-list.vala:424
-msgid "Next new tab from history"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
 msgstr ""
 
-#: ../extensions/history-list.vala:433
-msgid "Previous new Tab (History List)"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
 msgstr ""
 
-#: ../extensions/history-list.vala:434
-msgid "Previous new tab from history"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
 msgstr ""
 
-#: ../extensions/history-list.vala:443
-msgid "Display tab in background (History List)"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
 msgstr ""
 
-#: ../extensions/history-list.vala:444
-msgid "Display the current selected tab in background"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
 msgstr ""
 
-#: ../extensions/history-list.vala:569
-msgid "History List"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
 msgstr ""
 
-#: ../extensions/history-list.vala:570
-msgid "Move to the last used tab when switching or closing tabs"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
 msgstr ""
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
 msgstr ""
 
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
 msgstr ""
 
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
 msgstr ""
 
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
 msgstr ""
 
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts…"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
 msgstr ""
 
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
 msgstr ""
 
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
 msgstr ""
 
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
 msgstr ""
 
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:131
-msgid "Images"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:140
-msgid "Scripts"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:151
-msgid "Netscape plugins"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:199
-msgid "Statusbar Features"
+#: ../extensions/notes.vala:146
+msgid "New Note"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:200
-msgid "Easily toggle features on web pages on and off"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
 msgstr ""
 
-#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683
-msgid "Tab Panel"
+#: ../extensions/notes.vala:153
+msgid "New note"
 msgstr ""
 
-#: ../extensions/tab-panel.c:666
-msgid "T_ab Panel"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
 msgstr ""
 
-#: ../extensions/tab-panel.c:684
-msgid "Show tabs in a vertical panel"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
 msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
 msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:393
-msgid "Customize Toolbar"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:409
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:425
-msgid "Available Items"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:446
-msgid "Displayed Items"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar…"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize…"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:627
-msgid "Toolbar Editor"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:628
-msgid "Easily edit the toolbar layout"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
 msgstr ""
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
 msgstr ""
index 8feb448b28abc378822e24cb44d22742f41c3916..b3ed67f0def5fc056aeda8d3815f1d3de335d9a8 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -12,213 +12,214 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-13 15:33+0000\n"
-"PO-Revision-Date: 2013-05-13 11:43-0600\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-01-07 05:36+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <xfce-i18n@xfce.org>\n"
-"Language: es\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: Poedit 1.5.4\n"
-
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Navegue por la web"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorador"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-01-08 05:37+0000\n"
+"X-Generator: Launchpad (build 17298)\n"
+"Language: es\n"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-websettings.c:228
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navegador web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navegue por la web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Ventana de navegación privada nueva"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorador"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Pestaña nueva"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Ventana nueva"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navegador web"
+msgid "New Private Browsing Window"
+msgstr "Ventana de navegación privada nueva"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Navegación privada Midori"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Abrir una ventana nueva de navegación privada"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4410
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navegación privada"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Abrir una ventana nueva de navegación privada"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Captura guardada en: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Ejecutar DIRECCIÓN como una aplicación web"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "DIRECCIÓN"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Utilizar CARPETA como carpeta de configuración"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
-msgstr "Navegación privada, no se guardan los cambios"
+msgstr "Navegación privada, no se guardan los cambios"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
-"Modo portable, todos los archivos de tiempo de ejecución se guardan en un "
+"Modo portátil, todos los archivos de tiempo de ejecución se guardan en un "
 "mismo lugar"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Ventana simple GTK+ con WebKit, similar a GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
-msgstr "Mostrar un diálogo de diagnóstico"
+msgstr "Mostrar cuadro de diálogo de diagnóstico"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Ejecutar con gdb y guardar una traza inversa cuando ocurra un fallo"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
-msgstr "Ejecutar el nombre de archivo especificado como JavaScript"
+msgstr "Ejecutar el  archivo especificado como JavaScript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Tomar una captura del URI especificado"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Ejecutar la orden especificada"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Mostrar las órdenes disponibles para ejecutar con -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Mostrar la versión del programa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Direcciones"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Bloquear URI según PATRÓN de expresión regular"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATRÓN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGUNDOS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Error: no se encontró «gdb»\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Envíe sus comentarios, sugerencias y errores a:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Comprobar versiones nuevas en:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Se produjo un error desconocido"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Añadir _marcador"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensiones"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
-msgstr "_Histórico"
+msgstr "_Historial"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Scripts de usuario"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Estilos de usuario"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "_Pestaña nueva"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferencias"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "C_omplementos de Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Pestañas _cerradas"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "_Carpeta nueva"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Direcciones]"
 
@@ -235,134 +236,146 @@ msgstr "El documento es defectuoso."
 msgid "Unrecognized bookmark format."
 msgstr "Formato de marcador no reconocido."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Avanzar a la siguiente página"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ir a la subpágina siguiente"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Buscar en la web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Recargar la página actual"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Detener la carga de la página actual"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "No se pudo actualizar el título: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "El valor «%s» no es válido para %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Configuración no esperada «%s»"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Acción inesperada «%s»."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (navegación privada)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "No se pudo insertar un elemento nuevo en el histórico: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Seleccionar [texto]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Carpeta nueva"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Editar carpeta"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Marcador nuevo"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Editar marcador"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Editar el marcador"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
 msgstr "Escriba un nombre para este marcador y elija dónde guardarlo."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Añadir a marcado _rápido"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Escriba un nombre para esta carpeta y elija dónde guardarla."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Mostrar en la _barra de herramientas"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mostrar en la _barra de marcadores"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Ejecutar como aplicación _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Añadir a marcado _rápido"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Guardar archivo como"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Guardar _recursos asociados"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Se ha abierto una ventana nueva"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Se ha abierto una pestaña nueva"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Ocurrió un error al abrir la imagen."
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 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:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Ocurrió un error al descargar la imagen."
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "No se puede descargar la imagen seleccionada."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Guardar archivo"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Recargar página sin caché"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -376,31 +389,24 @@ msgstr ""
 "agregador de noticias. La próxima vez que pulse en el icono del canal, se "
 "añadirá automáticamente."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Canal nuevo"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Añadir un marcador nuevo"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Compartir esta página"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Vacío"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Activar o desactivar la navegación por cursor"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -408,110 +414,100 @@ msgstr ""
 "Oprima F7 para activar o desactivar la navegación por cursor. Cuando se "
 "activa, aparece el cursor del texto en todas las páginas."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_Activar navegación por cursor"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "No se pudo insertar un elemento nuevo en el histórico: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Abrir todo en _pestañas"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Abrir en una _pestaña nueva"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4886 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Abrir en una _ventana nueva"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importar marcadores…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importar marcadores"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplicación:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importar desde archivo XBEL o HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importar desde un archivo"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "No se pudieron importar los marcadores"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Marcadores XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
-msgstr "Marcadores de Netscape "
+msgstr "Marcadores de Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "Midori solo puede exportar a los formatos XBEL (*.xbel) y Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "No se pudieron exportar los marcadores"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un navegador web ligero."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Consulte about:version para ver información de la versión."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -523,7 +519,7 @@ msgstr ""
 "publica la Free Software Foundation; ya sea la versión 2.1 de la licencia o "
 "(según su criterio) cualquier versión posterior."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Adolfo Jayme Barrientos  <fitoschido@ubuntu.com>, 2013\n"
@@ -532,364 +528,424 @@ msgstr ""
 "Christian Dywan <christian@twotoasts.de>\n"
 "Elega <elega@elega.com.ar>\n"
 "Guillermo Iguarán <tronad0r@cuteam.org>\n"
-"Abel Martín <abel.martin.ruiz@gmail.com>"
+"Abel Martín <abel.martin.ruiz@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n"
+"  Alfredo Hernández https://launchpad.net/~aldomann\n"
+"  Andres Sanchez https://launchpad.net/~afsanchez93-deactivatedaccount\n"
+"  Carkis https://launchpad.net/~carlosdark\n"
+"  Carlos https://launchpad.net/~carlosmp1996\n"
+"  Chipong Luo https://launchpad.net/~chipong-l\n"
+"  Christopher https://launchpad.net/~cdhornb\n"
+"  Cristhian Steven Echeverry Z. https://launchpad.net/~cristeche-c\n"
+"  Derek Basaletti https://launchpad.net/~derek-basaletti\n"
+"  Diego Prieto https://launchpad.net/~bboyastalamuerte\n"
+"  Ezequiel Sapo https://launchpad.net/~ezesapo\n"
+"  Gabriel Pepe https://launchpad.net/~gp2notime\n"
+"  Gerson Alvarado https://launchpad.net/~lewatoto\n"
+"  Irwin Boom https://launchpad.net/~vendettaboom\n"
+"  Israel https://launchpad.net/~isra1998isra\n"
+"  Ivan Diaz https://launchpad.net/~saisyukusanagi\n"
+"  Jaime https://launchpad.net/~manueljaime\n"
+"  Javier Tapia Torres https://launchpad.net/~jtapia-1987\n"
+"  Jean Pierre Dudey Diaz https://launchpad.net/~atlas7jeandudey\n"
+"  Jeferson Mendoza https://launchpad.net/~jefex93\n"
+"  Jesús David García Madriz https://launchpad.net/~jesusgarciamadriz\n"
+"  Jesús Delgado https://launchpad.net/~talpiod-deactivatedaccount\n"
+"  Juan David Angarita https://launchpad.net/~jangarita11\n"
+"  Kalprestito@Yahoo.Es https://launchpad.net/~kalprestito\n"
+"  Kern Goldstein https://launchpad.net/~kern-goldstein\n"
+"  Marcelo Fernando López https://launchpad.net/~lopez-marcelo-2010\n"
+"  Marco Carrizales https://launchpad.net/~tamoxin\n"
+"  Marco Ramón https://launchpad.net/~marco-ramon-jimenez\n"
+"  Oscar A. Mata T. https://launchpad.net/~oscar-mata\n"
+"  Poncho https://launchpad.net/~cruzrivera\n"
+"  R. Santana https://launchpad.net/~robermad1986\n"
+"  Raymundo https://launchpad.net/~yotihuanatili\n"
+"  Rodolfo Padilla https://launchpad.net/~tengopurasideaslocas\n"
+"  Sergio https://launchpad.net/~oigres200-o\n"
+"  Simon Faillace Mullen https://launchpad.net/~simonfmullen-"
+"deactivatedaccount\n"
+"  Therius Ferreiro https://launchpad.net/~theriusferreiro\n"
+"  Walter Beckerleg https://launchpad.net/~spayk-99\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  daniel villalobos https://launchpad.net/~elcodigo12-p\n"
+"  dbinary https://launchpad.net/~luis-luimarin\n"
+"  ghas https://launchpad.net/~agghas\n"
+"  huachimingox https://launchpad.net/~huachimingox\n"
+"  jean beuzeville https://launchpad.net/~jeanbeuzeville\n"
+"  jesusiniesta https://launchpad.net/~jesus-iniesta"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicar pestaña actual"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Abrir una ventana nueva"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Abrir una pestaña nueva"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Ventana nueva de navegación p_rivada"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Guardar página como…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Guardar en un archivo"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Añadir a _marcado rápido"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Suscribirse al _canal de noticias"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Cerrar la pestaña"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Cerrar la pestaña actual"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Cerrar ventana"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Compartir"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimir la página actual"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Cerrar _todas las ventanas"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Buscar…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Buscar una palabra o frase en la página"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Buscar _siguiente"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Buscar _anterior"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configurar las preferencias de la aplicación"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ver"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Barras de herramientas"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Recargar página sin caché"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Aumentar el nivel de zoom"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Disminuir el nivel de zoom"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codificación"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ver _código fuente"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Ver código fuente _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navegación por cu_rsor"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Activar o desactivar pantalla completa"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Desplazar hacia la _izquierda"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Desplazar hacia a_bajo"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Desplazar hacia a_rriba"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Desplazar hacia la _derecha"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Legible"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ir a la página anterior"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ir a la subpágina anterior"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Siguiente o adelante"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Ir a la página o subpágina siguiente en el histórico"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Página de inicio"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Abrir la página de inicio"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Vaciar la papelera"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Deshacer el _cierre de pestaña"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Añadir una _carpeta nueva"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exportar marcadores"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importar marcadores…"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Gestionar motores de búsqueda"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exportar marcadores..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Limpiar datos privados"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Gestionar _motores de búsqueda…"
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Limpiar los datos privados…"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspeccionar página"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Pestaña _anterior"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Pestaña _siguiente"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
-msgstr "Mover pestana a la _primera posición"
+msgstr "Mover pestaña a la _primera posición"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Mover pestaña hacia _atrás"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mover pestaña hacia adelante"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Mover pestaña a la _última posición"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Enfocar la pestaña a_ctual"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Enfocar la vista _siguiente"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Solo mostrar el icono de la pestaña actual"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Duplicar pestaña actual"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Cerrar las o_tras pestañas"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Abrir la última _sesión"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Preguntas frecuentes"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Informar de un problema…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra de _menús"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra de _navegación"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Panel lateral"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panel lateral"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barra de _marcadores"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra de _estado"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chino tradicional (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chino simplificado (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonés (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ruso (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Occidental (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalizado…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "No se pudo inicializar el histórico: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separador"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Ubicación…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Abrir una dirección en particular"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Buscar en la web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Realizar una búsqueda en la web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Reabrir una pestaña o ventana cerrada"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Mostrar los marcadores guardados"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Pestañas"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Mostrar una lista de todas las pestañas abiertas"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menú"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menú"
 
@@ -898,20 +954,20 @@ msgstr "Menú"
 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:886 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
-msgstr "La autoridad del certificado de firma no se conoce."
+msgstr "No se conoce la autoridad del certificado de firma."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -919,56 +975,56 @@ msgstr ""
 "El certificado no coincide con la identidad esperada del sitio del que se "
 "obtuvo."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "El certificado ha caducado"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 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"
+"El certificado ha sido revocado de acuerdo a la lista de revocación de "
+"GTlsConnection."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "El algoritmo del certificado se considera inseguro."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Ocurrió algún otro error al validar el certificado."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Autofirmado"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Detalles de seguridad"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Pegar y c_ontinuar"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Sin verificar"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Conexión verificada y cifrada"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Conexión abierta y sin cifrar"
 
@@ -985,440 +1041,454 @@ msgstr "Cerrar panel"
 msgid "Align sidepanel to the left"
 msgstr "Alinear el panel a la izquierda"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Mostrar marcado rápido"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Mostrar página de inicio"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Mostrar las últimas pestañas abiertas"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
-msgstr "Mostrar las últimas etiquetas sin cargar"
+msgstr "Mostrar las últimas pestañas sin cargar"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Visualizar página en blanco"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Visualizar motor de búsqueda predeterminado"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Visualizar página personalizada"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonés (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Pestaña nueva"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Pestaña actual"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Iconos"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Iconos pequeños"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Texto"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Iconos y texto"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Texto al lado de los iconos"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automático (GNOME o entorno)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Servidor proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Sin servidor proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "El estilo de la barra de herramientas"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Siempre usar las tipografías que elija"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 "Usar las tipografías elegidas por el usuario en vez de las elegidas por los "
 "sitios web"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "No se pudo cargar la configuración: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Valor de configuración no válido «%s»"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Fallo al inyectar hoja de estilos:: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:984
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Mostrar títu_lo de la pestaña"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Mostrar solo el _icono de la pestaña"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Cerrar pestaña a la d_erecha"
+msgstr[1] "Cerrar pestañas a la d_erecha"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Confiar en este sitio"
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Seguridad desconocida"
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s quiere guardar una base de datos HTML5."
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
-msgstr "_Denegar "
+msgstr "_Denegar"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Permitir"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s quiere conocer su ubicación actual."
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Error - %s"
+msgid "'%s' can't be found"
+msgstr "No se puede encontrar «%s»"
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "No se pudo cargar la página «%s»."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "No se pudo cargar la página «%s»:"
 
-#: ../midori/midori-view.c:1500 ../midori/midori-view.c:1644
-msgid "Try again"
-msgstr "Inténtelo de nuevo"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Comprobar errores de escritura en la dirección"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Asegúrese de que hay un cable de Ethernet conectado o la tarjeta inalámbrica "
+"está activada"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Compruebe que la configuración de red sea la correcta"
 
-#: ../midori/midori-view.c:1641
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Intentar de nuevo"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Error – %s"
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Algo falló en «%s»."
 
-#: ../midori/midori-view.c:1789 ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Inténtelo de nuevo"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Enviar un mensaje a %s"
 
-#: ../midori/midori-view.c:2656
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Añadir motor de _búsqueda…"
 
-#: ../midori/midori-view.c:2699 ../midori/midori-view.c:3003
-msgid "Inspect _Element"
-msgstr "Inspeccionar _elemento"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Abrir el en_lace"
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Abrir enlace en una _pestaña nueva"
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Abrir enlace en pestaña en p_rimer plano"
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Abrir enlace en pestaña en _segundo plano"
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Abrir enlace en una _ventana nueva"
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr "Abrir enlace como a_plicación web"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copiar de_stino del enlace"
 
-#: ../midori/midori-view.c:2773
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Guardar como…"
 
-#: ../midori/midori-view.c:2783
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Abrir _imagen en nueve ventana"
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Abrir _imagen en una pestaña nueva"
 
-#: ../midori/midori-view.c:2788
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copiar im_agen"
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Guardar i_magen"
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Abrir en _Visor de imágenes"
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copiar _dirección del vídeo"
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
-msgstr "Guardar _vídeo"
-
-#: ../midori/midori-view.c:2804
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Descargar _vídeo"
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Abrir dirección en una _pestaña nueva"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Buscar _con"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Buscar en la web"
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
-msgstr "Abrir dirección en una _pestaña nueva"
-
-#: ../midori/midori-view.c:2926
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Abrir _marco en una pestaña nueva"
 
-#: ../midori/midori-view.c:3147
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspeccionar _elemento"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Abrir o descargar el archivo desde %s"
 
-#: ../midori/midori-view.c:3161 ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../midori/midori-view.c:3170
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipo de archivo: «%s»"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipo de archivo: %s («%s»)"
 
-#: ../midori/midori-view.c:3210
+#: ../midori/midori-view.c:2778
 #, 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:3223 ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Abrir %s"
 
-#: ../midori/midori-view.c:3771
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspeccionar la página - %s"
 
-#: ../midori/midori-view.c:4335
-#, c-format
-msgid "No documentation installed"
-msgstr "No hay documentación instalada"
-
-#: ../midori/midori-view.c:4411
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori no almacena información personal:"
 
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "No se está almacenando ningún histórico o cookie web."
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Las extensiones están desactivadas."
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3901
 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:4415
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori evita que los sitios web rastreen al usuario:"
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Las URL de referencia se reducen al nombre de equipo."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "La prelectura de DNS está desactivada."
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "El idioma y la zona horaria no son revelados a los sitios web."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3906
 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:4460
+#: ../midori/midori-view.c:3949
 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:4509
-msgid "Page loading delayed"
-msgstr "Carga de página retrasada"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Se retrasó la carga de la página:"
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:4000
 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:4511
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Cargar página"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Página en blanco"
 
-#: ../midori/midori-view.c:4890
-msgid "_Duplicate Tab"
-msgstr "_Duplicar pestaña"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Label"
-msgstr "Mostrar títu_lo de la pestaña"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Icon Only"
-msgstr "Mostrar solo el _icono de la pestaña"
-
-#: ../midori/midori-view.c:4902
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5596
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "anterior"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5615
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "siguiente"
 
-#: ../midori/midori-view.c:5629
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Imprimir imágenes de fondo"
 
-#: ../midori/midori-view.c:5630
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
-msgstr "Define si se deberían imprimir las imágenes de fondo"
+msgstr "Si se deben imprimir las imágenes de fondo"
 
-#: ../midori/midori-view.c:5660
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Características"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1426,27 +1496,27 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundo"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s restantes"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "El archivo descargado es erróneo."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1455,131 +1525,127 @@ msgstr ""
 "que el archivo probablemente está incompleto o se modificó después de su "
 "descarga."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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:347
+#: ../midori/midori-download.vala:368
 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:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "No hay suficiente espacio para descargar «%s»."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Marcación rápida"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Pulse aquí para añadir un acceso directo"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Escriba la dirección del acceso directo"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Escriba el título del acceso directo"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "¿Está seguro de que quiere eliminar este acceso directo?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Cuando Midori inicie:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Página de inicio:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Usar la _página actual"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Usar la página actual como página de inicio"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Familia tipográfica proporcional"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Tipo de letra predeterminado utilizado para mostrar texto"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Familia tipográfica de ancho fijo"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Tamaño mínimo de tipografía"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Tamaño mínimo de tipografía utilizado para mostrar texto"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codificación preferida"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Cargar imágenes automáticamente"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Activar corrección ortográfica"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Activar scripts"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Activar compatibilidad con WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Activar complementos de Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Ampliar textos e imágenes"
@@ -1591,134 +1657,141 @@ msgstr "Permitir ventanas emergentes de scripts"
 #: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
-"Configura si se permite que los scripts puedan abrir ventanas emergentes "
+"Si se permite que los scripts puedan abrir ventanas emergentes "
 "automáticamente"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Nivel de ampliación predeterminado"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Factor inicial con que ampliar las pestañas nuevas"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Idiomas preferidos"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 msgid ""
 "A comma separated list of languages preferred for rendering multilingual "
 "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 msgstr ""
-"Una lista separada por comas de idioma preferidos para procesar páginas "
-"multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;"
-"q=0.667\""
+"Una lista separada por comas de idioma preferidos para procesar páginas en "
+"múltiples idiomas, por ejemplo «de», «ru,nl» o «en-us;q=1.0, fr-fr;q=0.667»"
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Guardar los archivos descargados en:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navegación"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Estilo de la barra de herramientas:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Abrir las páginas nuevas en:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Comportamiento de pestaña nueva:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Botón de cerrar en las pestañas"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Siempre mostrar la barra de pestañas"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Abrir pestañas junto a la actual"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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 "
+"Si se desea que las pestañas nuevas se abran al lado de la pestaña actual o "
 "después de la última"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Abrir pestañas en segundo plano"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor de texto"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregador de noticias"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Red"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nombre de host"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Puerto"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Tipos de proxy soportados:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Caché web"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identificar como"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Eliminar cookies antiguas después de:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Número máximo de días para conservar las cookies"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Solo aceptar cookies de los sitios que visite"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Bloquear cookies enviadas por sitios de terceros"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1726,123 +1799,122 @@ msgstr ""
 "Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles "
 "de usuario para fines publicitarios."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Activar caché local de aplicación web"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Activar compatibilidad con almacenamiento local HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Si se debe acortar el encabezado de «Referer» al nombre del equipo"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Eliminar páginas del histórico después de:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Número máximo de días para conservar el histórico"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Gestionar motores de búsqueda"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Añadir motor de búsqueda"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editar motor de búsqueda"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descripción:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Abreviatura:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gestionar los motores de búsqueda"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "_Predeterminado"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, 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/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "No se pudieron guardar los motores de búsqueda. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Histórico"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Marcadores e histórico"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "No se pudo inicializar el histórico: %s"
+msgid "Search for %s"
+msgstr "Buscar %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "No se pudo seleccionar del histórico: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Buscar %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Buscar con…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Buscar con %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Abrir con"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Elija una aplicación u orden para abrir «%s»:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "No se pudo ejecutar la aplicación externa."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI no válido"
 
@@ -1861,85 +1933,143 @@ msgstr "Siguiente"
 
 #: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
-msgstr "Coincidir mayúsculas "
+msgstr "Coincidir mayúsculas"
 
 #: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Cerrar la barra de búsqueda"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Error al añadir marcador: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d marcador"
+msgstr[1] "%d marcadores"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subcarpeta"
+msgstr[1] "%d subcarpetas"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Carpeta vacía"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "La carpeta contiene %s y ningún marcador"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Error al actualizar marcador: %s\n"
+msgid "Folder containing %s"
+msgstr "La carpeta contiene %s"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "La carpeta contiene %s y %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Marcador que lleva a: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s y ningún marcador"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s y %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editar el marcador seleccionado"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Eliminar el marcador seleccionado"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Añadir una carpeta nueva"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separador</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Abrir en una _pestaña nueva"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Buscar marcadores"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Histórico"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Hoy"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Hace una semana"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "No se pudo quitar el elemento del histórico: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
-msgstr "¿Está seguro de que quiere eliminar todos los elementos del histórico?"
+msgstr ""
+"¿Está seguro de que quiere eliminar todos los elementos del histórico?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Añadir a marcadores el elemento del histórico seleccionado"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Eliminar el elemento seleccionado del histórico"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Vaciar todo el histórico"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Buscar en el histórico"
 
@@ -1967,120 +2097,69 @@ msgstr "Contraseña"
 msgid "_Remember password"
 msgstr "_Recordar contraseña"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "No se pudo cargar el ícono llamado «%s»"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "No se pudo cargar el ícono stock «%s»"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Los cuadros de animación están rotos"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Ninguna"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "La propiedad «%s» no es válida para %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Elegir archivo"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Elegir carpeta"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 día"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 semana"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mes"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 año"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferencias de %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurar los filtros de publicidad"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"Escriba la dirección de una lista de filtros preconfigurados en el cuadro de "
-"texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar "
-"más listas en %s."
+"Parece que esta página contiene un script de usuario. ¿Quiere instalarlo?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Editar regla"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regla:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_oquear imagen"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_oquear enlace"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Bloqueador de publicidad"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr ""
-"Parece que esta página contiene un script de usuario. ¿Quiere instalarlo?"
-
-#: ../extensions/addons.c:223
-msgid "_Install user script"
-msgstr "_Instalar script de usuario"
+#: ../extensions/addons.c:223
+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
@@ -2096,16 +2175,16 @@ msgstr "_Instalar estilo de usuario"
 msgid "Don't install"
 msgstr "No instalar"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Scripts de usuario"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Estilos de usuario"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Error"
 
@@ -2127,40 +2206,40 @@ msgstr "Eliminar estilo de usuario"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "El archivo <b>%s</b> se eliminará permanentemente."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Abrir en editor de texto"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Abrir carpeta de destino"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Añadir complemento nuevo"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Eliminar complemento seleccionado"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Complementos de usuario"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "No se puede monitorizar la carpeta «%s»: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Compatibilidad con scripts y estilos de usuario"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Pestañas de colores"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Colorear pestañas de distintos colores"
 
@@ -2169,11 +2248,11 @@ msgstr "Colorear pestañas de distintos colores"
 msgid "Cookie Manager"
 msgstr "Gestor de cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Eliminar todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2181,31 +2260,31 @@ msgstr ""
 "Elimina todas las cookies mostradas. Si se establece un filtro, solo se "
 "eliminarán las cookies que coincidan con él."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Expandir todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Contraer todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "¿Está seguro de que quiere eliminar todas las cookies?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Solo se eliminarán las cookies visibles que coincidan con el filtro."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Al final de la sesión"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2223,15 +2302,15 @@ msgstr ""
 "<b>Expira</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Sí"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "No"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2240,20 +2319,20 @@ msgstr ""
 "<b>Dominio</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nombre"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandir todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Contraer todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Buscar cookies por nombre de dominio"
 
@@ -2273,26 +2352,47 @@ msgstr "Copiar direcciones de las pestañas"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copiar las direcciones de todas las pestañas al portapapeles"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Carga retardada"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Retardo en segundos hasta cargar la página:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
-msgstr "Retrasar la carga de la página hasta que efectivamente use la pestaña."
+msgstr ""
+"Retrasar la carga de la página hasta que efectivamente use la pestaña."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Pulse dos veces para más información"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Esta extensión muestra mensajes de error de glib en el área de notificación."
 
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Ocurrió un error cuando se intentaba descargar un archivo con el complemento "
-"siguiente:\n"
+"Se produjo un error al intentar descargar un archivo con el siguiente "
+"complemento:\n"
+"%s\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Continuar sin este complemento."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2326,35 +2426,35 @@ msgstr "Gestor de descargas externo - CommandLine"
 #: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
-"No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en "
-"los datos XML."
+"No se pudieron encontrar los elementos necesarios de tipo «entry» Atom en "
+"los datos del XML."
 
 #: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr ""
-"No se ha podido encontrar los elementos necesarios de tipo \"feed\" Atom en "
-"los datos XML."
+"No se pudieron encontrar los elementos necesarios de tipo «feed» Atom en los "
+"datos del XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Última actualización: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Canales"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Añadir nuevo canal"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Eliminar canal"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Canales"
 
@@ -2373,42 +2473,42 @@ msgstr "El formato del canal no es compatible."
 msgid "Failed to parse XML feed: %s"
 msgstr "No se pudo analizar el canal XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 "No se pudo encontrar el elemento de tipo «channel» en los datos RSS del XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Se encontró una versión de RSS no compatible."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 "No se pudieron encontrar los elementos «item» RSS necesarios en los datos "
 "del XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "No se pudieron encontrar los elementos «channel» RSS necesarios en los datos "
 "del XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "El canal «%s» ya existe"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Error al cargar el canal «%s»"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel de canales"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Lector de canales Atom/RSS"
 
@@ -2429,125 +2529,414 @@ msgstr ""
 "Contraseña maestra necesaria\n"
 "para abrir la base de datos de contraseñas"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "¿Quiere recordar la contraseña en esta página?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nunca para esta página"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Alternar estado del histórico de formularios"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 "Activar o desactivar el histórico de formularios para la pestaña actual."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "No se pudo abrir la base de datos: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
-"Solo activar el histórico de formularios mediante el atajo de teclado (Ctrl"
-"+Mayús+F) por pestaña"
+"Solo activar el histórico de formularios mediante el atajo de teclado "
+"(Ctrl+Mayús+F) por pestaña"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Completador de histórico de formularios"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Almacena el histórico de datos introducidos en formularios"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
-msgstr "No se pudo seleccionar del historial\n"
+msgstr "No se pudieron seleccionar sugerencias\n"
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "No hay pestañas sin visitar"
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Lista del histórico"
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Comportamiento de cierre de pestañas"
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Cambiar a la última pestaña vista"
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Cambiar a la pestaña más nueva"
 
-#: ../extensions/history-list.vala:316
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Destellar ventana en pestañas en segundo plano"
 
-#: ../extensions/history-list.vala:448
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Pestaña siguiente (histórico)"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Siguiente pestaña nueva del histórico"
 
-#: ../extensions/history-list.vala:458
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Pestaña anterior (histórico)"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Pestaña nueva anterior del histórico"
 
-#: ../extensions/history-list.vala:468
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Mostrar pestaña en el fondo (histórico)"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Mostrar la pestaña actual seleccionada en el fondo"
 
-#: ../extensions/history-list.vala:596
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Histórico"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Mover a la última pestaña se utiliza cuando se cambian o se cierran pestañas"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Falló SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Aceptar en esta sesión"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloquear"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "No se pudo abrir la base de datos de la extensión: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "No se ha podido ejecutar sentencia en base de datos: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "¿Está seguro de que desea eliminar todos los permisos de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "¿Desea eliminar todos los permisos de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Esta acción eliminará todos los permisos de JavaScript. Se le pedirán "
+"permisos nuevamente para cada sitio que visite."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instancia de administración"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instancia para el gestor global de NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurar NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"A continuación se muestra una lista de todos los sitios web y la política "
+"establecida para ellos. Puede eliminar las políticas marcando las entradas y "
+"pulsando en <i>Eliminar</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Política"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Eliminar _todo"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "P_ermitir scripts en todos los sitios"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Bloquea_r scripts en dominios desconocidos de forma predeterminada"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Establecer permisos en los dominios de segundo nivel"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Denegar %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permitir %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permitir %s durante esta sesión"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Ventana del navegador"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "La instancia del navegador Midori pertenece a"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vista"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+"La instancia de visualización de Midori a la que pertenece esta vista"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Estado del icono del menú"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Estado del icono de menú para mostrar en la barra de estado"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Sin determinar"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permitido"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mixto"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Denegado"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Ocurrió un error grave que impide que la extensión NoJS continúe. Debería "
+"desactivarla"
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Error en la extensión NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Motivo"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "No se pudo crear la carpeta de configuración para la extensión: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "No se pudo crear la carpeta de configuración para la extensión."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "No se pudo abrir la base de datos de la extensión."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"No se pudo configurar la estructura de la base de datos para la extensión."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instancia de extensión"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "La instancia de extensión de Midori para esta extensión"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instancia de aplicación"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+"La instancia de la aplicación de Midori a la que esta extensión pertenece"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instancia de base de datos"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Puntero a la instancia de base de datos sqlite usada para esta extensión"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Ruta de la base de datos"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Ruta a la instancia de base de datos sqlite usada por esta extensión"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permitir todos los sitios"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Si se activa, esta extensión no comprobará las políticas de cada sitio, sino "
+"que las permitirá."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Solo segundo nivel"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Si se activa, la extensión reducirá cada dominio a su segundo nivel "
+"(www.ejemplo.org se reducirá a ejemplo.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Política de dominio desconocida"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Política para dominios desconocidos"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Aceptar temporalmente"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gestos del ratón"
@@ -2558,7 +2947,7 @@ msgstr "Controlar Midori moviendo el ratón"
 
 #: ../extensions/shortcuts.c:109
 msgid "Reload page or stop loading"
-msgstr "Recarga la página o detiene el proceso de carga"
+msgstr "Recarga la página o detiene la carga"
 
 #: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
@@ -2576,11 +2965,11 @@ msgstr "Atajos"
 msgid "View and edit keyboard shortcuts"
 msgstr "Ver y editar los atajos de teclado"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Reloj en la barra de estado"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Mostrar fecha y hora en la barra de estado"
 
@@ -2596,23 +2985,27 @@ msgstr "Scripts"
 msgid "Netscape plugins"
 msgstr "Complementos de Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activar complementos de Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
-msgstr "Características en la barra de estado"
+msgstr "Características de la barra de estado"
 
 #: ../extensions/statusbar-features.c:260
 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:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panel de pestañas"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Panel de p_estañas"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Mostrar las pestañas en un panel vertical"
 
@@ -2624,79 +3017,70 @@ msgstr "Solo iconos en pestañas de manera predeterminada"
 msgid "New tabs have no label by default"
 msgstr "Nuevas pestañas sin etiqueta por defecto"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personalizar la barra de tareas"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr ""
-"Seleccione los elementos que se mostrarán en la barra de herramientas. Los "
-"elementos pueden ser reordenados arrastrando y soltando."
+"Seleccione los elementos que se mostrarán en la barra de herramientas. Estos "
+"pueden reordenarse arrastrándolos."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Elementos disponibles"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Elementos utilizados"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Personalizar la barra de herramientas…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor de la barra de herramientas"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Editar fácilmente el diseño de la barra de herramienta"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Almacenar en caché la comunicación HTTP en el disco"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Error al cargar cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Limpiar datos privados"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Limpiar datos privados"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Limpiar los datos siguientes:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Últimas _pestañas abiertas"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Limpiar los datos privados al _salir de Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Inicios de sesión y _contraseñas guardadas"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies y datos de sitios web"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Iconos de sitios web"
 
@@ -2704,81 +3088,55 @@ msgstr "Iconos de sitios web"
 msgid "Open tabs"
 msgstr "Pestañas abiertas"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Más pestañas abiertas…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "No se pudo vaciar el histórico: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "No se pudieron quitar elementos antiguos del histórico: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "falló la operación ATTACH de la base de datos anterior"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "falló la importación desde la base de datos anterior"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "falló al revertir la transacción"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "falló la operación DETACH"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Imposible crear tabla de marcadores: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Error al añadir marcador: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Imposible importar desde la vieja base de datos: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Falló la actualización del marcador: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "No se pudieron guardar los marcadores. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Falló la eliminación del elemento del marcador: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "No se pudo guardar la configuración. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "No se pudo cargar la sesión: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "No se pudo guardar la sesión. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "No se pudo guardar la papelera. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
@@ -2786,107 +3144,77 @@ msgstr ""
 "Midori se cerró inesperadamente la última vez que lo abrió. Puede informar "
 "del problema en %s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modificar _preferencias"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Desactivar todas las _extensiones"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Mostrar un dialogo después de que Midori se cuelgue"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Descartar las pestañas viejas"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Mostrar registro del ú_ltimo cuelgue"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Ejecutar en el _depurador"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "No se pudieron cargar los marcadores: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "No se pudo cargar la sesión: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "No se pudo cargar la papelera: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "No se pudo cargar el histórico: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Ocurrieron los errores siguientes:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Falló SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Aceptar en esta sesión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "No se pudo abrir la base de datos para la extención: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "No se ha podido ejecutar sentencia en base de datos: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "¿Está seguro de que quiere eliminar todos los permisos de cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "¿Quiere eliminar todos los permisos de cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2894,20 +3222,20 @@ msgstr ""
 "Esta acción eliminará todos los permisos de cookies. Se le preguntarán los "
 "permisos de nuevo para cada sitio que visite."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Gestor de permisos de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instancia del gestor de permisos de cookies actual"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configurar permisos de cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2920,23 +3248,14 @@ msgstr ""
 "<i>Eliminar</i>.También puede añadir una política de dominio escribiendo el "
 "dominio a continuación, eligiendo la política y pulsando en <i>Añadir</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Dominio"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Política"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Eliminar _todo"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+"Política para las cookies provenientes de dominios que no estén en la lista: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "_Pedir política para un dominio si se desconoce"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Solicitar una decisión"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2950,132 +3269,68 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Error en la extensión del gestor de permisos de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Motivo"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "No se pudo crear la carpeta de configuración para la extensión: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "No se pudo crear la carpeta de configuración para la extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "No se pudo abrir la base de datos de la extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr ""
-"No se pudo configurar la estructura de la base de datos para la extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "No se pudo determinar la política de cookies global a fijar para el dominio: "
 "%s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Hasta el fin de la sesión"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "El sitio web %s quiere almacenar %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "El sitio web %s quiere almacenar una cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Hay varios sitios web que quieren almacenar %d cookies en total."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Aceptar para esta _sesión"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "De_negar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Denegar esta _vez"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Ruta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valor"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Fecha de caducidad"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instancia de extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "La instancia de extensión de Midori para esta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instancia de aplicación"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-"La instancia de la aplicación de Midori a la que esta extensión pertenece"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instancia de base de datos"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-"Puntero a la instancia de base de datos sqlite usada para esta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Ruta de la base de datos"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Ruta a la instancia de base de datos sqlite usada por esta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Preguntar política desconocida"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
-"Si se activa esta extensión preguntará la política para cada dominio "
-"desconocido.Si se desactiva esta extensión usa la configuración de cookies "
-"global de Midori."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Sin determinar"
+"Política que se usará en los dominios no configurados individualmente. Solo "
+"actuará para potenciar la restricción de la política global de cookies "
+"establecida en la configuración de Midori."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3085,19 +3340,68 @@ msgstr "Gestor de seguridad de cookies"
 msgid "Manage cookie permission per site"
 msgstr "Gestionar permisos de cookie por sitio"
 
-#: ../extensions/apps.vala:82
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "No se pudo obtener el icono de la aplicación en %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Falló la creación del lanzador nuevo (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Se ha creado el lanzador"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Ahora puede ejecutar <b>%s</b> desde su lanzador o menú"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Error al crear el lanzador"
+
+#: ../extensions/apps.vala:191
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "_Perfil nuevo"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Crea un perfil nuevo e independiente y un lanzador"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "_Aplicación nueva"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Crea una aplicación nueva para un sitio web específico"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Error al abrir"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Crear _lanzador"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Gestor de aplicaciones web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Gestionar los sitios web instalados como aplicaciones"
 
@@ -3105,43 +3409,193 @@ msgstr "Gestionar los sitios web instalados como aplicaciones"
 msgid "Transfers"
 msgstr "Transferencias"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Se ha producido un error al abrir la descarga: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Abrir la _carpeta de destino"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copiar destino del _enlace"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Se ha descargado el archivo «<b>%s</b>»."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "Se han descargado «<b>%s</b>» y otros %d archivos."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transferencia completa"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Se está descargando algunos archivos"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Cerrar Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Se cancelarán las descargas si Midori se cierra."
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Gestor de transferencias"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Ver los archivos descargados"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Error al actualizar la base de datos: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Se ha producido un error al seleccionar de la base de datos: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "No se pudo importar la sesión: %s"
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestor de pestañas y sesiones."
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Esta extensión provee una lista de tareas para las actualizaciones o eventos "
+"recurrentes."
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+"Se ha producido un error al añadir una nota nueva a la base de datos: %s\n"
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Error al eliminar la nota de la base de datos: %s\n"
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Se ha producido un error al renombrar la nota: %s\n"
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Se ha producido un error al actualizar la nota : %s\n"
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notas"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nota nueva"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Crea una nota nueva vacía sin relación con las páginas abiertas"
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nota nueva"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "No se pudo seleccionar desde la base de datos de notas: %s\n"
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Renombrar nota"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copiar nota al portapapeles"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Eliminar nota"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiar selección como una nota"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Guardar clips de texto de las páginas web como notas"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueador de publicidad"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquear publicidad de acuerdo a una lista de filtros"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurar los filtros de publicidad"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_oquear imagen"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_oquear enlace"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editar regla"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regla:"
index 1589afff74db84a163ee749debb6ff716e71af39..1678212bc86b2ee819191c1cd2f49e4071b3a1c0 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -7,1431 +7,1430 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.0.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 08:15+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Kristjan Vool <vool.kristjan@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-10-23 14:51+0000\n"
+"Last-Translator: Kristjan Vool <tictac7x@gmail.com>\n"
 "Language-Team: \n"
-"Language: Estonian\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-Launchpad-Export-Date: 2014-11-26 05:59+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: Estonian\n"
 "X-Poedit-Language: Estonian\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Veebi lehitsemine stiilselt"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer;Web;Veeb;Brauser;Browser"
+msgid "Web Browser"
+msgstr "Veebibrauser"
 
 #: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:162
-#: ../midori/midori-app.c:1459
-#: ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4070
-msgid "Midori"
-msgstr "Midori"
-
-#: ../data/midori.desktop.in.h:4
 msgid "Midori Web Browser"
 msgstr "Midori veebibrauser"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Veebi lehitsemine stiilselt"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Uus privaatne aken"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;Web;Veeb;Brauser;Browser"
 
-#: ../data/midori.desktop.in.h:6
-#: ../midori/midori-browser.c:1404
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Uus kaart"
 
-#: ../data/midori.desktop.in.h:7
-#: ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Uus aken"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Veebibrauser"
+msgid "New Private Browsing Window"
+msgstr "Uus privaatne aken"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori privaatne lehitsemine"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Ava uus privaatne aken"
-
-#: ../data/midori-private.desktop.in.h:3
-#: ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privaatne lehitsemine"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Ava uus privaatne aken"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Pilt salvestati asukohta: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADDRESS käivitamine veebirakendusena"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "FOLDER kasutamine eelistuste kaustana"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privaatne veebilehtisemine, muudatusi ei salvestata"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "Kaasaskantav viis, kõik käivitatavad failid salvestatakse samasse kohta"
+msgstr ""
+"Kaasaskantav viis, kõik käivitatavad failid salvestatakse samasse kohta"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Tavaline GTK+ aken koos WebKit'iga, mis on sarnane GtkKäivitajaga"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Näita diagnostika teavet"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Käivita gdb'ga ja salvesta tagasijälitus kokkujooksmisse"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Käivita täpsustatud failiformaat javaskriptina"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Tee antud lingist pisipilt"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Käivita see kohandatud käsk"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Saadaolevate käskude loendamiseks käivita koos -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Näita programmi versiooni"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Aadressid"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Linkide blokeerimine vastavalt tavalisele väljenduse PATTERN"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Midori taaskäivitama pärast SECONDS sekundilist tegevusetust"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Viga: \"gdb\"-d pole võimalik leida\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "Märkused, ettepanekud ja vead palun sinna:"
+msgstr "Märkused, ettepanekud ja vead saada:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
-msgstr "Kontrolli uusi versioone:"
+msgstr "Uue versiooni kontrollimine:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Tekkis ootamatu viga"
 
-#: ../midori/midori-app.c:1360
-#: ../midori/midori-browser.c:6183
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Järjehoidjad"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Lisa _järjehoidjatesse..."
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
-msgstr "_Laiendid"
+msgstr "_Pluginad"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363
-#: ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Ajalugu"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Kasutaja_skriptid"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Kasutaja_stiilid"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Uus _kaart"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Allalaadimised"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
-msgstr "Netscape _laiendused"
+msgstr "Netscape _pluginad"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Suletud kaardid"
 
-#: ../midori/midori-app.c:1370
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Uus _kaust"
 
-#: ../midori/midori-app.c:1426
-#: ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Aadressid]"
 
-#: ../midori/midori-array.c:551
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Faili ei leitud."
 
-#: ../midori/midori-array.c:576
-#: ../midori/midori-array.c:615
-#: ../midori/midori-array.c:639
-#: ../midori/midori-array.c:649
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Väärvormistatud dokument."
 
-#: ../midori/midori-array.c:658
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Tundmatu järjehoidjate vorming."
 
-#: ../midori/midori-browser.c:336
-#: ../midori/midori-browser.c:5458
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Mine edasi järgmisele leheküljele"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:343
-#: ../midori/midori-browser.c:5466
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Mine järgmisele ala-veebilehele"
 
-#: ../midori/midori-browser.c:448
-#: ../midori/midori-browser.c:5407
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Veebiotsing…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Laadi praegune lehekülg uuesti"
 
-#: ../midori/midori-browser.c:456
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Peata praeguse lehekülje laadimine"
 
-#: ../midori/midori-browser.c:526
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
-msgstr "Leakirja %s uuendamine ebaõnnestus\n"
+msgstr "Peakirja %s uuendamine ebaõnnestus\n"
 
-#: ../midori/midori-browser.c:565
-#: ../midori/midori-browser.c:621
-#: ../midori/midori-browser.c:624
-#: ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
-msgstr "\"%s\" on vale %s väärtus"
+msgstr "Väärtus \"%s\" on %s jaoks vale"
 
-#: ../midori/midori-browser.c:573
-#: ../midori/midori-browser.c:644
-#: ../midori/midori-browser.c:7006
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
-msgstr "Ootamatu seade \"%s\""
+msgstr "Ootamatu eelistus \"%s\""
 
-#: ../midori/midori-browser.c:581
-#: ../midori/midori-browser.c:654
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Ootamatu toiming \"%s\"."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s - privaatne lehitsemine"
 
-#: ../midori/midori-browser.c:841
-#: ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Ajaloo kirjutamine ebaõnnestus: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Vali [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Uus kaust"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Kausta muutmine"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Muuda kausta"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Uus järjehoidja"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Muuda järjehoidjat"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Järjehoidjale nime ning salvestuskoha valimine"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Vali sellele järjehoidjale nimi ning asukoht, kus seda kuvada."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Lisa kiirvalimiste lehele"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Vali sellele kaustale nimi ning asukoht, kus seda kuvada."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Tööriista_ribal näitamine"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Järjehoidja_ribal näitamine"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Veebi_rakendusena käivitamine"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Lisa kiirvalimiste lehele"
 
-#: ../midori/midori-browser.c:1161
-#: ../midori/midori-browser.c:4565
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Salvesta fail kui"
 
-#: ../midori/midori-browser.c:1171
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Salvesta ühised _ressurssid"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Avati uus aken"
 
-#: ../midori/midori-browser.c:1404
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Avati uus aken"
 
-#: ../midori/midori-browser.c:1422
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Viga pildi avamisel!"
 
-#: ../midori/midori-browser.c:1423
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Valitud pildi avamine vaikimisi pildivaaturiga pole võimalik."
 
-#: ../midori/midori-browser.c:1429
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Viga pildi allalaadimisel!"
 
-#: ../midori/midori-browser.c:1430
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Valitud pilti pole võimalik allalaadida."
 
-#: ../midori/midori-browser.c:1507
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Salvesta fail"
 
-#: ../midori/midori-browser.c:2486
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Taaslaadi leht ilma vahemällu salvestamata"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Ava fail"
 
-#: ../midori/midori-browser.c:2614
+#: ../midori/midori-browser.c:2692
 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 "Ülevaloleva lingi kasutamiseks tuleb see avada uudistevoona. Selle jaoks on tavaliselt olemas menüü või nup nimega \"Uus tellimus\", \"Uus uudistevoog\" või sarnane. Teisel juhul ava eelistused, rakendused Midoris ning vali uudistevoo rakendus. Järgmisel korral, kui vajutad uudistevoo peale, siis see lisatakse automaatselt."
+"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 ""
+"Ülevaloleva lingi kasutamiseks tuleb see avada uudistevoona. Selle jaoks on "
+"tavaliselt olemas menüü või nup nimega \"Uus tellimus\", \"Uus uudistevoog\" "
+"või sarnane. Teisel juhul ava eelistused, rakendused Midoris ning vali "
+"uudistevoo rakendus. Järgmisel korral, kui vajutad uudistevoo peale, siis "
+"see lisatakse automaatselt."
 
-#: ../midori/midori-browser.c:2620
-#: ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Uus uudistevoog"
 
-#: ../midori/midori-browser.c:2652
-#: ../midori/midori-browser.c:5482
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Uus järjehoidja..."
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2701
-#: ../midori/midori-browser.c:5358
-msgid "Share this page"
-msgstr "Jaga seda lehte"
-
-#: ../midori/midori-browser.c:3177
-#: ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Tühi"
 
-#: ../midori/midori-browser.c:3556
-#: ../midori/midori-browser.c:3557
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Hiirega veebilehitsemise kasutamine"
 
-#: ../midori/midori-browser.c:3559
-msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."
-msgstr "Nupu F7 vajutades lülitatakse hiirega veebilehitsemine sisse või välja. Kui see on lubatud, siis on igal veebilehel olemas tekstikursor."
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Nupu F7 vajutades lülitatakse hiirega veebilehitsemine sisse või välja. Kui "
+"see on lubatud, siis on igal veebilehel olemas tekstikursor."
 
-#: ../midori/midori-browser.c:3562
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Luba _hiirega veebilehitsemine"
 
-#: ../midori/midori-browser.c:3983
-#: ../midori/midori-browser.c:5930
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Ajaloo kirjutamine ebaõnnestus: %s\n"
-
-#: ../midori/midori-browser.c:4297
-#: ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Ava kõik _kaartidena"
 
-#: ../midori/midori-browser.c:4304
-#: ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799
-#: ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Ava uues _kaardis"
-
-#: ../midori/midori-browser.c:4307
-#: ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4888
-#: ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801
-#: ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Ava uues _aknas"
 
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4398
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4399
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4401
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4420
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Impordi järjehoidjad..."
 
-#: ../midori/midori-browser.c:4423
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Impordi järjehoidjad..."
 
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Rakendus:"
 
-#: ../midori/midori-browser.c:4499
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importimine XBEL või HTML failist"
 
-#: ../midori/midori-browser.c:4527
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Impordi failist"
 
-#: ../midori/midori-browser.c:4539
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Jäjehoidjate importimine ebaõnnestus"
 
-#: ../midori/midori-browser.c:4570
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL järjehoidjad"
 
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape järjehoidjad"
 
-#: ../midori/midori-browser.c:4589
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori järjehoidjad saavad olla ainult XBEL (*.xbel) või Netscape (*.html) vormingus"
+msgstr ""
+"Midori järjehoidjad saavad olla ainult XBEL (*.xbel) või Netscape (*.html) "
+"vormingus"
 
-#: ../midori/midori-browser.c:4604
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Järjehoidjate eksportimine ebaõnnestus"
 
-#: ../midori/midori-browser.c:4820
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Kiire ning stiilne veebibrauser!"
 
-#: ../midori/midori-browser.c:4821
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Versiooni teabe jaoks ava lehekülg \"about:version\"."
 
-#: ../midori/midori-browser.c:4823
-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 "See rakenduste kogum koosneb vabavaralisest tarkvarast; sul on luba seda tarkvara jagada teistega ning muuta järgides GNU Lesser General Public'u kasutusõigusi, mille andis välja Vabatarkvaraline sihtasutus; sa pead kinni pead pidama vähemalt 2.1 versiooniga litsentsist või uuemast."
+#: ../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 ""
+"See rakenduste kogum koosneb vabavaralisest tarkvarast; sul on luba seda "
+"tarkvara jagada teistega ning muuta järgides GNU Lesser General Public'u "
+"kasutusõigusi, mille andis välja Vabatarkvaraline sihtasutus; sa pead kinni "
+"pead pidama vähemalt 2.1 versiooniga litsentsist või uuemast."
 
-#: ../midori/midori-browser.c:4858
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Kristjan Siimson <epost@ksiimson.se>"
+msgstr ""
+"Kristjan Siimson <epost@ksiimson.se>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Kristjan Siimson https://launchpad.net/~kristjan-siimson\n"
+"  Kristjan Vool https://launchpad.net/~tictac7x\n"
+"  Märt Põder https://launchpad.net/~boamaod\n"
+"  Oskar Murand https://launchpad.net/~oskar-murand"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dubleeri praegust kaarti"
 
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fail"
 
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Ava uus aken"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Ava uus kaart"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Uus privaatne _aken"
 
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Ava fail"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Salvesta leht kui..."
 
-#: ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Salvesta faili"
 
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Lisa _kiirvalimiste lehele"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5341
-msgid "Create _Launcher"
-msgstr "Loo _käivitaja..."
-
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Kinnita _uuendustevoog"
 
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Sulge kaart"
 
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Sulge praegune kaart"
 
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "S_ulge aken"
 
-#: ../midori/midori-browser.c:5357
-msgid "_Share"
-msgstr "_Jaga"
-
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Prindi praegune lehekülg"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "sulge _kõik aknad"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Redigeerimine"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Leia..."
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
-msgstr "Leia leheküljelt sõna või fraas"
+msgstr "Leheküljelt sõna või fraasi otsimine"
 
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
-msgstr "Otsi _järgmist"
+msgstr "Leia _järgmine"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
-msgstr "Otsi _eelmist"
+msgstr "Leia _eelmine"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
-msgstr "Seadista rakenduse eelistused"
+msgstr "Muuda rakenduse eelistusi"
 
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Tööriistaribad"
 
-#: ../midori/midori-browser.c:5409
-msgid "Reload page without caching"
-msgstr "Taaslaadi leht ilma vahemällu salvestamata"
-
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
-msgstr "Tõsta suurendusastet"
+msgstr "Suurenda"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
-msgstr "Kahanda suurendusastet"
+msgstr "Kahanda"
 
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodeering"
 
-#: ../midori/midori-browser.c:5428
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "_Lähtekood"
 
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Vaata _DOM lähtekoodi"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "_Hiirega lehitsemine"
 
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
-msgstr "Vaheta täisekraanivaadet"
+msgstr "Täisekraanvaate sisse-/väljalülitamine"
 
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Keri _vasakule"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Keri _alla"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Keri üle_s"
 
-#: ../midori/midori-browser.c:5446
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Keri _paremale"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Lihttekst"
 
-#: ../midori/midori-browser.c:5452
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Mine"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Mine tagasi eelmisele leheküljele"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5462
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Mine eelmisele ala-leheküljele"
 
-#: ../midori/midori-browser.c:5471
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Edasi või tagasi"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Mine järgmisele alamlehele või järgmisele lehele ajaloos"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Koduleht"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Mine oma koduleheküljele"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Tühjenda prügi"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Ava _suletud kaart"
 
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Loo uus _kaust"
 
-#: ../midori/midori-browser.c:5490
-msgid "_Export bookmarks"
-msgstr "_Ekspordi järjehoidjad...."
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Impordi järjehoidjaid..."
 
-#: ../midori/midori-browser.c:5493
-#: ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Ekspordi järjehoidjaid..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
 msgstr "_Halda otsingumootoreid..."
 
-#: ../midori/midori-browser.c:5496
-msgid "_Clear Private Data"
-msgstr "_Kustuta privaatsed andmed..."
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Kustuta privaatsed andmed"
 
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspekteeri lehte..."
 
-#: ../midori/midori-browser.c:5503
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Eelmine kaart"
 
-#: ../midori/midori-browser.c:5506
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Järgmine kaart"
 
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Liiguta kaart _esimesele kohale"
 
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Liiguta kaarti _tahapoole"
 
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Liiguta kaarti _edasi"
 
-#: ../midori/midori-browser.c:5514
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Liiguta kaarti _lõppu"
 
-#: ../midori/midori-browser.c:5517
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Fokuseeri _praegune kaart"
 
-#: ../midori/midori-browser.c:5520
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Fokuseeri _uus vaade"
 
-#: ../midori/midori-browser.c:5523
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Näita ainult aktiivse kaardi _ikooni"
 
-#: ../midori/midori-browser.c:5526
-msgid "_Duplicate Current Tab"
-msgstr "_Dubleeri praegust kaarti"
-
-#: ../midori/midori-browser.c:5529
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Sulge _teised kaardid"
 
-#: ../midori/midori-browser.c:5532
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "_Ava eelmine seanss"
 
-#: ../midori/midori-browser.c:5535
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../midori/midori-browser.c:5537
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Korduma kippuvad küsimused..."
 
-#: ../midori/midori-browser.c:5540
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Teate probleemist..."
 
-#: ../midori/midori-browser.c:5545
-#: ../midori/midori-browser.c:6202
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Tööriistad"
 
-#: ../midori/midori-browser.c:5552
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menüüriba"
 
-#: ../midori/midori-browser.c:5556
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigatsiooniriba"
 
-#: ../midori/midori-browser.c:5560
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Külg_paneel"
 
-#: ../midori/midori-browser.c:5561
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Külg_paneel"
 
-#: ../midori/midori-browser.c:5564
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Järjehoidjariba"
 
-#: ../midori/midori-browser.c:5568
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Olekuriba"
 
-#: ../midori/midori-browser.c:5577
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automaatne"
 
-#: ../midori/midori-browser.c:5580
-#: ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Hiina (BIG5)"
 
-#: ../midori/midori-browser.c:5583
-#: ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Hiina lihtsustatud (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5587
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Jaapani (SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5590
-#: ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: ../midori/midori-browser.c:5593
-#: ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Vene (KOI8-R)"
 
-#: ../midori/midori-browser.c:5596
-#: ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+msgstr "Unikood (UTF-8)"
 
-#: ../midori/midori-browser.c:5599
-#: ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Lääne (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5602
-#: ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234
-#: ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Kohandatud…"
 
-#: ../midori/midori-browser.c:6108
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Ajaloo vormindamine ebaõnnestus: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Eraldaja"
 
-#: ../midori/midori-browser.c:6115
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Asukoht…"
 
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Veebilehe avamine või otsimine"
 
-#: ../midori/midori-browser.c:6139
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Veebiotsing…"
 
-#: ../midori/midori-browser.c:6141
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Käivita veebiotsing"
 
-#: ../midori/midori-browser.c:6168
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
-msgstr "Ava uuesti varem suletud kaart või aken"
+msgstr "Taasava varem suletud kaart või aken"
 
-#: ../midori/midori-browser.c:6185
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Salvestatud järjehoidjate näitamine"
 
-#: ../midori/midori-browser.c:6218
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Kaardid"
 
-#: ../midori/midori-browser.c:6220
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Avatud kaartidest nimekirja näitamine"
 
-#: ../midori/midori-browser.c:6234
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menüü"
 
-#: ../midori/midori-browser.c:6236
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menüü"
 
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr "Laienduse '%s' seadistuste laadimine ebaõnnestus: %s\n"
+msgstr "Plugina \"%s\" seadistuste laadimine ebaõnnestus: %s\n"
 
-#: ../midori/midori-extension.c:897
-#: ../extensions/addons.c:1675
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr "Laienduse '%s' seadistuste salvestamine ebaõnnestus: %s\n"
+msgstr "Plugina \"%s\" seadistuste salvestamine ebaõnnestus: %s\n"
 
-#: ../midori/midori-locationaction.c:1334
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Ekspordi sertifikaat"
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Sertifikaadi autor on tundmatu."
 
-#: ../midori/midori-locationaction.c:1368
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr "Sertifikaat ei sisalda sama sisu, kui veebileht."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Sertifikaat kinnitatakse alles hiljem."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Sertifikaat on aegunud."
 
-#: ../midori/midori-locationaction.c:1374
-msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list."
-msgstr "Sertifikaat tühistati vastavalt GTlsConnection'si tühistavate sertifikaatide põhjal"
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Sertifikaat tühistati vastavalt GTlsConnection'si tühistavate sertifikaatide "
+"põhjal"
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Sertifikaadi algoritm on ebaturvaline."
 
-#: ../midori/midori-locationaction.c:1378
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Sertifikaadi kinnitamisel tekkis viga."
 
-#: ../midori/midori-locationaction.c:1429
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Ekspordi sertifikaat"
 
-#: ../midori/midori-locationaction.c:1444
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Iseallkirjastatud"
 
-#: ../midori/midori-locationaction.c:1467
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Turvalisuse teave"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1550
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Kleebi ja _mine"
 
-#: ../midori/midori-locationaction.c:1782
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Pole kinnitatud"
 
-#: ../midori/midori-locationaction.c:1790
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
-msgstr "  Turvaline ühendus  "
+msgstr "Turvaline ühendus"
 
-#: ../midori/midori-locationaction.c:1797
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
-msgstr "  Kontrollimata ühendus  "
+msgstr "Kontrollimata ühendus"
 
-#: ../midori/midori-panel.c:314
-#: ../midori/midori-panel.c:316
-#: ../midori/midori-panel.c:480
-#: ../midori/midori-panel.c:483
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Liiguta külgpaneel paremale"
 
-#: ../midori/midori-panel.c:326
-#: ../midori/midori-panel.c:327
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Sulge külgpaneel"
 
-#: ../midori/midori-panel.c:481
-#: ../midori/midori-panel.c:484
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Liiguta külgpaneel vasakule"
 
-#: ../midori/midori-websettings.c:114
-#: ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Näita kiirvalimist"
 
-#: ../midori/midori-websettings.c:115
-#: ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Näita kodulehekülge"
 
-#: ../midori/midori-websettings.c:116
-#: ../midori/midori-frontend.c:367
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Taasta eelnevad kaardid"
 
-#: ../midori/midori-websettings.c:117
-#: ../midori/midori-frontend.c:366
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Taasta eelnevad kaardid uuendamata"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Näita tühja veebilehte"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Näita vaikimisi otsingumootorit"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Näita kohandatud veebilehte"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Jaapani (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Uus kaart"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Uus aken"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Praegune kaart"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikoonid"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Väikesed ikoonid"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Tekst koos ikoonidega"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekst ikoonide kõrval"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automaatne (GNOME või muu keskkond)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Puudub"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Tööriistariba stiil"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Alati kohandatud kirjatüüpide kasutamine"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
-msgstr "Veebilehtede kirjatüüpide asemel kasutatakse kasutaja eelistatavaid kirjatüüpe"
+msgstr ""
+"Veebilehtede kirjatüüpide asemel kasutatakse kasutaja eelistatavaid "
+"kirjatüüpe"
 
-#: ../midori/midori-websettings.c:1410
-#: ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Eelistuste laadimine ebaõnnestus: %s\n"
 
-#: ../midori/midori-websettings.c:1470
-#: ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Vigane eelistuste väärtus '%s'"
 
-#: ../midori/midori-tab.vala:121
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Stiili faili %s lisamine ebaõnnestus"
 
-#: ../midori/midori-view.c:859
-#: ../midori/midori-view.c:984
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Näita kaardi pealkirja"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Näita ainult kaardi _ikooni"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Sulge _paremalolev kaart"
+msgstr[1] "Sulge _paremalolevad kaardid"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Sulge _teine kaart"
+msgstr[1] "Sulge _teised kaardid"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Usalda seda veebilehte"
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Turvalisus teadmata"
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s soovib salvestada HTML5 andmebaasi."
 
-#: ../midori/midori-view.c:1338
-#: ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Keela"
 
-#: ../midori/midori-view.c:1338
-#: ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Luba"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s soovib teada su asukohta."
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Viga - %s"
+msgid "'%s' can't be found"
+msgstr "\"%s\" ei leitud"
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Veebilehe '%s' laadimine ebaõnnestus"
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Veebilehte \"%s\" ei leitud:"
 
-#: ../midori/midori-view.c:1500
-#: ../midori/midori-view.c:1644
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Palun kontrolli, et aadress poleks vigane"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Palun veendu, et interneti kaabel on korralikult ühendatud või traadita "
+"interneti kaart aktiveeritud"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Palun veendu, et su võrgu seaded on õiged"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Proovi uuesti"
 
-#: ../midori/midori-view.c:1641
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Ups - %s"
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Tekkis probleem - '%s'"
 
-#: ../midori/midori-view.c:1789
-#: ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Proovi uuesti"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Sõnumi saatmine - %s"
 
-#: ../midori/midori-view.c:2656
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Lisa otsingumootoritesse..."
 
-#: ../midori/midori-view.c:2699
-#: ../midori/midori-view.c:3006
-msgid "Inspect _Element"
-msgstr "_Inspekteeri elementi..."
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ava _link"
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
-msgstr "Ava link _tagataustal"
+msgstr "Ava link uues _kaardis"
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Ava link uues _kaardis"
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Ava link tagatausta _kaardis"
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Ava link uues _aknas"
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr "Ava link _veebi_rakendusena"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Kopeeri lingi _aadress"
 
-#: ../midori/midori-view.c:2773
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Salvesta kui..."
 
-#: ../midori/midori-view.c:2783
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Ava pilt uues _aknas"
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Ava _pilt uues kaardis"
 
-#: ../midori/midori-view.c:2788
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Kopeeri _pilt ja aadress"
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Salvesta _pilt kui..."
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Ava pildi_vaaturiga"
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Kopeeri video _aadress"
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
-msgstr "Salvesta _video"
-
-#: ../midori/midori-view.c:2804
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Lae alla _video"
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Ava link uues _kaardis"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "_Otsi, kasutades"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "Veebist _otsimine"
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
-msgstr "Ava link uues _kaardis"
-
-#: ../midori/midori-view.c:2926
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Ava uues _kaardis"
 
-#: ../midori/midori-view.c:3150
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "_Inspekteeri elementi..."
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Faili avamine või allalaadimine asukohast %s"
 
-#: ../midori/midori-view.c:3164
-#: ../midori/midori-view.c:3167
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Faili nimi: %s"
 
-#: ../midori/midori-view.c:3173
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
-msgstr "Faili tüüp: '%s'"
+msgstr "Faili tüüp: \"%s\""
 
-#: ../midori/midori-view.c:3175
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
-msgstr "Faili tüüp: %s ('%s')"
+msgstr "Faili tüüp: %s (\"%s\")"
 
-#: ../midori/midori-view.c:3213
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Suurus: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3226
-#: ../midori/midori-view.c:3228
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s"
 
-#: ../midori/midori-view.c:3774
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspekteeri - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Dokumentatsiooni pole paigaldatud"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori ei salvesta  isiklikke andmeid:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Ajalugu ega veebi küpsiseid ei salvestata"
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
-msgstr "Laiendused on keelatud"
+msgstr "Pluginad on keelatud"
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "HTML5 ja kohalik andmebaas on keelatud, rakenduste vahemälu keelatud"
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori takistab veebilehtedel kasutaja jälitamise:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Viitade lingid sisaldavad ainult domeeni nime"
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "DNS-i eelhankimine on keelatud"
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Veebilehed ei näe kasutaja süsteemi keelt ning ajatsooni"
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Veebilehed ei näe, milliseid Flash või muid Netscape laiendusi kasutad"
+msgstr ""
+"Veebilehed ei näe, milliseid Flash või muid Netscape pluginaid sa kasutad"
 
-#: ../midori/midori-view.c:4461
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "Sulgudes olevad numbrid näitavad käivitatava rakenduse versiooni."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Veebilehe laadimine ebaõnnestus"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Veebilehe laadimise viide:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "Veebilehe laadimine ebaõnnestus eelneva ootamatu sulgemise või valede eelistuste tõttu."
+msgstr ""
+"Veebilehe laadimine ebaõnnestus eelneva ootamatu sulgemise või valede "
+"eelistuste tõttu."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Proovi uuesti"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Tühi lehekülg"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Dubleeri kaarti"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Näita kaardi pealkirja"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Näita ainult kaardi _ikooni"
-
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Sulge _teine kaart"
-msgstr[1] "Sulge _teised kaardid"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "eelmine"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "järgmine"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Taustapiltide printimine"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Kas taustapildid prinditakse"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Võimalused"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s %s-st"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1439,159 +1438,155 @@ msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "- %s lõpetamiseni"
+msgstr " - %s lõpetamiseni"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Allalaaditud fail on vigane."
 
-#: ../midori/midori-download.vala:225
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
-msgstr "Lingiga seotud kontrollsumma ei kattu. See tähendab, et fail on arvatavasti poolik või hiljem muudetud."
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Lingiga seotud kontrollsumma ei kattu. See tähendab, et fail on arvatavasti "
+"poolik või hiljem muudetud."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Faili \"%s\" pole võimalik sinna kausta salvestada."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Sul pole õigusi selle asukoha muutmiseks."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "\"%s\" allalaadimiseks pole piisavalt ruumi."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Fail vajab %s-i, aga ainult %s on järel."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Kiirvalimiste leht"
 
-#: ../midori/midori-speeddial.vala:181
-#: ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Vajuta otsetee lisamiseks"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Otsetee aadressi sisestamine"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Otsetee pealkirja sisestamine"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Oled kindel, et soovid kustutada selle otsetee?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Käivitamine"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Midori käivitamisel:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Koduleht:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Kasuta _praegust veebilehte"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Kasuta praegust veebilehte kodulehena"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Tavaline kirjatüüp:"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Kirjatüüp, millega kuvatakse enamus tekstist"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Tavalise teksti kirjatüübi suurus"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Kindla suurusega kirjatüüp:"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Kirjatüüp, millega kuvatakse määratud suurusega tekstid"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Määratud suurusega teksti kirjatüübi suurus"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimaalne kirjatüübi suurus:"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Minimaalne kirjatüübi suurus teksti kuvamiseks"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Eelistatud keeleformaat:"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Käitumine"
 
-#: ../midori/midori-preferences.c:365
-#: ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Piltide kuvamine"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Kirjavigade tuvastamine"
 
-#: ../midori/midori-preferences.c:382
-#: ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Skriptide lubamine"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Graafilise kiirenduse lubamine (WebGL)"
 
-#: ../midori/midori-preferences.c:403
-#: ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape laienduste lubamine"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Tekstide ja piltide suurendamine/vähendamine"
@@ -1604,253 +1599,259 @@ msgstr "Skriptidel hüpikakende avamise lubamine"
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Kas lubada skriptidel avada automaatselt hüpikaknaid"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Vaikimisi suurenduse tase"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Tegur, mis automaatselt suurendab avatuid kaarte -"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Eelistatud keeled:"
 
-#: ../midori/midori-preferences.c:420
-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 "Komadega eraldatud nimekiri eelistatud keeltest mitmekeelsete veebilehtede jaoks, näiteks \"de\", \"ru,nl\" või \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-preferences.c:426
+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 ""
+"Komadega eraldatud nimekiri eelistatud keeltest mitmekeelsete veebilehtede "
+"jaoks, näiteks \"de\", \"ru,nl\" või \"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Failide salvestamine asukohta:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Lehitsemine"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Teema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Tööriistariba stiil:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Uute lehekülgede avamine kui:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Uue kaardi puhul:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Sulgemisnupud kaartidel"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Alati näidatakse kaartide riba"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Ava kaardid praeguse kõrval"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "Kas avada uued kaardid käesoleva või viimase kaardi kõrval"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
-msgstr "Ava kaardid taustal"
+msgstr "Kaartide avamine taustal"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Tekstiredaktor:"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Uudiste lugeja:"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Võrguühendus"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proksi server:"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Kasutaja nimi:"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
-msgstr "Port"
+msgstr "Port:"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
-msgstr "Toetatud proksi serverite tüübid: "
+msgstr "Toetatud proksi serverite tüübid:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520
-#: ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470
-#: ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Veebilehtede vahemälu:"
 
-#: ../midori/midori-preferences.c:521
-#: ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Maksimaalne vahemällu salvestatud veebilehtede suurus"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Tuvasta kui:"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Vanad küpsised ksututatakse pärast ajavahemikku:"
 
-#: ../midori/midori-preferences.c:552
-#: ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
-msgstr "Suurim arv päevasid küpsiste salvestamiseks"
+msgstr "Suurim ajavahemik küpsiste salvestamiseks"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Küpsiste lubamine ainult külastatud lehtedelt"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Kolmanda osapoole veebilehtede küpsiste blokeerimine"
 
-#: ../midori/midori-preferences.c:565
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
-msgstr "Küpsised säilitavad sisselogimise andmeid, mängude salvestusi või kasutaja profiile reklaaminduse otstarbeks"
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Küpsised säilitavad sisselogimise andmeid, mängude salvestusi või kasutaja "
+"profiile reklaaminduse otstarbeks"
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Võrguta veebilehtede jaoks kohaliku  vahemälu lubamine"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 kohaliku mälu toe lubamine"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Veebilehtedele saadetavate viitaja andmete piiramine"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Kas viitaja andmed peaks sisaldama ainult nime"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Ajaloo kustutamine pärast ajavahemikku:"
 
-#: ../midori/midori-preferences.c:586
-#: ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Ajavahemik ajaloo kirjete säilitamiseks"
 
-#: ../midori/midori-preferences.c:626
-#: ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
-msgstr "Laiendid"
+msgstr "Pluginad"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Halda otsingumootoreid..."
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Otsingumootori lisamine"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Muuda otsingumootorit"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
-#: ../midori/midori-searchaction.c:1105
-#: ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Aadress:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Kiirkasutus:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Otsingumootorite haldamine"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Määra _vaikimisi"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Otsingumootorite laadimine ebaõnnestus. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Otsingumootoreid ei saanud salvestada. %s"
 
 #: ../midori/midori-historycompletion.vala:17
-#: ../panels/midori-history.c:111
-msgid "History"
-msgstr "Ajalugu"
+msgid "Bookmarks and History"
+msgstr "Järjehoidjad ja ajalugu"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Ajaloo vormindamine ebaõnnestus: %s"
+msgid "Search for %s"
+msgstr "%s otsimine"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Ajaloost valimine ebaõnnestus: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s otsimine"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Otsi, kasutades..."
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Otsi, kasutades %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Ava koos"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Käivitatav rakendus või kohandatud käsk, mida avada \"%s\":"
 
-#: ../midori/sokoke.c:368
-#: ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:309
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
-msgstr "Välist programmi ei saanud käivitada"
+msgstr "Välist programmi polnud võimalik käivitada."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Vigane link"
 
@@ -1873,129 +1874,141 @@ msgstr "Tõstutundlik"
 
 #: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
-msgstr "Sulge otsinguriba"
+msgstr "Sulge leidmisriba"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "%s"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d järjehoidja"
+msgstr[1] "%d järjehoidjat"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Allalaadimine valmis"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d alamkaust"
+msgstr[1] "%d alamkausta"
 
-#: ../toolbars/midori-transferbar.c:244
-#: ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Puhasta"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Tühi kaust"
 
-#: ../toolbars/midori-transferbar.c:277
-#: ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Failide allalaadimised on pooleli"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Kaust, mis sisaldab %s ning ühtegi järjehoidjat"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "_Välju"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Kaust, mis sisaldab %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Allalaadimised katkestatakse väljumisel."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Kaust, mis sisaldab %s ja %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Kirje %s lisamine järjehoidjatesse ebaõnnestus\n"
+msgid "Bookmark leading to: %s"
+msgstr "Järjehoidja aadress: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Järjehoidja %s uuendamine ebaõnnestus\n"
+msgid "%s and no bookmark"
+msgstr "%s ning ühtegi järjehoidjat"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s ja %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Redigeeri andmeid..."
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Kustuta valitud järjehoidja"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Loo uus kaust..."
 
-#: ../panels/midori-bookmarks.c:687
-#: ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Eraldaja</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Ava uues _kaardis"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Otsi järjehoidjatest..."
 
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Ajalugu"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Täna"
 
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Eile"
 
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päev tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Nädal aega tagasi"
 
-#: ../panels/midori-history.c:234
-#: ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Ajaloo kirje %s kustutamine ebaõnnestus\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Oled sa kindel, et soovid kusutatada kogu lehitsemise ajaloo?"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Lisa valitud kirje järjehoidjatesse..."
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Kustuta valitud ajaloo kirje"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Kustuta lehitsemise ajalugu"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Otsi ajaloost..."
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Allalaadimised"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Ava faili sisaldav kaust"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Kopeeri faili allalaadimise _aadress"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Vajalik on autentimine"
@@ -2020,111 +2033,63 @@ msgstr "Parool"
 msgid "_Remember password"
 msgstr "_Salvesta parool"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Nimetatud ikooni \"%s\" ei saanud laadida"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Varuikooni \"%s\" ei saanud laadida"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Animatsioonikaadrid on vigased"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Puudub"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
-msgstr "Omadus \"%s\" ei ole õige %s jaoks"
+msgstr "Omadus \"%s\" on %s jaoks vale"
 
-#: ../katze/katze-utils.c:565
-#: ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Vali fail"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Vali kataloog"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 tund"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 päev"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 nädal"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 kuu"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 aasta"
 
-#: ../katze/katze-preferences.c:72
-#: ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s eelistused"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 kontrollsumma:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 kontrollsumma:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Reklaamifiltrite eelistused"
-
-#: ../extensions/adblock.c:512
-#, 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 "Nimekirja lisamiseks sisesta lahtrisse eelseadistatud filtri aadress ning seejärel klõpsa nupul \"Lisa\". Rohkemate nimekirjade jaoks mine asukohta %s."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Muuda reeglit"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Reegel:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "_Blokeeri pilt"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "_Blokeeri link"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Reklaamide blokeerija"
-
-#: ../extensions/adblock.c:1926
-msgid "Block advertisements according to a filter list"
-msgstr "Reklaamide blokeerimine vastavalt sinu eelistustele"
-
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "See veebileht sisaldab kasutajaskripti, soovid sa selle paigaldada?"
 
 #: ../extensions/addons.c:223
@@ -2144,19 +2109,16 @@ msgstr "_Paigalda stiil"
 msgid "Don't install"
 msgstr "Ära paigalda"
 
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Kasutajaskriptid"
 
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Stiilid:"
 
-#: ../extensions/addons.c:370
-#: ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Viga"
 
@@ -2178,43 +2140,40 @@ msgstr "Kustuta stiili fail"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Fail <b>%s</b> kustutatakse jäädavalt."
 
-#: ../extensions/addons.c:563
-#: ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Ava tekstiredaktoriga"
 
-#: ../extensions/addons.c:565
-#: ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Ava kausta asukoht"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
-msgstr "Lisa uus laiendus"
+msgstr "Lisa uus plugin"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
-msgstr "Kustuta valitud laiendus"
+msgstr "Kustuta valitud plugin"
 
-#: ../extensions/addons.c:1676
-#: ../extensions/addons.c:1892
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
-msgstr "Kasutaja laiendid"
+msgstr "Kasutaja pluginad"
 
-#: ../extensions/addons.c:1806
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
-msgstr "Kausta '%s': %s jälgimine pole võimalik"
+msgstr "Kausta \"%s\": %s jälgimine pole võimalik"
 
-#: ../extensions/addons.c:1893
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Tugi kasutaja skriptide ja stiilide jaoks"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Värvilised kaardid"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Kaartide tausta värvimine"
 
@@ -2223,39 +2182,43 @@ msgstr "Kaartide tausta värvimine"
 msgid "Cookie Manager"
 msgstr "Küpsiste haldur"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Kustuta kõik"
 
-#: ../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 "Kusutab kõik nähtavad küpsised. Kui filter on kasutuses, siis kustutatakse nähtavatest küpsistest vaid need, mis kattuvad filtri eelistustega."
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Kusutab kõik nähtavad küpsised. Kui filter on kasutuses, siis kustutatakse "
+"nähtavatest küpsistest vaid need, mis kattuvad filtri eelistustega."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Laienda nimekirja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Kahanda nimekirja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Oled sa kindel, et soovid kustutada kõik küpsised?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Küsimus"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Kustutatakse vaid küpsised, mis vastavad filtri tingimustele."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
-msgstr "Sessiooni lõpus"
+msgstr "Seanssi lõpus"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2273,15 +2236,15 @@ msgstr ""
 "<b>Aegub</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Jah"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ei"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2290,20 +2253,20 @@ msgstr ""
 "<b>Domeen</b>: %s\n"
 "<b>Küpsised</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nimi"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Laienda kõik"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Kitsenda kõik"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Otsi küpsiseid..."
 
@@ -2323,23 +2286,45 @@ msgstr "Kaartide veebiaadresside kopeerija"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kõikide kaartide veebiaadresside kopeerimine vahemällu"
 
-#: ../extensions/delayed-load.vala:24
-#: ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Viivitatud laadimine"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Enne lehe laadimist oodatakse:"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Veebilehe laadimisega oodatakse, kuni sa kaardile vahetud"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Topeltklõps rohkema informatsiooni kuvamiseks"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "See plugin kuvab glib veateated systray's."
+
 #: ../extensions/external-download-manager.vala:124
-msgid "An error occurred when attempting to download a file with the following plugin:\n"
-msgstr "Faili allalaadimisel tekkis viga, tänu laiendusele:\n"
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Faili allalaadimise ebaõnnestus, kuna kasutati pluginat:\n"
+"%s\n"
+"\n"
+"Tõrge:\n"
+"%s\n"
+"\n"
+"Parem on jätkata ilma selle pluginata."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2370,34 +2355,36 @@ msgstr "Failide allalaadimine \"%s\" või muu kohandatud käsuga"
 msgid "External Download Manager - CommandLine"
 msgstr "Väline allalaadimishaldur - kohandatud käsuga"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Vajamineva Atom'i \"entry\" elementide leidmine XML andmedest ebaõnnestus."
+msgstr ""
+"Vajamineva Atom'i \"entry\" elementide leidmine XML andmedest ebaõnnestus."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Vajamineva Atom'i \"feed\" elementide leidmine XML andmedest ebaõnnestus."
+msgstr ""
+"Vajamineva Atom'i \"feed\" elementide leidmine XML andmedest ebaõnnestus."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
-msgstr "Viimati uuendati: %s."
+msgstr "Viimane uuendamine: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Uudistevood"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Lisa uus uudistevoog"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Kustuta uudistevood"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Uudistevood"
 
@@ -2406,47 +2393,49 @@ msgstr "_Uudistevood"
 msgid "Failed to find root element in feed XML data."
 msgstr "Vajamineva põhi elemeni leidmine XML andmedest ebaõnnestus."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Tundmatu uudistevoo formaat."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "XML uudistevoo %s analüüsimine ebaõnnestus"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "\"channel\" elemendi RSS XML andmetest ebaõnnestus."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Tundmatu uudistevoo formaat."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Vajaminevate RSS \"item\" elementide leidmine XML andmetest ebaõnnestus."
+msgstr ""
+"Vajaminevate RSS \"item\" elementide leidmine XML andmetest ebaõnnestus."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Vajaminevate RSS \"channel\" elementide leidmine XML andmetest ebaõnnestus."
+msgstr ""
+"Vajaminevate RSS \"channel\" elementide leidmine XML andmetest ebaõnnestus."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Uudistevoog '%s' on juba olemas"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Viga uudistevoo '%s' laadimisel"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Uudistevoogude paneel"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom'i või RSS uudistevoogude lugemine"
 
@@ -2467,122 +2456,407 @@ msgstr ""
 "Ülimparool on vajalik, et\n"
 "avada paroolide andmebaas"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Soovid parooli salvestada?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Jäta meede"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Mitte praegu"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Mitte kunagi sel lehel"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Targa kaardihalduri sisselülitamine"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Praeguse akna jaoks lahtrite ajaloohalduri lubamine või keelamine."
 
-#: ../extensions/formhistory/formhistory.c:515
-#: ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Andmebaasi %s avamine ebaõnnestus\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Andmebaasi kinnituse %s käivitamine ebaõnnestus\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr "Lahtrite automaattäitmise lubamine igale kaardile invidiuaalselt, vajutades (Ctrl+Shift+F)"
+msgstr ""
+"Lahtrite automaattäitmise lubamine igale kaardile invidiuaalselt, vajutades "
+"(Ctrl+Shift+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Lahtrite automaattäitja"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
-msgstr "Salvestab lahtritesse salvestatud andmed kiireks järgnevaks kasutamiseks"
+msgstr ""
+"Salvestab lahtritesse salvestatud andmed kiireks järgnevaks kasutamiseks"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Soovituste valimine ebaõnnestus\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Külastamata kaarte pole"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Ajaloo nimekiri"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Kaardi sulgemisel:"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ära tee midagi"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Ava eelnevalt kasutatud kaart"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Ava hiljutiseim kaart"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Kaartide avamisel ekraani sähvatamine"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Järgmine uus kaart (tark kaardihaldur)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Järgmine uus kaart ajaloost"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Eelmine kaart(tark kaardihaldur)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Eelmine uus kaart ajaloost"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Kaardi kuvamine taustal (tark kaardihaldur)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Kuva praegune kaart tagataustale"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Tark kaardihaldur"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Kaardile vahetumisel või sulgemisel viimati kasutatud kaardi avamine"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL-is probleem: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Luba"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Seanssi lubamine"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokeeri"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "PLugina %s andmebaasi avamine ebaõnnestus"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Andmebaasi kinnituse %s käivitamine ebaõnnestus"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+"Oled sa kindel, et soovid kõik JavaSript'ile antud õigused kustutada?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Kustutada kõik JavaScript'i õigused?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Kõik JavaScript'ile antud õigused kustutatakse. Iga lehe külastamisel "
+"küsitakse sult õiguseid uuesti."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Halduri juhtum"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "NoJS halduri juhtum"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "NoJS seadistamine"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Allpool on nimekiri veebilehtedest ja nende õigustest. Õiguste kustutamine "
+"tee kirjele märge nind vajuta <i>Kustuta</i> nupule."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domeen"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Käitumisviis"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Kustuta _kõik"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Luba kõikide lehtede skriptid"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "_Blokeeri tundmatute domeenide skriptid vaikimisi"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Õiguste _seadmine teise taseme domeenidele"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Keela %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Luba %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "%s lubamine sellel seanssil"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Brauseri aken"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Midori brauseri juhtum kuulub"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vaade"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Midori vaate juhtum kuulub"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Menüü ikooni olek"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Olekuribal kuvatava menüü ikooni olek"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Määratlemata"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Lubatud"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Kombineeritud"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Keelatud"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Ilmnes tõsine tõrge, mille tõttu NoJS plugina edasitöötamine pole võimalik. "
+"Peaksid selle keelama."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Tõrge NoJS pluginas"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Põhjus"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Plugina %s eelistuste kausta loomine ebaõnnestus"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Plugina eelistuste kausta loomine ebaõnnestus"
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Plugina andmbeaasi avamine ebaõnnestus."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Plugina adnmebaasi struktuuri loomine ebaõnnestus."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Pluginad"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Midori plugin selle plugina jaoks"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Rakenduse aste"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Midori rakenduse aste, mis kuulub -"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Andmebaasi aste"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Osutamine sqtlite andmebaasile, mida see plugin kasutab"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Andmebaasi asukoht"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Asukoht sqtlite andmebaasi, mida see plugin kasutab"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Kõikide lehtede lubamine"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr "Lubades ei kontrollita iga lehe õigusi ning hoopis lubatakse."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Ainult teine tase"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Lubades vähendatakse domeen teisele tasemele, näiteks (www.example.org -> "
+"example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Tundmatu domeeni õigused"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Õigused, mida kasutatakse tundmatute domeenide puhul."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Luba ajutiselt"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Hiirega lehitsemine"
@@ -2611,11 +2885,11 @@ msgstr "Kiirklahvid"
 msgid "View and edit keyboard shortcuts"
 msgstr "Klaviatuuri kiirklahvide vaatamine ja muutmine"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Olekuriba kell"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Olekuribal kuupäeva ja kellaaja näitamine"
 
@@ -2629,7 +2903,11 @@ msgstr "Skriptid"
 
 #: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
-msgstr "Netscape laiendused"
+msgstr "Netscape pluginad"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape pluginate lubamine"
 
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
@@ -2639,16 +2917,15 @@ msgstr "Olekuriba eripärad"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Veebilehtedel elementide lihtne sisse- või väljalülitamine"
 
-#: ../extensions/tab-panel.c:591
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Vertikaalne kaartide paneel"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "_Kaartide paneel"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Kaartide näitamine vertikaalsel külgpaneelil"
 
@@ -2660,77 +2937,70 @@ msgstr "Ikoonilised kaardid"
 msgid "New tabs have no label by default"
 msgstr "Kaartidel puudub pealkiri"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Olekuriba kohandamine"
 
-#: ../extensions/toolbar-editor.c:409
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
-msgstr " Vali kirjed, mida soovid olekuribal näidata. Kirjete asukohti on võimalik muuta lohistades. "
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Vali kirjed, mida soovid olekuribal näidata. Kirjete asukohti on võimalik "
+"muuta lohistades."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Saadaolevad lisad"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Kuvatavad lisad"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Kohanda olekuriba..."
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Tööriistariba kohandamine"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Olekuriba elementide asetuste lihtne muutmine"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP suhtlemise salvestamine kettale"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Küpsiste laadimine ebaõnnestus\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129
-#: ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Privaatsete andmete kusutamine"
 
-#: ../midori/midori-privatedata.c:134
-#: ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
-msgstr "_Kustuta andmed"
+msgstr "_Kustuta privaatsed andmed"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Järgnevad andmed kusutatakse:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Viimati avatud _leheküljed"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
-msgstr "Privaatsete andmete kustutamine _väljumisel"
+msgstr "_Väljumisel automaatselt privaatsete andmete kustutamine"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Salvestatud kasutajanimed ja paroolid"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Küpsised ja veebilehtede andmed"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Veebilehtede ikoonid"
 
@@ -2738,346 +3008,243 @@ msgstr "Veebilehtede ikoonid"
 msgid "Open tabs"
 msgstr "Avatud kaardid"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Veel lahtisi kaarte..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
-msgstr "AJaloo kustutamine ebaõnnestus: %s\n"
+msgstr "Ajaloo kustutamine ebaõnnestus: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Vanade ajaloo kirjete %s eemaldamine ebaõnnestus\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "vana andmebaasi ATTACH ebaõnnestus"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "importimine vanast andmebaasist ebaõnnestus"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "tehingu tagasivõtmine ebaõnnestus"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "DETACH ebaõnnestus"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Järjehoidjate tabeli %s loomine ebaõnnestus\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Kirje %s lisamine järjehoidjatesse ebaõnnestus\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Importimine vanast andmebaasist %s  ebaõnnestus\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Ebaõnnestus uuendada järjehoidjat: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Järjehoidjaid ei saanud salvestada. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Ebaõnnestus eemaldada järjehoidjat: %s\n"
 
-#: ../midori/midori-session.c:199
-msgid "No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Ülemsertifikaat pole saadaval. SSL sertifikaate pole võimalik verifitseerida."
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Ülemsertifikaat pole saadaval. SSL sertifikaate pole võimalik verifitseerida."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Seadistust ei saanud salvestada. %s"
 
-#: ../midori/midori-session.c:390
-#: ../midori/midori-frontend.c:505
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sessiooni laadimine ebaõnnestus: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sessiooni ei saanud salvestada. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:129
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Prügi ei saanud salvestada. %s"
 
-#: ../midori/midori-frontend.c:337
-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 "Tundub, et Midori jooksis eelmisel käivitamisel kokku. Kui see juhtub pidevalt, siis proovi järgnevaid võimalusi."
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori lõpetas eelmine kord ootamatult töötamise. Sellest veast saad sa "
+"teada asukohta %s."
 
-#: ../midori/midori-frontend.c:347
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Muuda _eelistusi"
 
-#: ../midori/midori-frontend.c:351
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
-msgstr "Keela kõik _laiendused"
+msgstr "Keela kõik _pluginad"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Dialoogi näitamine pärast Midori kokkujooksmist"
 
-#: ../midori/midori-frontend.c:365
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Sulge vanad kaardid"
 
-#: ../midori/midori-frontend.c:373
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Näita viimatist krahhi _logi"
 
-#: ../midori/midori-frontend.c:386
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Käivita _veaotsijaga"
 
-#: ../midori/midori-frontend.c:457
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori juba töötab, kuid ei vasta.\n"
 
-#: ../midori/midori-frontend.c:490
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Järjehoidjate laadimisel tekkis probleem: %s\n"
 
-#: ../midori/midori-frontend.c:521
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Seanssi laadimine ebaõnnestus: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Prügi laadimisel tekkis probleem: %s\n"
 
-#: ../midori/midori-frontend.c:529
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Ajaloo laadimisel tekkis probleem: %s\n"
 
-#: ../midori/midori-frontend.c:540
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Tekkisid järgnevad vead:"
 
-#: ../midori/midori-frontend.c:545
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Eira"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL-is probleem: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Luba"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Sessiooni lubamine"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Blokeeri"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
-msgstr "Laienduse %s andmebaasi avamine ebaõnnestus"
+msgstr "Plugina %s andmebaasi avamine ebaõnnestus"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Andmebaasi kinnituse %s käivitamine ebaõnnestus"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Oled sa kindel, et soovid kustutada kõik küpsiste õigused?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Kustutada kõik küpsiste õigused?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-msgid "This action will delete all cookie permissions. You will be asked for permissions again for each web site visited."
-msgstr "See toiming kustutab kõik küpsiste õigused. Kui sa teed seda, siis sult küsitakse iga veebilehte külastades õigusi."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"See toiming kustutab kõik küpsiste õigused. Kui sa teed seda, siis sult "
+"küsitakse iga veebilehte külastades õigusi."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Küpsiste õigustehaldur"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Praeguse küpsiste õigustehalduri aste"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Küpsiste õiguste seadistamine"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
-msgid "Below is a list of all web sites and the policy set for them. You can delete policies by marking the entries and clicking on <i>Delete</i>.You can also add a policy for a domain manually by entering the domain below, choosing the policy and clicking on <i>Add</i>."
-msgstr "Allpool on nimekiri veebilehtedest ja nendele määratud käitumisviisidest. Sul on võimalik kustutada käitumisviise valides kirjeid ning klõpsates <i>Kustuta</i> nupul. Samuti on sul võimalik käsitsi lisada domeenile konkreetseid käitumisviise, sisestades domeeni nimi allpool ning seejärel <i>Lisa</i> nupule vajutades."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domeen"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Käitumisviis"
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Allpool on nimekiri veebilehtedest ja nendele määratud käitumisviisidest. "
+"Sul on võimalik kustutada käitumisviise valides kirjeid ning klõpsates "
+"<i>Kustuta</i> nupul. Samuti on sul võimalik käsitsi lisada domeenile "
+"konkreetseid käitumisviise, sisestades domeeni nimi allpool ning seejärel "
+"<i>Lisa</i> nupule vajutades."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Kustuta _kõik"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Nimekirjas mitte olevate lehtede küpsiste õigused: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Domeeni mittearusaamisel _küsi käitumisviise"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Loa küsimine"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
-msgid "A fatal error occurred which prevents the cookie permission manager extension to continue. You should disable it."
-msgstr "Küpsiste õigustehalduris tekkis tõsine probleem, parem oleks see praegu keelata."
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"Küpsiste õigustehalduri pluginas tekkis tõsine probleem, parem oleks see "
+"praegu keelata."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
-msgstr "Küpsiste õigustehalduri laienduses tekkis viga"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Põhjus"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Laienduse %s eelistuste kausta loomine ebaõnnestus"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Laienduse eelistuste kausta loomine ebaõnnestus"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Laienduse andmbeaasi avamine ebaõnnestus"
+msgstr "Küpsiste õigustehalduri pluginas tekkis viga"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Laienduse adnmebaasi struktuuri loomine ebaõnnestus."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "Domeenile %s pole võimalik määrata üldisi küpsiste käitumisviise"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
-msgstr "Kuni sessiooni lõppemiseni"
+msgstr "Kuni seanssi lõppemiseni"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Veebileht %s soovib salvestada järgmiseks korraks %d küpsist."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Veebileht %s soovib salvestada järgmiseks korraks ühe küpsise."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Mitmed veebilehed soovivad salvestada järgmiseks korraks %d küpsist."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Luba"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
-msgstr "_Luba selle sessiooni jaoks"
+msgstr "_Luba selle seanssi jaoks"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Keela"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "_Keela seekord"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Asukoht"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Väärtus"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Aegumise tähtaeg"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Laiendused"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Midori laienduse aste selle laienduse jaoks"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Rakenduse aste"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Midori rakenduse aste, mis kuulub asukohale"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Andmebaasi aste"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Osutamine sqtlite andmebaasile, mida see laiendus kasutab"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Andmebaasi asukoht"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Asukoht sqtlite andmebaasi, mida see laiendus kasutab"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Küsimine tundmatu käitumisviisi korral"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid "If true this extension ask for policy for every unknown domain.If false this extension uses the global cookie policy set in Midori settings."
-msgstr "Kui see laiendus on lubatud, siis iga tundmatu domeeni juhul küsitakse, mida teha. Kui see laiendus on keelatud, siis kasutatatakse üldist küpsiste käitumisviisi eelistusi."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Määratlemata"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr "Õigused domeenidele, mida ei seadistata individuaalselt."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3087,576 +3254,261 @@ msgstr "Küpsiste turvalisushaldur"
 msgid "Manage cookie permission per site"
 msgstr "Küpsiste õiguste haldamine veebilehtede kaupa"
 
-msgid "Lightweight web browser"
-msgstr "Kergekaaluline veebibrauser"
-
-msgid "_Bookmark"
-msgstr "_Järjehoidja"
-
-msgid "_Console"
-msgstr "_Konsool"
-
-msgid "_Closed Tabs and Windows"
-msgstr "_Suletud kaardid ja aknad"
-
-msgid "Writing failed."
-msgstr "Kirjutamine ei õnnestunud."
-
-msgid "URIs"
-msgstr "URI-d"
-
-msgid "[URIs]"
-msgstr "[URI-d]"
-
-msgid "%d%% loaded"
-msgstr "%d%% laaditud"
-
-msgid "_Title:"
-msgstr "_Pealkiri:"
-
-msgid "_URL:"
-msgstr "_URL:"
-
-msgid "Root"
-msgstr "Juur"
-
-msgid "Close this window"
-msgstr "Sulge see aken"
-
-msgid "Cut the selected text"
-msgstr "Lõika valitud tekst"
-
-msgid "Copy the selected text"
-msgstr "Kopeeri valitud tekst"
-
-msgid "Paste text from the clipboard"
-msgstr "Aseta tekst lõikepuhvrist"
-
-msgid "Delete the selected text"
-msgstr "Kustuta valitud tekst"
-
-msgid "Select all text"
-msgstr "Vali kõik tekst"
-
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Leia järgmine sõna või fraasi esinemine"
-
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Leia eelmine sõna või fraasi esinemine"
-
-msgid "_Quick Find"
-msgstr "_Kiirotsing"
-
-msgid "Quickly jump to a word or phrase"
-msgstr "Kiirelt hüppa sõna või fraasini"
-
-msgid "Reset the zoom level"
-msgstr "Tühista suurendusaste"
-
-msgid "View the source code of the page"
-msgstr "Vaata lehekülje lähtekoodi"
-
-msgid "View Selection Source"
-msgstr "Vaata valiku lähtekoodi"
-
-msgid "Delete the contents of the trash"
-msgstr "Kustuta prügi sisu"
-
-msgid "Open the last closed tab"
-msgstr "Ava viimati suletud kaart"
-
-msgid "Add, edit and remove search engines…"
-msgstr "Lisa, muuda ja eemalda otsingumootoreid"
-
-msgid "Switch to the previous tab"
-msgstr "Lülitu eelmisele kaardile"
-
-msgid "_Contents"
-msgstr "_Sisukord"
-
-msgid "Show the documentation"
-msgstr "Näita dokumentatsiooni"
-
-msgid "Show information about the program"
-msgstr "Näita teavet programmi kohta"
-
-msgid "Don't save any private data while browsing"
-msgstr "Ära salvesta lehitsemisel isiklike andmeid"
-
-msgid "Show menubar"
-msgstr "Menüüriba näitamine"
-
-msgid "Show navigationbar"
-msgstr "Näita navigatsiooniriba"
-
-msgid "Show bookmarkbar"
-msgstr "Näita järjehoidjariba"
-
-msgid "_Transferbar"
-msgstr "_Allalaadimisriba"
-
-msgid "Show transferbar"
-msgstr "Näita allalaadimisriba"
-
-msgid "Show statusbar"
-msgstr "Näita olekuriba"
-
-msgid "_Recently visited pages"
-msgstr "_Hiljuti külastatud veebilehed"
-
-msgid "_Window"
-msgstr "_Aken"
-
-msgid "Highlight Matches"
-msgstr "Tõsta sobivused esile"
-
-msgid "Both"
-msgstr "Mõlemad"
-
-msgid "Both horizontal"
-msgstr "Mõlemad rõhtsed"
-
-msgid "All cookies"
-msgstr "Kõik küpsised"
-
-msgid "Session cookies"
-msgstr "Sessiooni küpsised"
-
-msgid "Whether to save the last window size"
-msgstr "Kas salvestada viimane akna suurus"
-
-msgid "Last window width"
-msgstr "Viimane akna laius"
-
-msgid "The last saved window width"
-msgstr "Viimati salvestatud akna  suurus"
-
-msgid "Last window height"
-msgstr "Viimane akna kõrgus"
-
-msgid "The last saved window height"
-msgstr "Viimati salvestatud akna kõrgus"
-
-msgid "Last panel position"
-msgstr "Viimane paneeli asukoht"
-
-msgid "The last saved panel position"
-msgstr "Viimati salvestatud paneeli asukoht"
-
-msgid "Last panel page"
-msgstr "Viimane paneeli lehekülg"
-
-msgid "The last saved panel page"
-msgstr "Viimati salvestatud paneeli lehekülg"
-
-msgid "Last Web search"
-msgstr "Viimane veebiotsing"
-
-msgid "The last saved Web search"
-msgstr "Viimati salvestatud veebiotsing"
-
-msgid "Show Menubar"
-msgstr "Näita menüüriba"
-
-msgid "Whether to show the menubar"
-msgstr "Kas näidata menüüriba"
-
-msgid "Show Navigationbar"
-msgstr "Näita navigatsiooniriba"
-
-msgid "Whether to show the navigationbar"
-msgstr "Kas näidata navigatsiooniriba"
-
-msgid "Show Bookmarkbar"
-msgstr "Näita järjehoidjariba"
-
-msgid "Whether to show the bookmarkbar"
-msgstr "Kas näidata järjehoidjariba"
-
-msgid "Whether to show the panel"
-msgstr "Kas näidata paneeli"
-
-msgid "Show Statusbar"
-msgstr "Näita olekuriba"
-
-msgid "Whether to show the statusbar"
-msgstr "Kas näidata olekuriba"
-
-msgid "Toolbar Items"
-msgstr "Tööriistariba kirjed"
-
-msgid "The items to show on the toolbar"
-msgstr "Tööriistaribal kuvatavad kirjed"
-
-msgid "Compact Sidepanel"
-msgstr "Kompaktne külgpaneel"
-
-msgid "Whether to make the sidepanel compact"
-msgstr "kas külgpaneel on kompaktvaates"
-
-msgid "Load on Startup"
-msgstr "Laadi tööleminekul"
-
-msgid "What to load on startup"
-msgstr "Mida tööleminekul laadida"
-
-msgid "The homepage"
-msgstr "Kodulehekülg"
-
-msgid "Location entry Search"
-msgstr "Asukoha sissekande otsing"
-
-msgid "The search to perform inside the location entry"
-msgstr "Otsing mida viia läbi asukoha sissekandes"
-
-msgid "The preferred character encoding"
-msgstr "Eelistatud märkide kodeering"
-
-msgid "Whether tabs have close buttons"
-msgstr "Kas kaartidel on sulgemisnupud"
-
-msgid "Where to open new pages"
-msgstr "Kus avada uued leheküljed"
-
-msgid "Open external pages in"
-msgstr "Väliste veebilehtede avamine asukohas"
-
-msgid "Where to open externally opened pages"
-msgstr "Kus avada väliselt avatud veebilehed"
-
-msgid "Middle click opens Selection"
-msgstr "Hiire keskmise klõpsuga valiku avamine"
-
-msgid "Load an URL from the selection via middle click"
-msgstr "Valitud tekstist hiire keskmise klõpsuga aadressi ehk URL-i laadimine"
-
-msgid "Whether to open new tabs in the background"
-msgstr "Kas avada uued kaardid taustal"
-
-msgid "Open popups in tabs"
-msgstr "Ava hüpikaknad kaartides"
-
-msgid "What type of cookies to accept"
-msgstr "Mis liiki küpsised vastu võtta"
-
-msgid "Original cookies only"
-msgstr "Ainult algupärased küpsised"
-
-msgid "Maximum cookie age"
-msgstr "Suurim küpsise vanus"
-
-msgid "Whether the last visited pages are saved"
-msgstr "Kas viimati külastatud leheküljed on salvestatud"
-
-msgid "Maximum history age"
-msgstr "Suurim ajaloo vanus"
-
-msgid "Remember last form inputs"
-msgstr "Jäta meelde viimased ankeedisisendid"
-
-msgid "Whether the last form inputs are saved"
-msgstr "Kas viimased ankeedisisendid salvestatakse"
-
-msgid "Whether the last downloaded files are saved"
-msgstr "Kas viimati allalaaditud failid on salvestatud"
-
-msgid "The proxy used for HTTP connections"
-msgstr "HTTP ühendusteks kasutatav proksi"
-
-msgid "Cache size"
-msgstr "Vahemälu suurus"
-
-msgid "The allowed size of the cache"
-msgstr "Lubatud vahemälu suurus"
-
-msgid "Open URL in New _Tab"
-msgstr "Ava link uues _kaardis"
-
-msgid "Source"
-msgstr "Lähtekood"
-
-msgid "General"
-msgstr "Üldine"
-
-msgid "Appearance"
-msgstr "Välimus"
-
-msgid "Font settings"
-msgstr "Fondi seadistused"
-
-msgid "Interface"
-msgstr "Liides"
-
-msgid "Navigationbar"
-msgstr "Navigatsiooniriba"
-
-msgid "Web Cookies"
-msgstr "Veebi küpsised"
-
-msgid "_Icon (name or file):"
-msgstr "_Ikoon (nimi või fail):"
-
-msgid "Manage search engines"
-msgstr "Halda otsingumootoreid"
-
-msgid "Warning: You are using a superuser account!"
-msgstr "Hoiatus: Sa kasutad superkasutaja kontot!"
-
-msgid "%s has no property '%s'"
-msgstr "%s ei ühtegi väärtust \"%s\""
-
-msgid "%s cannot be assigned to %s.%s"
-msgstr "%s ei saa määrata %s.%s"
-
-msgid "%s.%s cannot be accessed"
-msgstr "%s.%s ei saa ligi"
-
-msgid "_Disable"
-msgstr "_Lülita välja"
-
-msgid "Console"
-msgstr "Konsool"
-
-msgid "Pageholder"
-msgstr "Lehehoidja"
-
-msgid "_Pageholder"
-msgstr "_Lehehoidja"
-
-msgid "Select _All"
-msgstr "Vali _kõik"
-
-msgid "_Fullscreen"
-msgstr "_Täisekraan"
-
-msgid "_Leave Fullscreen"
-msgstr "_Lahku täisekraanist"
-
-msgid "Unknown argument."
-msgstr "Tundmatu argument."
-
-msgid "Settings"
-msgstr "Seadistused"
-
-msgid "The bookmarks folder, containing all bookmarks"
-msgstr "Järjehoidjate kataloog, sisaldab kõiki järjehoidjaid"
-
-msgid "Trash"
-msgstr "Prügi"
-
-msgid "The trash, collecting recently closed tabs and windows"
-msgstr "Prügi, kogub hiljuti suletud kaarte ja aknaid"
-
-msgid "The list of search engines"
-msgstr "Otsingumootorite loetelu"
-
-msgid "Browser"
-msgstr "Brauser"
-
-msgid "The current browser"
-msgstr "Praegune brauser"
-
-msgid "Browser Count"
-msgstr "Brausereid"
-
-msgid "The current number of browsers"
-msgstr "Praegune brauserite arv"
-
-msgid "Web Widget"
-msgstr "Veebividin"
-
-msgid "The assigned web widget"
-msgstr "Määratud veebividin"
-
-msgid "Kind"
-msgstr "Liik"
-
-msgid "The kind of addons"
-msgstr "Lisandite liik"
-
-msgid "The navigationbar"
-msgstr "Navigatsiooniriba"
-
-msgid "URI"
-msgstr "URI"
-
-msgid "The current URI"
-msgstr "Käesolev URI"
-
-msgid "Tab"
-msgstr "Kaart"
-
-msgid "The current tab"
-msgstr "Käesolev kaart"
-
-msgid "The statusbar"
-msgstr "Olekuriba"
-
-msgid "The list of search engines to be used for web search"
-msgstr "Loetelu veebiotsinguks kasutatavatest otsingumootoritest"
-
-msgid "Pa_ge Setup"
-msgstr "Lehekülje _seadistamine"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Ikooni hankimine rakenduse %s: %s jaoks ebaõnnestus"
 
-msgid "Show a preview of the printed page"
-msgstr "Näita trükitava lehekülje eelvaadet"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-msgid "Undo the last modification"
-msgstr "Võta viimane muudatus tagasi"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Uue käivitaja loomine ebaõnnestus (%s): %s"
 
-msgid "Redo the last modification"
-msgstr "Tee viimane muudatus uuesti"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Käivitaja loodud"
 
-msgid "Add, edit and remove bookmarks…"
-msgstr "Lisa, muuda ja eemalda järjehoidjaid…"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Sul on võimalik nüüd käivitada <b>%s</b> käivitajast või menüüst"
 
-msgid "Open the selected bookmark in a new tab"
-msgstr "Ava valitud järjehoidja uues kaardis"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Viga käivitaja loomisel"
 
-msgid "Open the selected bookmark in a new window"
-msgstr "Ava valitud järjehoidja uues aknas"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Rakendused"
 
-msgid "Tab _Overview"
-msgstr "Kaardi _ülevaade"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Uus _profiil"
 
-msgid "_Work Offline"
-msgstr "_Tööta ühenduseta"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Loob uue sõltumatu profiili ja käivitaja"
 
-msgid "Work without a network connection"
-msgstr "Tööta ilma võrguühenduseta."
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Uus _rakendus"
 
-msgid "Shadow Type"
-msgstr "Varju liik"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Loob uue rakenduse kindla lehekülje jaoks"
 
-msgid "Appearance of the shadow around each panel"
-msgstr "Varju väljanägemine iga paneeli ümber"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Probleem käivitamisel"
 
-msgid "Menu to hold panel items"
-msgstr "Menüü paneelielementide hoidmiseks"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Loo _käivitaja..."
 
-msgid "The index of the current page"
-msgstr "Käesoleva lehekülje indeks"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Veebirakenduse haldur"
 
-msgid "Last pageholder URI"
-msgstr "Viimase lehehoidja URI"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Paigaldatud veebilehtede haldamine rakendustena"
 
-msgid "The URI last opened in the pageholder"
-msgstr "Viimati lehehoidjas avatud URI"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Allalaadimised"
 
-msgid "Show New Tab"
-msgstr "Näita uut kaarti"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Puhasta"
 
-msgid "Show the New Tab button in the toolbar"
-msgstr "Näita tööriistaribas uue kaardi nuppu"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Ebaõnnestus avada allalaadimist: %s"
 
-msgid "Show the Homepage button in the toolbar"
-msgstr "Näita tööriistaribas kodulehekülje nuppu"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Ava faili sisaldav kaust"
 
-msgid "Show Web search"
-msgstr "Näita veebiotsingut"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopeeri faili allalaadimise _aadress"
 
-msgid "Show the Web search entry in the toolbar"
-msgstr "Näita tööriistaribas veebiotsingu sissekannet"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "%s"
 
-msgid "Tab Label Size"
-msgstr "Kaardimärgendi suurus"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "\"<b>%s</b>\" ja veel %d faili laaditi alla."
 
-msgid "The desired tab label size"
-msgstr "Soovitud kaardimärgendi suurus"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Allalaadimine valmis"
 
-msgid "Load Provisional"
-msgstr "Laadi esialgne"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Failide allalaadimised on pooleli"
 
-msgid "Load Committed"
-msgstr "Laadi üleantud"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Välju"
 
-msgid "Load Finished"
-msgstr "Laadimine lõpetatud"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Allalaadimised katkestatakse väljumisel."
 
-msgid "The URI of the currently loaded page"
-msgstr "Käesoleva laaditud lehekülje URI"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Allalaadimishaldur"
 
-msgid "The title of the currently loaded page"
-msgstr "Käesoleva laaditud lehekülje pealkiri"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Vaata allalaaditud faile"
 
-msgid "The current loading progress"
-msgstr "Käesoleva laadimise edenemine"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Ebaõnnestus uuendada andmebaasi: %s"
 
-msgid "The current loading status"
-msgstr "Käesoleva laadimise olek"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Valimine andmebaasist %s ebaõnnestus"
 
-msgid "Download Link with Download _Manager"
-msgstr "Laadi link allalaadimise halduriga"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Pärandseanssi laadimine ebaõnnestus: %s"
 
-msgid "Settings instance to provide properties"
-msgstr "Omadustega varustav seadistuste instants"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Vöödiline"
 
-msgid "Current Item"
-msgstr "Käesolev element"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Kaartide ja seansside haldamine."
 
-msgid "The currently selected item"
-msgstr "Hetkel valitud element"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-msgid "Dialog"
-msgstr "Dialoog"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"See plugin tagab toimingute järjekorra uuendamise töödele ja taaskorduvatele "
+"sündmustele."
 
-msgid "A dialog to manage search engines"
-msgstr "Dialoog otsingumootorite haldamiseks"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Uue märkme lisamine andmebaasi ebaõnnestus: %s\n"
 
-msgid "Icon size"
-msgstr "Ikooni suurus"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Märkme eemaldamine andmebaasist ebaõnnestus: %s\n"
 
-msgid "Symbolic size to use for the animation"
-msgstr "Sümboolne suurus animeerimisel kasutamiseks"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Märkme %s nime muutmine ebaõnnestus\n"
 
-msgid "The name of an icon containing animation frames"
-msgstr "Animatsioonikaadreid sisaldava ikooni nimi"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Märkme %s uuendamine ebaõnnestus\n"
 
-msgid "Pixbuf"
-msgstr "Pixbuf"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Märkmed"
 
-msgid "A GdkPixbuf containing animation frames"
-msgstr "Animatsioonikaadreid sisaldav GdkPixpuf"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Uus märge"
 
-msgid "Animated"
-msgstr "Animeeritud"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Uue tühja märkme loomine, avatud lehed ei mõjuta seda"
 
-msgid "Static Icon Name"
-msgstr "Staatilise ikooni nimi"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Uus märge"
 
-msgid "The name of an icon to be used as the static image"
-msgstr "Staatilise pildina kasutatava ikooni nimi"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Valimine märkmete andmebaasist ebaõnnestus: %s\n"
 
-msgid "Static Pixbuf"
-msgstr "Staatiline Pixbuf"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Muuda märkme nimi"
 
-msgid "A GdkPixbuf to be used as the static image"
-msgstr "Staatilise pildina kasutatav GdkPixbuf"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Märkme kopeerimine lõikepuhvrisse"
 
-msgid "Static Stock ID"
-msgstr "Staatilise varutunnus"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Märkme eemaldamine"
 
-msgid "The stock ID of an icon to be used as the static image"
-msgstr "Staatilise pildina kasutatava ikooni varutunnus"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Valiku kopeerimine märkmena"
 
-msgid "The name of the item"
-msgstr "Elemendi nimi"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Tekstilõikude salvestamine märkmetena"
 
-msgid "The descriptive text of the item"
-msgstr "Elemendi kirjeldav tekst"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklaamide blokeerija"
 
-msgid "The URI of the item"
-msgstr "Elemendi URI"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Reklaamide blokeerimine vastavalt sinu eelistustele"
 
-msgid "Icon"
-msgstr "Ikoon"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Reklaamifiltrite eelistused"
 
-msgid "The icon of the item"
-msgstr "Elemendi ikoon"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "_Blokeeri pilt"
 
-msgid "Token"
-msgstr "Luba"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Blokeeri link"
 
-msgid "The token of the item"
-msgstr "Elemendi luba"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Muuda reeglit"
 
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Reegel:"
index 8c8a713565f871f6e03bdfc520fc58c6094f4c73..20555e43d817047092de9ce703e7fe2e0988547e 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
-# Basque translation of the midori package.
-# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
+# Basque translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the midori package.
-# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2012.
-# 
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-14 18:33+0000\n"
-"PO-Revision-Date: 2012-05-03 13:11+0000\n"
-"Last-Translator: Asier Iturralde Sarasola <asier.iturralde@gmail.com>\n"
-"Language-Team: Librezale <librezale@librezale.org>\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-07-13 09:31+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Basque <eu@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-26 05:59+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Arakatu sarea"
-
-#: ../data/midori.desktop.in.h:2
-#, fuzzy
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-websettings.c:228
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web-arakatzailea"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Web-arakatzaile mugikorra"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Arakatu sarea"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nabigatze _pribatuko leiho berria"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Nabigatzailea"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Fitxa berria"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Leiho berria"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Web-arakatzailea"
+msgid "New Private Browsing Window"
+msgstr "Nabigatze _pribatuko leiho berria"
 
 #: ../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:4410
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Nabigatze pribatua"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Ireki nabigatze pribatuko leiho berri bat"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Argazkia hona gorde da: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Exekutatu HELBIDEA web aplikazio bezala"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "HELBIDEA"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Erabili KARPETA konfigurazio karpeta bezala"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "KARPETA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Nabigatze pribatua, aldaketak ez dira gordeko"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "Eramangarri modua, exekutagarri guztiak leku bakarrean gordeak"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "GTK+ leiho soila WebKit-rekin, akin to GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Erakutsi diagnostiko elkarrizketa-koadroa"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Exekutatu zehazturiko fitxategi-izena javascript bezala"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Hartu zehazturiko URI-aren argazki bat"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Exekutatu zehazturiko komandoa"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Zerrendatu exekuta daitezkeen komandoak honela: -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Bistaratu programaren bertsioa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Helbideak"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
-msgstr "Iragazi URIak espresio erregular PATROIArekin "
+msgstr "Iragazi URIak espresio erregular PATROIArekin"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATROIA"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr ""
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGUNDU"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Errorea: Ezin da \"gdb\" topatu\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Mesedez iruzkin, iradokizun edo erroreen berri:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Bilatu bertsio berriak:"
 
-#: ../midori/main.c:384
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Errore ezezagun bat gertatu da"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Laster-markak"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Gehitu _laster-marka"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Hedapenak"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historia"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Erabiltzailearen script-ak"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Erabiltzaile e_stiloak"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "_Fitxa berria"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferentziak"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape-en pluginak"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Itxitako fitxak"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Leiho berria"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "_Karpeta berria"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Helbideak]"
 
@@ -228,135 +228,146 @@ msgstr "Gaizki osatutako dokumentua."
 msgid "Unrecognized bookmark format."
 msgstr "Laster-marka formatu ezezaguna."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Joan hurrengo orrira"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Joan hurrengo azpi-orrira"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Web bilaketa..."
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Birkargatu uneko orria"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Gelditu uneko orrialdea kargatzeaz"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Huts egin du izenburua eguneratzean: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "'%s' balioa baliogabea da %s-(r)entzat"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Ustekabeko ezarpena '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Ezusteko ekintza '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Nabigatze pribatua)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Laster-markak"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Karpeta berria"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Editatu karpeta"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
-msgstr "Laster-marka berria"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Editatu laster-marka"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+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:1029
-msgid "Add to _Speed Dial"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
 msgstr ""
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Erakutsi _tresna-barran"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Exekutatu _web aplikazio bezala"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Gorde fitxategia honela"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr ""
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Leiho berri bat ireki da"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Fitxa berri bat ireki da"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Errorea irudia irekitzean!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Ezin da hautatutako irudia ireki ikustaile lehenetsian."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Errorea irudia deskargatzean!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Ezin da hautatutako irudia deskargatu."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Gorde fitxategia"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -365,510 +376,511 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Jario berria"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Gehitu laster-marka berri bat"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Gorde horri hau"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Hutsik"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Txandakatu testu kurtsore nabigazioa"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Ireki guztia _fitxetan"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Ireki _fitxa berrian"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4886 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Inportatu laster-markak…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Inportatu laster-markak"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplikazioa:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Inportatu XBEL edo HTML fitxategitik"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Inportatu fitxategi batetik"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Huts egin du laster-markak inportatzean"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL laster-markak"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape-ren laster-markak"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
+"Midorik soilik XBEL-era (*.xbel) eta Netscape-era (*.html) exportatu dezake"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Huts egin du laster-markak esportatzean"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Web-arakatzaile arin bat"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
-msgstr ""
+msgstr "Ikusi about:version bertsioaren informazioa jasotzeko"
 
-#: ../midori/midori-browser.c:4764
+#: ../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 ""
+"Liburutegi hau software librea da; birbana edota alda dezakezu Software "
+"Foundation-ek argitaratutako GNU LGPL 2.1 bertsioan, edo (nahiago baduzu) "
+"beste berriago batean, jasotako baldintzak betez gero."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde"
+"  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde\n"
+"  Ibai Oihanguren Sala https://launchpad.net/~ibai-oihanguren\n"
+"  Ibon Santisteban https://launchpad.net/~lignux-5\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Bikoiztu uneko fitxa"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Ireki leiho berri bat"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Ireki fitxa berri bat"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nabigatze _pribatuko leiho berria"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Ireki fitxategi bat"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Gorde orria honela…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Gorde fitxategi batera"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
-msgstr ""
+msgstr "Markatze bizkorrera gehitu"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Harpidetu berrien _jariora"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Itxi fitxa"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Itxi uneko fitxa"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Itxi _leihoa"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Partekatu"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Inprimatu uneko orria"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Itxi leiho _guztiak"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Bilatu…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Bilatu hitz edo esaldi bat orrian"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Bilatu _hurrengoa"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Bilatu _aurrekoa"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Konfiguratu aplikazioaren hobespenak"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Tresna-barrak"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr ""
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodeketa"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ikusi _iturburua"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Txandakatu pantaila osoko ikuspegia"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr ""
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr ""
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr ""
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr ""
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr ""
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Joan"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Joan aurreko orrira"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Joan aurreko azpi-orrira"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Hasiera-orria"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Joan zure hasiera-orrira"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Hustu zakarrontzia"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Desegin fitxa _ixtea"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Gehitu _karpeta berri bat"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Esportatu laster-markak"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Kudeatu bilaketa-tresnak"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Garbitu datu pribatuak"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Aurreko fitxa"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Hurrengo fitxa"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Mugitu fitxa _atzera"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mugitu fitxa aurrera"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr ""
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
-msgstr ""
+msgstr "Erakutsi soilik uneko fitxaren ikonoa"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Bikoiztu uneko fitxa"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Itxi _beste fitxak"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Ireki azken _saioa"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Ohiko galderak"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Eman arazo baten berri…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menu-barra"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Nabigazio-barra"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Alboko _panela"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Alboko panela"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Laster-marka-barra"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Egoera-barra"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatikoa"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
-#, fuzzy
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
-msgstr "Txinera (BIG5)"
+msgstr ""
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr ""
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japoniera (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreera (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Errusiera (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Mendebaldekoa (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Pertsonalizatua…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Banatzailea"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Kokalekua"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Ireki kokaleku jakin bat"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Web bilaketa"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Exekutatu web bilaketa bat"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
-msgstr ""
+msgstr "Berriro ireki aurretiaz itxitako fitxa edo lehio bat"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Erakutsi gordetako laster-markak"
 
-#: ../midori/midori-browser.c:6154
-#, fuzzy
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
-msgstr "_Fitxa berria"
+msgstr ""
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Erakutsi irekitako fitxa guztien zerrenda"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menua"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menua"
 
@@ -877,73 +889,73 @@ msgstr "Menua"
 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:886 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Ziurtagiri algoritmoa ez-ziurtzat ematen da."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Beste errore bat gertatu da ziurtagiria egiaztatzean."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Esportatu ziurtagiria"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Segurtasun xehetasunak"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Itsatsi eta _jarraitu"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Egiaztatu gabea"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Egiaztatu eta zifratutako konexioa"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Irekia, zifratu gabeko konexioa"
 
@@ -960,443 +972,446 @@ msgstr "Itxi panela"
 msgid "Align sidepanel to the left"
 msgstr "Lerrokatu alboko panela ezkerrean"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
-msgstr ""
+msgstr "Markatze bizkorra erakutsi"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Erakutsi hasiera-orria"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Ikusi azken irekitako fitxak"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Erakutsi azken fitxak kargatu gabe"
 
-#: ../midori/midori-websettings.c:132
-#, fuzzy
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
-msgstr "Orri hutsa"
+msgstr ""
 
-#: ../midori/midori-websettings.c:134
-#, fuzzy
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
-msgstr "Kudeatu bilaketa-tresnak"
+msgstr ""
 
-#: ../midori/midori-websettings.c:136
-#, fuzzy
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
-msgstr "Erakutsi hasiera-orria"
+msgstr ""
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japoniera (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Fitxa berria"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Leiho berria"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Uneko fitxa"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikonoak"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Ikono txikiak"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Testua"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikonoak eta testua"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Testua ikonoen ondoan"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatikoa (GNOME edo ingurunea)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP proxy zerbitzaria"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Proxy zerbitzaririk ez"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr ""
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Tresna-barraren estiloa"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Beti erabili nire letra-tipo aukerak"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Ezin izan da konfigurazioa kargatu: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Baliogabeko '%s' konfigurazio balioa"
 
-#: ../midori/midori-tab.vala:122
-#, fuzzy, c-format
+#: ../midori/midori-tab.vala:133
+#, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "Huts egin du historiako elementu berri bat txertatzean: %s\n"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Erakutsi fitxaren _etiketa"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Erakutsi fitxaren _ikonoa soilik"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:984
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr ""
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr ""
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, 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:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Baimendu"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s-(e)k zure kokapena ezagutu nahi du."
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Errorea - %s"
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Ezin izan da '%s' orria kargatu."
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-view.c:1500 ../midori/midori-view.c:1644
-msgid "Try again"
-msgstr "Saiatu berriro"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-view.c:1641
-#, fuzzy, c-format
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
 msgid "Oops - %s"
-msgstr "Errorea - %s"
+msgstr ""
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr ""
 
-#: ../midori/midori-view.c:1789 ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Saiatu berriro"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Mezu bat bidali %s-(r)i"
 
-#: ../midori/midori-view.c:2656
-#, fuzzy
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
-msgstr "Gehitu bilaketa-tresna"
+msgstr ""
 
-#: ../midori/midori-view.c:2699 ../midori/midori-view.c:3003
-msgid "Inspect _Element"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
 msgstr ""
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Ireki esteka _fitxa berrian"
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Ireki esteka _aurreko planoko fitxan"
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Ireki esteka a_tzeko planoko fitxan"
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Ireki esteka _leiho berrian"
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr "Ireki esteka web _aplikazio bezala"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Kopiatu estekaren helburua"
 
-#: ../midori/midori-view.c:2773
-#, fuzzy
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
-msgstr "_Gorde orria honela…"
+msgstr ""
 
-#: ../midori/midori-view.c:2783
-#, fuzzy
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
-msgstr "Ireki leiho _berrian"
+msgstr ""
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Ireki _irudia fitxa berrian"
 
-#: ../midori/midori-view.c:2788
-#, fuzzy
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
-msgstr "Kopiatu irudiaren _helbidea"
+msgstr ""
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Gorde i_rudia"
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Ireki irudi-i_kustailean"
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Kopiatu bideoaren _helbidea"
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
-msgstr "Gorde _bideoa"
-
-#: ../midori/midori-view.c:2804
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Deskargatu _bideoa"
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Ireki helbidea _fitxa berrian"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Bilatu _honekin"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Bilatu sarean"
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
-msgstr "Ireki helbidea _fitxa berrian"
-
-#: ../midori/midori-view.c:2926
-#, fuzzy
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
-msgstr "Ireki _irudia fitxa berrian"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
 
-#: ../midori/midori-view.c:3147
-#, fuzzy, c-format
+#: ../midori/midori-view.c:2715
+#, c-format
 msgid "Open or download file from %s"
-msgstr "Ireki edo deskargatu fitxategia"
+msgstr ""
 
-#: ../midori/midori-view.c:3161 ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Fitxategi-izena: %s"
 
-#: ../midori/midori-view.c:3170
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Fitxategi-mota: '%s'"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Fitxategi-mota: %s ('%s')"
 
-#: ../midori/midori-view.c:3210
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr ""
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3223 ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Ireki %s"
 
-#: ../midori/midori-view.c:3771
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:4335
-#, c-format
-msgid "No documentation installed"
-msgstr ""
-
-#: ../midori/midori-view.c:4411
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori-k ez du datu pertsonalik gordetzen:"
 
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Ez da gordetzen ez historiarik ez web cookie-rik."
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Hedapenak desgaituta daude."
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3901
 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:4415
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr ""
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr ""
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
 
-#: ../midori/midori-view.c:4460
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 
-#: ../midori/midori-view.c:4509
-msgid "Page loading delayed"
-msgstr "Orria kargatzea atzeratuta"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:4000
 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:4511
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Kargatu orria"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Orri hutsa"
 
-#: ../midori/midori-view.c:4890
-msgid "_Duplicate Tab"
-msgstr "_Bikoiztu fitxa"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Label"
-msgstr "Erakutsi fitxaren _etiketa"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Icon Only"
-msgstr "Erakutsi fitxaren _ikonoa soilik"
-
-#: ../midori/midori-view.c:4902
-#, 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:5596
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "aurrekoa"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5615
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "hurrengoa"
 
-#: ../midori/midori-view.c:5629
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Inprimatu atzeko planoko irudiak"
 
-#: ../midori/midori-view.c:5630
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Atzeko planoko irudiak inprimatu behar diren ala ez"
 
-#: ../midori/midori-view.c:5660
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Ezaugarriak"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "minutu %d"
 msgstr[1] "%d minutu"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1404,157 +1419,153 @@ msgstr[0] "segundo %d"
 msgstr[1] "%d segundo"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s falta dira"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr ""
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Ezin da \"%s\" fitxategia karpetan honetan gorde"
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Ez daukazu kokaleku honetan idazteko baimenik."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Ez dago \"%s\" deskargatzeko adina leku libre."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Fitxategiak %s behar ditu baina %s daude libre."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klikatu lasterbide bat gehitzeko"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Sartu lasterbidearen helbidea"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Sartu lasterbidearen izenburua"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Ziur zaude lasterbide hau ezabatu nahi duzula?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Abioa"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Midori abiatzean:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Hasiera-orria"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Erabili _uneko orria"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Erabili uneko orria hasiera-orria bezala"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Gutxieneko letra-tipoaren tamaina"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Testua bistaratzeko erabilitako gutxieneko letra-tipoaren tamaina"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Hobetsitako kodeketa"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Portaera"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Kargatu irudiak automatikoki"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Gaitu ortografia egiaztaketa"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Gaitu script-ak"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Gaitu WebGL euskarria"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Gaitu Netscape pluginak"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr ""
@@ -1567,249 +1578,255 @@ msgstr ""
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Hobetsitako hizkuntzak"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Gorde deskargatutako fitxategiak hona:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Arakatzen"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Tresna-barraren estiloa:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Ireki orri berriak hemen:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Ixteko botoiak fitxetan"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Beti erakutsi fitxa-barra"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Ireki fitxak unekoaren ondoren"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Ireki fitxak atzeko planoan"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Testu-editorea"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr ""
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Sarea"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxy zerbitzaria"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Ostalari-izena"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Ataka"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr ""
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Web cache-a"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr ""
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr ""
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Pribatutasuna"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr ""
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Bisitatutako guneetako cookie-ak soilik onartu"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blokeatu hirugarrengo webguneek bidalitako cookie-ak"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr ""
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Gaitu lineaz kanpoko web aplikazioen cachea"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Gaitu HTML5 biltegiratze lokalaren euskarria"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr ""
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr ""
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Hedapenak"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Kudeatu bilaketa-tresnak"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Gehitu bilaketa-tresna"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editatu bilaketa-tresna"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "Deskribapena:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Kudeatu bilaketa-tresnak"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Erabili _lehenetsi bezala"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Ezin izan dira bilaketa-tresnak kargatu. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Ezin izan dira bilaketa-tresnak gorde. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historia"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/midori-historycompletion.vala:54
-#, fuzzy, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Huts egin du historia garbitzean: %s\n"
-
-#: ../midori/midori-historycompletion.vala:65
-#, fuzzy, c-format
-msgid "Failed to select from history: %s"
-msgstr "Huts egin du historiatik hautatzean\n"
-
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
 msgid "Search for %s"
 msgstr ""
 
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
-#, fuzzy
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
-msgstr "Bilatu _honekin"
+msgstr ""
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr ""
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Ireki honekin"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Aukeratu aplikazio edo komando bat \"%s\" irekitzeko:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:310
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Ezin izan da kanpoko programa exekutatu."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr ""
 
@@ -1834,83 +1851,138 @@ msgstr ""
 msgid "Close Findbar"
 msgstr "Itxi bilaketa-barra"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Huts egin du laster-marka elementua gehitzean: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editatu hautatutako laster-marka"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Ezabatu hautatutako laster-marka"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Gehitu karpeta berri bat"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Banatzailea</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Ireki _fitxa berrian"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
-#, fuzzy
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
-msgstr "Laster-markak"
+msgstr ""
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historia"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Gaur"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Atzo"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Duela aste bat"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Huts egin du historiako elementua kentzean: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Ziur zaude historiako elementu guztiak kendu nahi dituzula?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Egin hautatutako historiako elementuaren laster-marka"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Ezabatu hautatutako historiako elementua"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Garbitu historia osoa"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
-#, fuzzy
+#: ../panels/midori-history.c:926
 msgid "Search History"
-msgstr "Bilatu _honekin"
+msgstr ""
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -1936,112 +2008,65 @@ msgstr "Pasahitza"
 msgid "_Remember password"
 msgstr "_Gogoratu pasahitza"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr ""
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr ""
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Aukeratu fitxategia"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Aukeratu karpeta"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "Ordu 1"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "Egun 1"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "Aste 1"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "Hilabete 1"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "Urte 1"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s-(r)en hobespenak"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr ""
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr ""
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Konfiguratu iragarkien iragazkiak"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Editatu araua"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Araua:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_okeatu irudia"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_okeatu esteka"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Iragarkien blokeatzailea"
-
-#: ../extensions/adblock.c:1926
-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:222
-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?"
+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:223
 msgid "_Install user script"
@@ -2050,7 +2075,8 @@ msgstr "_Instalatu erabiltzaile-script-a"
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
 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?"
+msgstr ""
+"Orri honek erabiltzaile-estilo bat duela dirudi. Instalatu nahi duzu?"
 
 #: ../extensions/addons.c:229
 msgid "_Install user style"
@@ -2060,16 +2086,16 @@ msgstr "_Instalatu erabiltzaile-estiloa"
 msgid "Don't install"
 msgstr "Ez instalatu"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Erabiltzaile-script-ak"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Erabiltzaile-estiloak"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Errorea"
 
@@ -2091,40 +2117,40 @@ msgstr "Ezabatu erabiltzaile-estiloa"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "<b>%s</b> fitxategia betirako ezabatuko da."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Ireki testu-editorean"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Ireki helburuko karpeta"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Gehitu gehigarri berria"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Kendu hautatutako gehigarria"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Erabiltzailearen gehigarriak"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr ""
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Erabiltzaile-script eta erabiltzaile-estiloen euskarria"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Fitxa koloretsuak"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Tindatu fitxa bakoitza kolore desberdinarekin"
 
@@ -2133,11 +2159,11 @@ msgstr "Tindatu fitxa bakoitza kolore desberdinarekin"
 msgid "Cookie Manager"
 msgstr "Cookie kudeatzailea"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Ezabatu guztiak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2145,31 +2171,31 @@ msgstr ""
 "Ezabatu erakutsitako cookie guztiak. Iragazkirik balego,  iragazkiarekin bat "
 "datozen cookie-ak soilik ezabatuko dira."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Zabaldu guztiak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Tolestu guztiak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Ziur zaude cookie guztiak ezabatu nahi dituzula?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Galdera"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Saioaren amaieran"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2187,15 +2213,15 @@ msgstr ""
 "<b>Iraungitze-data</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Bai"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ez"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2204,20 +2230,20 @@ msgstr ""
 "<b>Domeinua</b>: %s\n"
 "<b>Cookie-ak</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Izena"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Zabaldu guztiak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Tolestu guztiak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr ""
 
@@ -2237,23 +2263,37 @@ msgstr "Kopiatu fitxen helbideak"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopiatu fitxa guztien helbideak arbelera"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr ""
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
 msgstr ""
 
-#: ../extensions/delayed-load.vala:213
-msgid "Delay page load until you actually use the tab."
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
 msgstr ""
 
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
 
 #: ../extensions/external-download-manager.vala:175
@@ -2261,9 +2301,8 @@ msgid "External Download Manager - Aria2"
 msgstr ""
 
 #: ../extensions/external-download-manager.vala:176
-#, fuzzy
 msgid "Download files with Aria2"
-msgstr "Gorde deskargatutako fitxategiak hona:"
+msgstr ""
 
 #: ../extensions/external-download-manager.vala:202
 msgid "External Download Manager - SteadyFlow"
@@ -2295,25 +2334,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Azken eguneraketa: %s"
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Jarioak"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Gehitu jario berria"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Ezabatu jarioa"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Jarioak"
 
@@ -2332,37 +2371,37 @@ msgstr "Onartu gabeko jario formatua."
 msgid "Failed to parse XML feed: %s"
 msgstr "Huts egin du XML jarioa analizatzean: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 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
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Onartu gabeko RSS bertsioa aurkitu da."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "'%s' jarioa dagoeneko existitzen da"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Errorea '%s' jarioa deskargatzean"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Jarioen panela"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Irakurri Atom/RSS jarioak"
 
@@ -2381,121 +2420,395 @@ msgid ""
 "to open password database"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Pasahitza gogoratu orri honetan?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Orain ez"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Inoiz ez orri honentzat"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Huts egin du datu-basea irekitzean: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr ""
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Huts egin du iradokizunak hautatzean\n"
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Ez dago bisitatu gabeko fitxarik"
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Historia-Zerrenda"
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr ""
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ez egin ezer"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Aldatu ikusitako azken fitxara"
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Aldatu fitxa berrienera"
 
-#: ../extensions/history-list.vala:316
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr ""
 
-#: ../extensions/history-list.vala:448
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Hurrengo fitxa berria (Historia zerrenda)"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Historiako hurrengo fitxa berria"
 
-#: ../extensions/history-list.vala:458
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Aurreko fitxa berria (Historia zerrenda)"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Historiako aurreko fitxa berria"
 
-#: ../extensions/history-list.vala:468
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Bistaratu fitxa atzeko planoan (Historia zerrenda)"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Bistaratu unean hautatutako fitxa atzeko planoan (Historia zerrenda)"
 
-#: ../extensions/history-list.vala:596
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Historia zerrenda"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Joan erabilitako azken fitxara fitxaz aldatzean edo fitxa ixtean"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Saguaren keinuak"
@@ -2513,9 +2826,8 @@ msgid "Customize Keyboard shortcuts"
 msgstr "Pertsonalizatu teklatuaren lasterbideak"
 
 #: ../extensions/shortcuts.c:275
-#, fuzzy
 msgid "Customize Sh_ortcuts…"
-msgstr "Pertsonalizatu _lasterbideak…"
+msgstr ""
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2525,11 +2837,11 @@ msgstr "Lasterbideak"
 msgid "View and edit keyboard shortcuts"
 msgstr "Ikusi eta editatu teklatuko lasterbideak"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Egoera-barrako erlojua"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Bistaratu data eta ordua egoera-barran"
 
@@ -2545,6 +2857,10 @@ msgstr "Script-ak"
 msgid "Netscape plugins"
 msgstr "Netscape pluginak"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Gaitu Netscape pluginak"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Egoera-barraren ezaugarriak"
@@ -2553,15 +2869,15 @@ msgstr "Egoera-barraren ezaugarriak"
 msgid "Easily toggle features on web pages on and off"
 msgstr ""
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Fitxen panela"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "_Fitxen panela"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Erakutsi fitxak panel bertikal batean"
 
@@ -2573,11 +2889,11 @@ msgstr "Ikonoak soilik fitxetan modu lehenetsian"
 msgid "New tabs have no label by default"
 msgstr "Fitxa berriek etiketarik ez edukitzea lehenesten da"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Pertsonalizatu tresna-barra"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2585,182 +2901,140 @@ msgstr ""
 "Hautatu tresna-barran bistaratuko diren elementuak. Elementuak berrordenatu "
 "daitezke arrastatu eta jareginez."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Elementu erabilgarriak"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Bistaratutako elementuak"
 
-#: ../extensions/toolbar-editor.c:586
-#, fuzzy
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
-msgstr "Pertsonalizatu _tresna-barra…"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Tresna-barra editorea"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Editatu tresna-barraren diseinua modu errazean"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr ""
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, fuzzy, c-format
-msgid "Failed to load cookies\n"
-msgstr "Huts egin du laster-marka elementua gehitzean: %s\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Garbitu datu pribatuak"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Garbitu datu pribatuak"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Garbitu ondorengo datuak:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
-msgstr ""
+msgstr "Garbitu datu pribatuak Midori ixtean"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookie eta Webgune datuak"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Webguneen ikonoak"
 
 #: ../midori/midori-viewcompletion.vala:18
-#, fuzzy
 msgid "Open tabs"
-msgstr "Ireki %s"
+msgstr ""
 
-#: ../midori/midori-viewcompletion.vala:75
-#, fuzzy
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
-msgstr "Ikusi azken irekitako fitxak"
+msgstr ""
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Huts egin du historia garbitzean: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Huts egin du historiako elementu zaharrak kentzean: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:111
-#, fuzzy
-msgid "failed to import from old db"
-msgstr "Huts egin du laster-markak inportatzean"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:259
-#, fuzzy, c-format
-msgid "Couldn't create bookmarks table: %s\n"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
 msgstr "Huts egin du laster-marka elementua gehitzean: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
-#, fuzzy, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Huts egin du datu-basea irekitzean: %s\n"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ezin izan dira laster-markak gorde. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Ezin izan da konfigurazioa gorde. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:509
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Ezin izan da saioa kargatu: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Ezin izan da saioa gorde. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Ezin izan da zakarrontzia gorde. %s"
 
-#: ../midori/midori-frontend.c:338
-#, fuzzy, c-format
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Dirudienez Midori kraskatu egin zen ireki zen azkenengo aldian. Behin  baino "
-"gehiago pasa bada saiatu hauetako irteera bat arazoa konpontzeko."
 
-#: ../midori/midori-frontend.c:347
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Aldatu _hobespenak"
 
-#: ../midori/midori-frontend.c:351
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Desgaitu _hedapen guztiak"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Erakutsi elkarrizketa-koadro bat Midorik kraskatzean"
 
-#: ../midori/midori-frontend.c:365
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Baztertu fitxa zaharrak"
 
-#: ../midori/midori-frontend.c:373
-#, fuzzy
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
-msgstr "Erakutsi kraskatze elkarrizketa-koadroa"
+msgstr ""
 
-#: ../midori/midori-frontend.c:386
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr ""
 
@@ -2773,6 +3047,11 @@ msgstr ""
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Ezin izan dira laster-markak kargatu: %s\n"
 
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Ezin izan da saioa kargatu: %s\n"
+
 #: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
@@ -2791,77 +3070,40 @@ msgstr "Ondorengo erroreak gertatu dira:"
 msgid "_Ignore"
 msgstr "Ez _ikusia egin"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open database of extenstion: %s"
-msgstr "Huts egin du datu-basea irekitzean: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, fuzzy, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Huts egin du datu-basea irekitzean: %s\n"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
-msgstr "Ziur zaude cookie guztiak ezabatu nahi dituzula?"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
-msgstr "Cookie kudeatzailea"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr ""
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2870,23 +3112,12 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-#, fuzzy
-msgid "Delete _all"
-msgstr "Ezabatu guztiak"
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
@@ -2899,153 +3130,134 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-#, fuzzy
-msgid "Could not open database of extension."
-msgstr "Huts egin du datu-basea irekitzean: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
-msgstr "Saioaren amaieran"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-#, fuzzy
-msgid "Extension instance"
-msgstr "Hedapenak"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-#, fuzzy
-msgid "Application instance"
-msgstr "_Aplikazioa:"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+#: ../extensions/apps.vala:191
+msgid "Applications"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
 msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:62
-#, fuzzy
-msgid "Cookie Security Manager"
-msgstr "Cookie kudeatzailea"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
+#: ../extensions/apps.vala:213
+msgid "New _App"
 msgstr ""
 
-#: ../extensions/apps.vala:82
-#, fuzzy
-msgid "Applications"
-msgstr "_Aplikazioa:"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Sortu _abiarazlea"
 
-#: ../extensions/apps.vala:274
-#, fuzzy
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
-msgstr "Cookie kudeatzailea"
+msgstr ""
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr ""
 
@@ -3053,243 +3265,190 @@ msgstr ""
 msgid "Transfers"
 msgstr "Transferentziak"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Garbitu guztia"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Ireki helburuko _karpeta"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Kopiatu estekaren _helbidea"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "'<b>%s</b>' fitxategia deskargatu da."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transferentzia burututa"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Zenbait fitxategi deskargatzen ari dira"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Irten Midori-tik"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr ""
 
-#: ../extensions/transfers.vala:515
-#, fuzzy
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
-msgstr "Transferentziak"
+msgstr ""
 
-#: ../extensions/transfers.vala:516
-#, fuzzy
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
-msgstr "Gorde deskargatutako fitxategiak hona:"
-
-#~ msgid "FILENAME"
-#~ msgstr "FITXATEGI-IZENA"
-
-#~ msgid "Writing failed."
-#~ msgstr "Huts egin du idaztean."
-
-#~ msgid "_Window"
-#~ msgstr "_Leihoa"
-
-#~ msgid "Custom..."
-#~ msgstr "Pertsonalizatua…"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Gogoratu azken leiho-tamaina"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Azken leiho-tamaina gordeko den ala ez"
-
-#~ msgid "Last window width"
-#~ msgstr "Azken leiho-zabalera"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Gordetako azken leiho-zabalera"
-
-#~ msgid "Last window height"
-#~ msgstr "Azken leiho-altuera"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Gordetako azken leiho-altuera"
-
-#~ msgid "Last panel position"
-#~ msgstr "Azken panel-posizioa"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Gordetako azken panel-posizioa"
-
-#~ msgid "Last panel page"
-#~ msgstr "Azken panel-orria"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Gordetako azken panel-orria"
-
-#~ msgid "Last Web search"
-#~ msgstr "Azken web bilaketa"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Gordetako azken web bilaketa"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Erakutsi menu-barra"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Menu-barra erakutsiko den ala ez"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Erakutsi nabigazio-barra"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Nabigazio-barra erakutsiko den ala ez"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Erakutsi laster-marka-barra"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Laster-marka-barra erakutsiko den ala ez"
-
-#~ msgid "Show Panel"
-#~ msgstr "Erakutsi panela"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Panela erakutsiko den ala ez"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Erakutsi egoera-barra"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Egoera-barra erakutsiko den ala ez"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Tresna-barraren elementuak"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Tresna-barran erakutsiko diren elementuak"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Alboko panel trinkoa"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Alboko panela trinkotuko den ala ez"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Lerrokatu alboko panela eskuinean"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Alboko panela eskuinean lerrokatuko den ala ez"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Ireki panela leiho bereizietan"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Panelak beti leiho bereizietan irekiko diren ala ez"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Zer egin Midori abiatzean"
-
-#~ msgid "The homepage"
-#~ msgstr "Hasiera-orria"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Deskargatutako fitxategiak gordeko diren karpeta"
-
-#~ msgid "An external text editor"
-#~ msgstr "Kanpoko testu-editore bat"
+msgstr ""
 
-#~ msgid "The preferred character encoding"
-#~ msgstr "Hobetsitako karaktere-kodeketa"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Always show the tabbar"
-#~ msgstr "Beti erakutsi fitxa-barra"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Fitxek ixteko botoiak dituzten ala ez"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Where to open new pages"
-#~ msgstr "Non ireki behar diren orri berriak"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Atzeko planoan fitxak irekiko diren ala ez"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Load and display images automatically"
-#~ msgstr "Kargatu eta bistaratu irudiak automatikoki"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Gaitu idatzi ahalako ortografia egiaztaketa"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Gaitu HTML5 datu-baseen euskarria"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "HTML5 datu-baseen euskarria gaituko den ala ez"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "HTML5 biltegiratze lokalaren euskarria gaituko den ala ez"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Lineaz kanpoko web aplikazioen cachea gaituko den ala ez"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Baimendu webguneek OpenGL errendatzea erabiltzea"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Erabiliko den proxy zerbitzari mota"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP proxy zerbitzaria"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "HTTP konexioetarako erabilitako proxy zerbitzaria"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "HTTP konexioetarako erabilitako proxy zerbitzariaren ataka"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Clear private data"
-#~ msgstr "Garbitu datu pribatuak"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Ezabatzeko hautatutako datu pribatuak"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Clear data"
-#~ msgstr "Garbitu datuak"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "Ezabatzeko hautatutako datuak"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Laster-marka"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "_Console"
-#~ msgstr "Kontsola"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Iragarkien blokeatzailea"
 
-#~ msgid "_Title:"
-#~ msgstr "_Izenburua:"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokeatu iragarkiak iragazki zerrenda bat jarraituz"
 
-#~ msgid "_Folder:"
-#~ msgstr "_Karpeta:"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfiguratu iragarkien iragazkiak"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "Itxi _beste fitxak"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okeatu irudia"
 
-#~ msgid "_Icon:"
-#~ msgstr "_Ikonoa:"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okeatu esteka"
 
-#~ msgid "Filter:"
-#~ msgstr "Iragazi:"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editatu araua"
 
-#~ msgid "_Customize…"
-#~ msgstr "_Pertsonalizatu…"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Araua:"
diff --git a/po/fa.po b/po/fa.po
new file mode 100644 (file)
index 0000000..d9bd015
--- /dev/null
+++ b/po/fa.po
@@ -0,0 +1,3434 @@
+# Persian translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# Danial Behzadi <dani.behzi@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-08-12 23:44+0000\n"
+"Last-Translator: mohammad hosseini <mohammad@aeron.ir>\n"
+"Language-Team: Persian <fa@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "میدوری"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "مرورگر وب"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "مرورگر وب میدوری"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "مرور وب"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "کاوشگر اینترنت"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "برگهٔ جدید"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "پنجره‌ی حدید"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "پنجره مرور محرمانه جدید"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "مرور محرمانه‌ی میدوری"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "مرور محرمانه"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "باز کردن یک پنجره‌ی مرور محرمانه"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "تصویر گرفته شده ذخیره شد در: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "اجرای ADDRESS به عنوان یک برنامه‌ی وب"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "استفاده از FOLDER به عنوان یک پوشه‌ی پیکربندی"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "در هنگام مرور محرمانه، هیچ تغییری ذخیره نمی‌شود"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "حالت قابل حمل، تمام فایل های زمان اجرا در یک مکان ذخیره میشوند"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "پنجره GTK+ را با وبکیت قرار دهید، مانند GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "نمایش پنجره محاوره ای رفع اشکال"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "اجرای نام پرونده‌ی مشخص شده به عنوان جاوا اسکریپت"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "گرفتن یک تصویر لحظه‌ای از نشانی مشخص شده"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "اجرای یک فرمان  مشخص"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "فهرست کردن فرمان‌های موجود برای اجرا با‪ -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "نمایش نسخه برنامه"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "آدرس‌ها"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "سد کردن نشانی‌ها با توجه به PATTERN عبارت با قاعده"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "تنظیم مجدد میدوری پس از SECONDS ثانیه غیرفعال بودن"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "خطا: \"gdb\" یافت نشد\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "لطفاً نظرات، پیشنهادات و خطا ها را به این‌جا ارسال کنید:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "بررسی نسخه جدیدتر در:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "خطای ناشناخته‌ای رخ داد"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "نشانه ها"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "افزودن نشانه"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "افزونه ها"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "تاریخچه"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "اسکریپت‌های کاربر"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "شیونامه ی کاربر"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "زبانه‌ی جدید"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "انتقالات"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "پلاگین‌های نت‌اسکیپ"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "زبانه‌های بسته شده"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "پنجره‌ی جدید"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "پوشه‌ی جدید"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Addresses]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "پرونده یافت نشد."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "سند وارفته."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "قالب نشانک ناشناخته."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "رفتن به صفحه‌ی بعدی"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "رفتن به زیرصفحه‌ی بعدی"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "جستجوی وب ..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "بارگیری مجدّد صفحه‌ی جاری"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "توقّف بارگیری صفحه‌ی جاری"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "به‌روزرسانی عنوان شکست خورد: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "مقدار «%s» برای «%s» نامعتبر است"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "تنظیمات غیرمنتظره «%s»"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "عمل غیر منتظره «%s»"
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (مرور محرمانه)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "درج مورد تاریخچه‌ی جدید شکست خورد: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "نشانک‌ها"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "پوشهٔ جدید"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "ویرایش پوشه"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "نشانک جدید"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "ویرایش نشانک"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "برای این نشانک یک نام  انتخاب کنید و مکان نگهداری آن مشخص کنید."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "برای این پوشه یک نام انتخاب کنید و مکان نگهداری آن مشخص کنید."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "آن را در نوار نشانک ها نشان بده"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "اقزودن به شماره‌گیری سریع"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "ذخیره‌ی پرونده به عنوان"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "پنجره‌ای جدید باز شد"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "زبانه‌ای جدید باز شد"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "خطا در باز کردن تصویر!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "نمی‌توان تصویر انتخابی را در مشاهده‌گر پیش‌فرض باز کرد"
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "خطا در یارگیری تصویر!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "امکان دانلود تصویر موردنظر وجود ندارد."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "ذخیره‌ی پرونده"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "بار کردن محدّد صفحه بدون انبار مردن"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "گشودن پرونده"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "خوراک جدید"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "افزودن نشانک جدید"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "خالی"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "گشودن همه در زبانه‌ها"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "گشودن در پنجره‌ی جدید"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "ارورا"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "کازه‌هاکاسه"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "اوپرا"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "کانکوئرر"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "اپیفنی"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "فایرفاکس (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "درون ریزی نشانک ها"
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "وارد کردن نشانک‌ها"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "برنامه‌ی کاربردی:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "وارد کردن از پرونده‌ی XBEL یا HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "وارد کردن از یک پرونده"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "وارد کردن نشانک‌ها شکست خورد"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "نشانک‌های XBEL"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "نشانک‌های نت‌اسکیپ"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr "میدوری فقط می‌تواند به XBEL (*.xbel) و نت‌اسکیپ (*.html) صادر کند"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "صدور نشانک‌ها شکست خورد"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "یک مروگر وب سبک."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "برای اطّلاعات نگارش about:version را ببینید."
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Danial Behzadi https://launchpad.net/~dani.behzi\n"
+"  mohammad hosseini https://launchpad.net/~mohammad-p\n"
+"  mohsen shafiei https://launchpad.net/~mohsen-sh12\n"
+"  reza abbasi https://launchpad.net/~rasez-secure"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "تکثیر زبانه‌ی جاری"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "پرونده"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "گشودن پنجره‌ای جدید"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "گشودن زبانه‌ای جدید"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "پنجره‌ی مرور محرمانه‌ی جدید"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "گشودن یک پرونده"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_ذخیره به عنوان..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "ذخیره در یک پرونده"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "افزودن به شماره‌گیری سریع"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "اشتراک در خوراک خبری"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "بستن زبانه"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "بستن زبانه‌ی جاری"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "بستن پنجره"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "چاپ صفحه‌ی جاری"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "بستن همه‌ی پنچره‌ها"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "ویرایش"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_پیدا کردن..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "یافتن کلمه یا عبارتی در متن"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "یافتن بعدی"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "یافتن پیشین"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "پیکربندی ترجیجات برنامه‌ی کاربردی"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "نما"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "نوارابزارها"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "افزایش سطح بزرگ‌نمایی"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "کاهش سطح بزرگ‌نمایی"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "رمزگذاری"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "نمایش مبدأ"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "تغیر نمای تمام صفحه"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "لغزش به چپ"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "لغزش به پایین"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "لغزش به بالا"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "لغزش به راست"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_قابل خواندن"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "برو"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "رفتن به صفحه‌ی پیشین"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "رفتن به زیرصفحه‌ی پیشین"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "صفحه‌ی خانگی"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "رفتن به صفحه‌ی خانگی شما"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "خالی کردن سطل آشغال"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "بازگردانی بستن زبانه"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "افزودن پوشه‌ای جدید"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_بیرون بری نشانک ها..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_مدیریت موتور های جستجو..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_پاک کردن اطلا عات محرمانه..."
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "بازرسی صفحه"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "زبانه‌ی پیشین"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "زبانه‌ی بعدی"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "جابجایی تب به _مکان اول"
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "انتقال به زبانه‌ی عقبی"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "انتقال به زبانه‌ی جلویی"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "جابجایی تب به _مکان آخر"
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "تمرکز روی زبانه‌ی جاری"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "تمرکز روی نمای بعدی"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "فقط شمایل زبانه‌ی جاری را نمایش بده"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "بستن دیگر زبانه‌ها"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "باز کردن آخرین نشست"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "راهنما"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "پرسش‌های متداول"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_گزارش یک مشکل"
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "ابزارها"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "نوارفهرست"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "نوارناوبری"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "پنل کناری"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "پنل‌کناری"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "نوارنشانک"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "نواروضعیّت"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "خودکار"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "ژاپنی (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "کره‌ای (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "روسی (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "یونی‌کد (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "غربی (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "تنظیمات دستی..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "جدا کننده"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_مکان..."
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "گشودن یک مکان مشخّص"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_جستحوی وب..."
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "اجرای یک جست‌وجوی وب"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "بازگشودن زبانه یا پنجراه‌ای پیش‌تر بسته شده"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "نمایش نشانک‌های ذخیره شده"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_زبانه‌ها"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "نمایش فهرستی از همه‌ی زبانه‌های باز"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "فهرست"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "فهرست"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr "پیکربندی الحاقیه‌ی «%s» نتوانست بار شود: %s\n"
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "پیکربندی الحاقیه‌ی «%s» نتوانست ذخیره شود: %s\n"
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "صدور گواهینامه"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "هویت امضا کننده‌ی گواهینامه شناخته شده نیست."
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"گواهینامه با هویت مورد انتظار از پایگاهی که از آن صادر شده هم‌خوانی ندارد."
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "زمان فعال‌سازی گواهینامه هنوز نرسیده است."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "گواهی‌نامه باطل شده است."
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "الگوریتم گواهی‌نامه ناامن بنظر می‌رسد."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_صدور گواهی نامه"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "توضیحات امنیتی"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "تأیید نشده"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "اتّصال تأیید شده و رمزگذاری شده"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "یک اتصال رمزگذاری نشده باز کن"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "میزان کرد پنل‌کناری در راست"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "بستن پنل"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "میزان کرد پنل‌کناری در راست"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "نمایش شماره‌گیری سریع"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "نمایش صفحه‌ی خانگی"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "نمایش آخرین زبانه‌های باز"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "نمایش آخرین زبانه‌ها بدون بار کردن"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "نمایش صفحه خالی"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "موتور جستجوی پیشفرش را نمایش بده"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "یک صفحه شخصی سازی شده نمایش بدده"
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "ژاپنی (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "زبانه‌ی جدید"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "پنجره‌ی جدید"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "زبانه‌ی جاری"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "پیش‌فرض"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "شمایل"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "شمایل کوچک"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "متن"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "شمایل و متن"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "متن کنار شمایل"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "خودکار (گنوم یا محیط)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "خادم پیشکار HTTP"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "بدون خادم پیشکار"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "کروم"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "سافاری"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "آی‌فون"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "فایرفاکس"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "اینترنت اکسپلورر"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "سبْک نوارابزار"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "همیشه از قلم انتخابی من استفاده کن"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "قلم انتخابی کاربر را با قلم وب سایت جایگزین کن"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "پیکربندی نتوانست بار شود: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "مقدار پیکربندی نامعتبر «%s»"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "به این وب سایت اعتماد کن"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "امنیت نامشخص است"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s تا ذخیره دیتابیس اچ تی ام ال 5"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_ردکردن"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "ا_جازه داده شود"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s می خواهد از مکان شما اطلاع پیدا کند."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' امکان پیدا کردنش نیست"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "امکان بارگزاری صفحه ی '%s' وجود ندارد:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "آدرس دارای غلط املایی است"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "از اتصال کابل اترنت یا فعال بودن کارت وایرلس خود اطمینان پیدا کنید."
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "از صحت تنظیمات شبکه خود اطمینان حاصل کنید."
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "تلاش دوباره"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "تلاش دوباره"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "ارسال پیام به %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "پرونده‌ی «%s» نمی‌تواند در این پوشه ذخیره شود."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "شما اجازه‌ی نوشتن در این پوشه را ندارید."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "فضای آزاد کافی برای بارگیری «%s» وجود ندارد."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "پرونده نیاز به %s دارد، ولی فقط %s باقی مانده."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "وقتی میدوری شروع می‌شود:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "صفحه‌ی خانگی:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "رمزگذاری ترجیجی"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "بار کردن خودکار تصاویر"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "فعّال کردن بررسی املایی"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "فعّال کردن اسکریپت‌ها"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "فعّال کردن پشتیبانی WebGL"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "بزرگ‌نمایی متن و تصاویر"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "دخیره‌ی پرونده‌های بارگیری شده در:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "سبک نوارابزار:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "صفحه‌های جدید را باز کن در:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "دکمه‌های بستن روی زبانه‌ها"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "گشودن زبانه‌ها در کنار زبانه‌ی جاری"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"این که زبانه‌های جدید در کنار زبانه‌ی جاری گشوده شوند یا پس از آخرینشان"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "گشودن زبانه‌ها در پس‌زمینه"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "ویرایشگر متن"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "گیرنده‌ی اخبار"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "انبار وب"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "محرمانگی"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"کوکی‌ها داده‌های  ورود به حساب، بازی‌های ذخیره شده، یا نمایه‌های کاربری را "
+"برای مقاصد تبلیغاتی ذخیره می‌کنند"
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "فعّال کردن انبار برنامه‌های وب برون‌خط"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "فعّال کردن پشتیبانی ذخیره‌ی محلّی HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "الحاقات"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "مدیریت موتورهای جست‌وجو"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "نشانی:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "موتورهای جست‌وجو نتوانستند بار شوند. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "موتورهای جست‌وجو نتوانستد ذخیره شود. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "گشودن در زبانه‌ی جدید"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "برداشتن موارد تاریخچه شکست خورد: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "پیام برق‌آسا برای زبانه‌های پس‌زمینه"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "فعّال کردن پلاگین‌های نت‌اسکیپ"
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "پاک سازی داده‌های محرمانه"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "پاک سازی داده‌های محرمانه"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "پاک سازی داده‌های زیر:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "آخرین زبانه‌های باز"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "پاک سازی داده‌های محرمانه هنگام خروج از میدوری"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "ورود به حساب‌ها و گذرواژه‌های ذخیره شده"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "کوکی‌ها و داده‌های وبگاه‌ها"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "شمایل وبگاه"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "پاک‌سازی تاریخچه شکست خورد: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "برداشتن موارد قدیمی تاریخچه شکست خورد: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"پرونده‌ی گواهی‌نامه‌ی ریشه‌ای موجود نیست. گواهی‌نامه‌های SSL نمی‌توانند "
+"تصدیق شوند."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "پیکربندی نتوانست ذخیره شود. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "سطل آشغال نتوانست ذخیره شود. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "ترجیحات میدوری"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "غیرفعّال کردن همه‌ی الحاقات"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "نمایش یک محاوره پس از خرابی میدوری"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "دور انداختن زبانه‌های قدیمی"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "یک اجرای دیگر از میدوری هم‌اکنون در حال اجراست ولی پاسخ نمی‌دهد.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "نشانک‌ها نتوانستند بار شوند: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "نشست نتوانست بار شود:‌%s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "سطل آشغال نتوانست بار شود: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "تاریخچه آشغال نتوانست بار شود: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "خطای زیر اتّفاق افتاد:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "نادیده بگیر"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "ایجاد اجراگر"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "تغییرنام"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 1169967085c5c7b929dac74f92a5d0e978fc2713..4f45e7f466260e933170624430a72ad2dadef0b4 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,383 +8,369 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 05:15+0000\n"
-"PO-Revision-Date: 2011-01-30 14:39+0200\n"
-"Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-04-17 08:16+0000\n"
+"Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-04-18 05:10+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Kevyt verkkoselain"
-
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1321 ../midori/main.c:1717
-#: ../midori/main.c:1725 ../midori/main.c:1741
-#: ../midori/midori-websettings.c:315
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:2
 msgid "Web Browser"
 msgstr "Verkkoselain"
 
-#: ../midori/main.c:94
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Asetusten lataus epäonnistui: %s\n"
-
-#: ../midori/main.c:142
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "\"%s\" ei kelpaa asetuksen %s arvoksi."
-
-#: ../midori/main.c:147 ../midori/main.c:240
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Asetusarvo \"%s\" ei kelpaa"
-
-#: ../midori/main.c:345
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Hakukoneiden lataus epäonnistui. %s\n"
-
-#: ../midori/main.c:399
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Historian tyhjentäminen epäonnistui: %s\n"
-
-#: ../midori/main.c:421 ../midori/main.c:542 ../extensions/formhistory.c:443
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Tietokannan avaus epäonnistui: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:485
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Vanhojen sivuhistorian kohteiden poistaminen epäonnistui: %s\n"
-
-#: ../midori/main.c:525 ../panels/midori-history.c:180
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Kohteen poistaminen sivuhistoriasta epäonnistui: %s\n"
-
-#: ../midori/main.c:572
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Kirjanmerkkien tallennus epäonnistui. %s"
-
-#: ../midori/main.c:596
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Asetusten tallennus epäonnistui. %s"
-
-#: ../midori/main.c:631
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "Hakukoneiden tallennus epäonnistui. %s"
-
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:648 ../midori/main.c:668
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Roskakorin tallennus epäonnistui. %s"
-
-#: ../midori/main.c:719 ../midori/main.c:957
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Istunnon tallennus epäonnistui. %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori-verkkoselain"
 
-#: ../midori/main.c:904
-msgid ""
-"No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Juurisertifikaattia ei löydy. SSL-sertifikaatteja ei voi todentaa."
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Selaa verkkoa"
 
-#: ../midori/main.c:992
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Midori näyttää kaatuneen edellisellä käynnistyskerralla. Jos ongelma "
-"toistuu, voit kokeilla seuraavia keinoja sen ratkaisemiseksi."
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;selain"
 
-#: ../midori/main.c:1008
-msgid "Modify _preferences"
-msgstr "Muokkaa _asetuksia"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Uusi välilehti"
 
-#: ../midori/main.c:1012
-msgid "Reset the last _session"
-msgstr "Palauta _edellinen istunto"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Uusi ikkuna"
 
-#: ../midori/main.c:1017
-msgid "Disable all _extensions"
-msgstr "Poista liitä_nnäiset käytöstä"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Uusi yksityisen selauksen ikkuna"
 
-#: ../midori/main.c:1200 ../midori/main.c:2005
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Istunnon lataus epäonnistui: %s\n"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori-yksityisselaus"
 
-#: ../midori/main.c:1321
-msgid "No filename specified"
-msgstr "Tiedostonimeä ei annettu"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Yksityinen selaus"
 
-#: ../midori/main.c:1340
-msgid "An unknown error occured."
-msgstr "Tapahtui tuntematon virhe."
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Avaa uusi yksityinen selaus -ikkuna"
 
-#: ../midori/main.c:1371
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Kuva tallennettu osoitteeseen: %s\n"
 
-#: ../midori/main.c:1607
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Suorita OSOITE web-sovelluksena"
 
-#: ../midori/main.c:1607
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "OSOITE"
 
-#: ../midori/main.c:1610
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Lataa asetukset kohteesta KANSIO"
 
-#: ../midori/main.c:1610
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "KANSIO"
 
-#: ../midori/main.c:1613
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Yksityinen selaus, mitään muutoksia ei tallenneta"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"\"Siirrettävä tila\", kaikki käytönaikaiset tiedostot säilytetään yhdessä "
+"paikassa"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Näytä vianetsintädialogi"
 
-#: ../midori/main.c:1615
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Suorita annettu tiedostonimi javascriptinä"
 
-#: ../midori/main.c:1618
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Kaappaa kuva kohteen URI sisällöstä"
 
-#: ../midori/main.c:1621
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Suorita määritetty komento"
 
-#: ../midori/main.c:1623
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Listaa valitsimella -e/--execute suoritettavat komennot"
 
-#: ../midori/main.c:1625
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Näytä sovelluksen versio"
 
-#: ../midori/main.c:1627
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Osoitteet"
 
-#: ../midori/main.c:1629
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Estä säännöllistä LAUSEKEtta vastaavat URIt"
 
-#: ../midori/main.c:1629
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "LAUSEKE"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1633
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Palaa alkutilaan, kun käyttämättä SEKUNNIT sekuntia"
 
-#: ../midori/main.c:1633
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNNIT"
 
-#: ../midori/main.c:1714
-msgid "[Addresses]"
-msgstr "[Osoitteet]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Virhe: \"gdb\"-tiedostoa ei löytynyt\n"
 
-#: ../midori/main.c:1742
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Kommentit, ehdotukset ja vikailmoitukset osoitteeseen:"
 
-#: ../midori/main.c:1744
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Uudet versiot löydät osoitteesta:"
 
-#: ../midori/main.c:1805
-msgid "Website icons"
-msgstr "Sivustojen kuvakkeet"
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Tapahtui tuntematon virhe"
 
-#: ../midori/main.c:1807
-msgid "Cookies"
-msgstr "Evästeet"
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Kirjanmerkit"
 
-#: ../midori/main.c:1810
-msgid "'Flash' Cookies"
-msgstr "Flash-evästeet"
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Luo ki_rjanmerkki"
 
-#: ../midori/main.c:1814
-msgid "HTML5 _Databases"
-msgstr "HTML5:n _tietokannat"
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Laajennukset"
 
-#: ../midori/main.c:1888
-msgid "The specified configuration folder is invalid."
-msgstr "Määritetty asetuskansio ei kelpaa."
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historia"
 
-#: ../midori/main.c:1936
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Midori on jo käynnissä, muttei vastaa.\n"
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Käyttäjän _skriptit"
 
-#: ../midori/main.c:1973
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Kirjanmerkkien lataus epäonnistui: %s\n"
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "K_äyttäjätyylit"
 
-#: ../midori/main.c:2020
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Roskakorin lataus epäonnistui: %s\n"
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Uusi _välilehti"
 
-#: ../midori/main.c:2033
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Historian lataus epäonnistui: %s\n"
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Lataukset"
 
-#: ../midori/main.c:2046
-msgid "The following errors occured:"
-msgstr "Seuraavat virheet tapahtuivat:"
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "_Netscape-liitännäiset"
 
-#: ../midori/main.c:2062
-msgid "_Ignore"
-msgstr "_Ohita"
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "Suljetut _välilehdet"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Uusi i_kkuna"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Uusi ka_nsio"
 
-#: ../midori/midori-array.c:485
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Osoitteet]"
+
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Tiedostoa ei löytynyt."
 
-#: ../midori/midori-array.c:510 ../midori/midori-array.c:549
-#: ../midori/midori-array.c:572 ../midori/midori-array.c:582
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Virheellinen asiakirja."
 
-#: ../midori/midori-array.c:591
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Tunnistamaton kirjanmerkin muoto."
 
-#: ../midori/midori-array.c:806
-msgid "Writing failed."
-msgstr "Kirjoitus epäonnistui."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Siirry eteenpäin seuraavalle sivulle"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Siirry seuraavalle alasivulle"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Verkkohaku…"
 
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:4887
-#: ../midori/midori-browser.c:4893
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Lataa nykyinen sivu uudelleen"
 
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4890
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Keskeytä nykyisen sivun lataaminen"
 
-#: ../midori/midori-browser.c:448
-#, c-format
-msgid "%d%% loaded"
-msgstr "%d %% ladattu"
-
-#: ../midori/midori-browser.c:487
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Otsikon päivitys epäonnistui: %s\n"
 
-#: ../midori/midori-browser.c:500
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "\"%s\" ei kelpaa asetuksen %s arvoksi."
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Odottamaton asetus \"%s\""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Odottamaton toimenpide \"%s\"."
 
-#: ../midori/midori-browser.c:725
-msgid "New folder"
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Yksityinen selaus)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Kohteen lisääminen sivuhistoriaan epäonnistui: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: ../midori/midori-browser.c:725
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Muokkaa kansiota"
 
-#: ../midori/midori-browser.c:727
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Uusi kirjanmerkki"
 
-#: ../midori/midori-browser.c:727
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Muokkaa kirjanmerkkiä"
 
-#: ../midori/midori-browser.c:758
-msgid "_Title:"
-msgstr "_Nimi:"
-
-#: ../midori/midori-browser.c:775 ../midori/midori-searchaction.c:966
-msgid "_Description:"
-msgstr "Ku_vaus:"
-
-#: ../midori/midori-browser.c:794 ../midori/midori-searchaction.c:980
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Osoite:"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Anna kirjanmerkille nimi ja valitse missä sitä säilytetään."
 
-#: ../midori/midori-browser.c:826 ../midori/midori-browser.c:4065
-msgid "_Folder:"
-msgstr "_Kansio:"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Anna kansiolle nimi ja valitse missä sitä säilytetään."
 
-#: ../midori/midori-browser.c:836 ../midori/midori-browser.c:927
-#: ../midori/midori-browser.c:4070 ../midori/midori-browser.c:4098
-msgid "Toplevel folder"
-msgstr "Ylätason kansio"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Näytä _kirjanmerkkipalkissa"
 
-#: ../midori/midori-browser.c:868
+#: ../midori/midori-browser.c:1185
 msgid "Add to _Speed Dial"
 msgstr "Lisää pikavali_ntaan"
 
-#: ../midori/midori-browser.c:881
-msgid "Show in the tool_bar"
-msgstr "Näytä työkal_upalkissa"
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Tallenna tiedosto nimellä"
 
-#: ../midori/midori-browser.c:896
-msgid "Run as _web application"
-msgstr "Suorita _web-sovelluksena"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Tallenna liittyvät _resurssit"
 
-#: ../midori/midori-browser.c:972
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Tiedostoa \"%s\" ei voi tallentaa tähän kansioon."
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Uusi ikkuna on avattu"
 
-#: ../midori/midori-browser.c:974
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Sinulla ei ole kirjoitusoikeutta tähän sijaintiin."
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Uusi välilehti on avattu"
 
-#: ../midori/midori-browser.c:981
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Tila ei riitä tiedoston \"%s\" lataamiseen."
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Virhe kuvan avaamisessa!"
 
-#: ../midori/midori-browser.c:984
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Tilaa tarvitaan %s mutta jäljellä on vain %s."
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Valittua kuvaa ei voida avata oletuskatselimessa."
 
-#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4145
-msgid "Save file as"
-msgstr "Tallenna tiedosto nimellä"
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Virhe kuvan lataamisessa!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Valittua kuvaa ei voi ladata."
 
-#: ../midori/midori-browser.c:1448
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Tallenna tiedosto"
 
-#: ../midori/midori-browser.c:2147
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Lataa sivu uudelleen käyttämättä välimuistia"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: ../midori/midori-browser.c:2257
+#: ../midori/midori-browser.c:2692
 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"
@@ -392,127 +378,132 @@ msgid ""
 "Aggregator. Next time you click the news feed icon, it will be added "
 "automatically."
 msgstr ""
-"Avaa ylläoleva URI-osoite uutistenlukuohjelmassa. Tämä onnistuu"
+"Avaa yllä oleva URI-osoite uutistenlukuohjelmassa. Tämä onnistuu "
 "lukuohjelman toiminnolla \"Lisää tilaus\", \"Lisää syöte\" tms.\n"
 "Vaihtoehtoisesti voit avata Midorin asetukset ja valita sovellukset-"
 "välilehdeltä uutistenlukuohjelman. Tällöin uutissyötekuvakkeen "
 "napsauttaminen lisää syötteen automaattisesti."
 
-#: ../midori/midori-browser.c:2263 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Uusi syöte"
 
-#: ../midori/midori-browser.c:2306 ../midori/midori-browser.c:4952
-#: ../panels/midori-bookmarks.c:438
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Lisää uusi kirjanmerkki"
 
-#: ../midori/midori-browser.c:2861 ../midori/midori-searchaction.c:487
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Tyhjä"
 
-#: ../midori/midori-browser.c:3328 ../midori/sokoke.c:436
-#: ../midori/sokoke.c:446 ../midori/sokoke.c:474 ../midori/sokoke.c:503
-#: ../midori/sokoke.c:517
-msgid "Could not run external program."
-msgstr "Ulkoisen ohjelman suoritus epäonnistui."
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
 
-#: ../midori/midori-browser.c:3571 ../midori/midori-browser.c:5349
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Kohteen lisääminen sivuhistoriaan epäonnistui: %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Paina F7 käyttääksesi kohdistinselaintilaa. Sen ollessa aktiivisena sivuilla "
+"näkyy liikuteltava kursori."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Käytä kohdistinselaintilaa"
 
-#: ../midori/midori-browser.c:3898 ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:729
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Avaa kaikki välile_hdissä"
 
-#: ../midori/midori-browser.c:3905 ../panels/midori-bookmarks.c:759
-#: ../panels/midori-history.c:735 ../extensions/feed-panel/feed-panel.c:536
-msgid "Open in New _Tab"
-msgstr "Avaa uudessa _välilehdessä"
-
-#: ../midori/midori-browser.c:3908 ../midori/midori-view.c:2635
-#: ../midori/midori-view.c:4339 ../panels/midori-bookmarks.c:761
-#: ../panels/midori-history.c:737 ../extensions/feed-panel/feed-panel.c:538
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: ../midori/midori-browser.c:3987
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:3988
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:3989
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:3990
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:3991
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4016
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Tuo kirjanmerkit…"
 
-#: ../midori/midori-browser.c:4019 ../midori/midori-browser.c:4957
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Tuo kirjanmerkit"
 
-#: ../midori/midori-browser.c:4030
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Sovellus:"
 
-#: ../midori/midori-browser.c:4057 ../midori/midori-browser.c:4106
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Tuo XBEL- tai HTML-tiedostosta"
+
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Tuo tiedostosta"
 
-#: ../midori/midori-browser.c:4118
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Kirjanmerkkien tuonti epäonnistui"
 
-#: ../midori/midori-browser.c:4163
-msgid "Failed to export bookmarks"
-msgstr "Kirjanmerkkien vienti epäonnistui"
-
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4281
-msgid "Clear Private Data"
-msgstr "Poista yksityisyystietoja"
-
-#: ../midori/midori-browser.c:4285
-msgid "_Clear private data"
-msgstr "_Poista yksityisyystietoja"
-
-#: ../midori/midori-browser.c:4299
-msgid "Clear the following data:"
-msgstr "Poista seuraavat tiedot:"
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL-kirjanmerkit"
 
-#. i18n: Browsing history, visited web pages
-#: ../midori/midori-browser.c:4310 ../midori/sokoke.c:1411
-msgid "_History"
-msgstr "_Historia"
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Netscape-kirjanmerkit"
 
-#: ../midori/midori-browser.c:4315 ../midori/sokoke.c:1417
-msgid "_Closed Tabs"
-msgstr "Suljetut _välilehdet"
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+"Midori voi viedä kirjanmerkkejä ainoastaan XBEL (*.xbel)- ja Netscape "
+"(*.html) -muotoisina"
 
-#: ../midori/midori-browser.c:4335
-msgid "Clear private data when _quitting Midori"
-msgstr "Poista yksityisyystietoja, kun _Midori suljetaan"
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Kirjanmerkkien vienti epäonnistui"
 
-#: ../midori/midori-browser.c:4476
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Kevyt verkkoselain"
 
-#: ../midori/midori-browser.c:4478
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Katso about:version"
+
+#: ../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 "
@@ -523,1139 +514,1101 @@ msgstr ""
 "Foundationin julkaiseman GNU LGPL -lisenssin version 2.1 tai (halutessasi) "
 "uudemman ehtojen rajoissa."
 
-#: ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Elias Julkunen <elias.julkunen@gmail.com>\n"
-"Jari Rahkonen <jari.rahkonen@pp1.inet.fi>"
+"Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Aleksi Murtojärvi https://launchpad.net/~aleksi-murtojarvi\n"
+"  Erkka Juhaninmäki https://launchpad.net/~3rp3\n"
+"  Jari Rahkonen https://launchpad.net/~jari-r\n"
+"  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
+"  Teemu Kielinen https://launchpad.net/~teemu-kielinen\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Monista välilehti"
 
-#: ../midori/midori-browser.c:4803
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../midori/midori-browser.c:4805 ../midori/sokoke.c:1418
-msgid "New _Window"
-msgstr "Uusi i_kkuna"
-
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Avaa uusi ikkuna"
 
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Avaa uusi välilehti"
 
-#: ../midori/midori-browser.c:4811
-msgid "P_rivate Browsing"
-msgstr "_Yksityinen selaaminen"
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Uusi _yksityinen ikkuna"
 
-#: ../midori/midori-browser.c:4812
-msgid "Don't save any private data while browsing"
-msgstr "Älä tallenna yksityisyystietoja selatessa"
-
-#: ../midori/midori-browser.c:4816
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ../midori/midori-browser.c:4819
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "Tallenna sivu nimell_ä..."
+
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Tallenna tiedostoon"
 
-#: ../midori/midori-browser.c:4821
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Lisää pikavali_ntaan"
 
-#: ../midori/midori-browser.c:4822
-msgid "Add shortcut to speed dial"
-msgstr "Lisää sivu pikavalintaruutuun"
-
-#: ../midori/midori-browser.c:4824
-msgid "Add Shortcut to the _desktop"
-msgstr "Luo pikak_uvake työpöydälle"
-
-#: ../midori/midori-browser.c:4825
-msgid "Add shortcut to the desktop"
-msgstr "Luo pikakuvake työpöydälle"
-
-#: ../midori/midori-browser.c:4827
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "_Tilaa uutissyöte"
 
-#: ../midori/midori-browser.c:4828
-msgid "Subscribe to this news feed"
-msgstr "Tilaa tämä uutissyöte"
-
-#: ../midori/midori-browser.c:4833
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Sulje _välilehti"
 
-#: ../midori/midori-browser.c:4834
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Sulje avoin välilehti"
 
-#: ../midori/midori-browser.c:4836
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Sulje i_kkuna"
 
-#: ../midori/midori-browser.c:4837
-msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
-
-#: ../midori/midori-browser.c:4840
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Tulosta nykyinen sivu"
 
-#: ../midori/midori-browser.c:4843
-msgid "Quit the application"
-msgstr "Poistu sovelluksesta"
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Sulje k_aikki ikkunat"
 
-#: ../midori/midori-browser.c:4845
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../midori/midori-browser.c:4849
-msgid "Undo the last modification"
-msgstr "Peru viimeisin muutos"
-
-#: ../midori/midori-browser.c:4852
-msgid "Redo the last modification"
-msgstr "Toista viimeisin muutos"
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Etsi…"
 
-#: ../midori/midori-browser.c:4856
-msgid "Cut the selected text"
-msgstr "Leikkaa valittu teksti"
-
-#: ../midori/midori-browser.c:4859
-msgid "Copy the selected text"
-msgstr "Kopioi valittu teksti"
-
-#: ../midori/midori-browser.c:4862
-msgid "Paste text from the clipboard"
-msgstr "Liitä teksti leikepöydältä"
-
-#: ../midori/midori-browser.c:4865
-msgid "Delete the selected text"
-msgstr "Poista valittu teksti"
-
-#: ../midori/midori-browser.c:4868
-msgid "Select all text"
-msgstr "Valitse kaikki teksti"
-
-#: ../midori/midori-browser.c:4871
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Etsi sanaa tai merkkijonoa sivulta"
 
-#: ../midori/midori-browser.c:4873
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../midori/midori-browser.c:4874
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Etsi sanan tai merkkijonon seuraava esiintymä"
-
-#: ../midori/midori-browser.c:4876
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../midori/midori-browser.c:4877
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Etsi sanan tai merkkijonon edellinen esiintymä"
-
-#: ../midori/midori-browser.c:4881
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Muokkaa sovelluksen asetuksia"
 
-#: ../midori/midori-browser.c:4883
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../midori/midori-browser.c:4884
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Työkalupalkit"
 
-#: ../midori/midori-browser.c:4896
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Suurenna"
 
-#: ../midori/midori-browser.c:4899
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Pienennä"
 
-#: ../midori/midori-browser.c:4902
-msgid "Reset the zoom level"
-msgstr "Palauta suurennustaso"
-
-#: ../midori/midori-browser.c:4903
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Merkistö"
 
-#: ../midori/midori-browser.c:4905
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Näytä lä_hdekoodi"
 
-#: ../midori/midori-browser.c:4906
-msgid "View the source code of the page"
-msgstr "Näytä sivun lähdekoodi"
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Näytä _DOM-lähde"
 
-#: ../midori/midori-browser.c:4909
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Koh_distinselaintila"
+
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Kokoruututila päälle/pois"
 
-#: ../midori/midori-browser.c:4912
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Vieritä _vasempaan"
 
-#: ../midori/midori-browser.c:4913
-msgid "Scroll to the left"
-msgstr "Vieritä näkymää vasempaan"
-
-#: ../midori/midori-browser.c:4915
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Vieritä _alas"
 
-#: ../midori/midori-browser.c:4916
-msgid "Scroll down"
-msgstr "Vieritä näkymää alaspäin"
-
-#: ../midori/midori-browser.c:4918
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Vieritä yl_ös"
 
-#: ../midori/midori-browser.c:4919
-msgid "Scroll up"
-msgstr "Vieritä näkymää ylöspäin"
-
-#: ../midori/midori-browser.c:4921
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Vieritä oikeaan"
 
-#: ../midori/midori-browser.c:4922
-msgid "Scroll to the right"
-msgstr "Vieritä näkymää oikeaan"
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
 
-#: ../midori/midori-browser.c:4925
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Siirry"
 
-#: ../midori/midori-browser.c:4928
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Siirry takaisin edelliselle sivulle"
 
-#: ../midori/midori-browser.c:4931
-msgid "Go forward to the next page"
-msgstr "Siirry eteenpäin seuraavalle sivulle"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:4935
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Siirry edelliselle alasivulle"
 
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:4939
-msgid "Go to the next sub-page"
-msgstr "Siirry seuraavalle alasivulle"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Seuraava tai eteenpäin"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Siirry seuraavalle alisivulle tai seuraavalla sivulle historiassa"
 
-#: ../midori/midori-browser.c:4942
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Kotisivu"
+
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Siirry kotisivullesi"
 
-#: ../midori/midori-browser.c:4944
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Tyhjennä roskakori"
 
-#: ../midori/midori-browser.c:4945
-msgid "Delete the contents of the trash"
-msgstr "Poista roskakorin sisältö"
-
-#: ../midori/midori-browser.c:4947
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Palauta _välilehti"
 
-#: ../midori/midori-browser.c:4948
-msgid "Open the last closed tab"
-msgstr "Avaa viimeksi suljettu välilehti"
-
-#: ../midori/midori-browser.c:4954
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Luo uusi _kansio"
 
-#: ../midori/midori-browser.c:4955
-msgid "Add a new bookmark folder"
-msgstr "Luo uusi kirjanmerkkikansio"
-
-#: ../midori/midori-browser.c:4960
-msgid "_Export bookmarks"
-msgstr "_Vie kirjanmerkkejä"
-
-#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:496
-msgid "_Manage Search Engines"
-msgstr "_Hallitse hakukoneita"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Tuo kirjanmerkkejä…"
 
-#: ../midori/midori-browser.c:4964
-msgid "Add, edit and remove search engines…"
-msgstr "Lisää, muokkaa ja poista hakukoneita…"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Vie kirjanmerkit…"
 
-#: ../midori/midori-browser.c:4967
-msgid "_Clear Private Data"
-msgstr "_Poista yksityisyystietoja"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Hallitse hakukoneita…"
 
-#: ../midori/midori-browser.c:4968
-msgid "Clear private data…"
-msgstr "Poista yksityisyystietoja…"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Poista yksityisyystietoja…"
 
-#: ../midori/midori-browser.c:4972
+#: ../midori/midori-browser.c:5239
 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…"
-
-#: ../midori/midori-browser.c:4978
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Edellinen välilehti"
 
-#: ../midori/midori-browser.c:4979
-msgid "Switch to the previous tab"
-msgstr "Vaihda edelliselle välilehdelle"
-
-#: ../midori/midori-browser.c:4981
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Seuraava välilehti"
 
-#: ../midori/midori-browser.c:4982
-msgid "Switch to the next tab"
-msgstr "Vaihda seuraavalle välilehdelle"
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
 
-#: ../midori/midori-browser.c:4984
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Koh_dista avoimeen välilehteen"
 
-#: ../midori/midori-browser.c:4985
-msgid "Focus the current tab"
-msgstr "Kohdista avoimeen välilehteen"
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Kohdista seuraavaan näk_ymään"
 
-#: ../midori/midori-browser.c:4987
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Näytä vain _avoimen välilehden kuvake"
 
-#: ../midori/midori-browser.c:4988
-msgid "Only show the icon of the current tab"
-msgstr "Näytä vain avoimen välilehden kuvake"
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Sulje _muut välilehdet"
 
-#: ../midori/midori-browser.c:4990
-msgid "_Duplicate Current Tab"
-msgstr "_Monista välilehti"
-
-#: ../midori/midori-browser.c:4991
-msgid "Duplicate the current tab"
-msgstr "Monista avoin välilehti"
-
-#: ../midori/midori-browser.c:4993
-msgid "Close Ot_her Tabs"
-msgstr "Sulje _muut välilehdet"
-
-#: ../midori/midori-browser.c:4994
-msgid "Close all tabs except the current tab"
-msgstr "Sulje välilehdet avointa lukuunottamatta"
-
-#: ../midori/midori-browser.c:4996
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Avaa _edellinen istunto"
 
-#: ../midori/midori-browser.c:4997
-msgid "Open the tabs saved in the last session"
-msgstr "Avaa edellisellä käyttökerralla tallennetut sivut"
-
-#: ../midori/midori-browser.c:4999
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../midori/midori-browser.c:5001
-msgid "_Contents"
-msgstr "_Sisältö"
-
-#: ../midori/midori-browser.c:5002
-msgid "Show the documentation"
-msgstr "Näytä dokumentaatio"
-
-#: ../midori/midori-browser.c:5004
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Usein kysytyt kysymykset"
 
-#: ../midori/midori-browser.c:5005
-msgid "Show the Frequently Asked Questions"
-msgstr "Näytä usein kysytyt kysymykset"
-
-#: ../midori/midori-browser.c:5007
-msgid "_Report a Bug"
-msgstr "Il_moita ohjelmavirheestä"
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_Ilmoita ongelmasta..."
 
-#: ../midori/midori-browser.c:5008
-msgid "Open Midori's bug tracker"
-msgstr "Avaa Midorin vikojen seurantajärjestelmä"
-
-#: ../midori/midori-browser.c:5011
-msgid "Show information about the program"
-msgstr "Näytä tietoja sovelluksesta"
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Työkalut"
 
-#: ../midori/midori-browser.c:5019
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Valikkopalkki"
 
-#: ../midori/midori-browser.c:5020
-msgid "Show menubar"
-msgstr "Näytä valikkopalkki"
-
-#: ../midori/midori-browser.c:5023
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigointipalkki"
 
-#: ../midori/midori-browser.c:5024
-msgid "Show navigationbar"
-msgstr "Näytä navigointipalkki"
-
-#: ../midori/midori-browser.c:5027
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Sivupaneeli"
 
-#: ../midori/midori-browser.c:5028
-msgid "Show sidepanel"
-msgstr "Näytä sivupaneeli"
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Sivupaneeli"
 
-#: ../midori/midori-browser.c:5031
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Kirjanmerkkipalkki"
 
-#: ../midori/midori-browser.c:5032
-msgid "Show bookmarkbar"
-msgstr "Näytä kirjanmerkkipalkki"
-
-#: ../midori/midori-browser.c:5035
-msgid "_Transferbar"
-msgstr "_Latauspalkki"
-
-#: ../midori/midori-browser.c:5036
-msgid "Show transferbar"
-msgstr "Näytä latauspalkki"
-
-#: ../midori/midori-browser.c:5039
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Tilapalkki"
 
-#: ../midori/midori-browser.c:5040
-msgid "Show statusbar"
-msgstr "Näytä tilapalkki"
-
-#: ../midori/midori-browser.c:5048
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automaattinen"
 
-#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:223
-msgid "Chinese (BIG5)"
-msgstr "Kiinalainen (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Perinteinen Kiina (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Yksinkertaistettu kiinalainen (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5055
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japanilainen (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:225
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korealainen (EUC-KR)"
 
-#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Venäläinen (KOI8-R)"
 
-#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Mukautettu…"
 
-#: ../midori/midori-browser.c:5591
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Historian alustaminen epäonnistui: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Erotin"
 
-#: ../midori/midori-browser.c:5598
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Sijainti…"
 
-#: ../midori/midori-browser.c:5600
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Avaa tarkka sijainti"
 
-#: ../midori/midori-browser.c:5624
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Verkkohaku"
 
-#: ../midori/midori-browser.c:5626
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Hae verkkosivua"
 
-#: ../midori/midori-browser.c:5647
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna"
 
-#: ../midori/midori-browser.c:5660 ../midori/sokoke.c:1407
-msgid "_Bookmarks"
-msgstr "_Kirjanmerkit"
-
-#: ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Näytä tallennetut kirjanmerkit"
 
-#: ../midori/midori-browser.c:5676
-msgid "_Tools"
-msgstr "_Työkalut"
-
-#: ../midori/midori-browser.c:5691
-msgid "_Window"
-msgstr "I_kkuna"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Välilehdet"
 
-#: ../midori/midori-browser.c:5693
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Näytä luettelo kaikista avoimista välilehdistä"
 
-#: ../midori/midori-browser.c:5707
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Valikko"
 
-#: ../midori/midori-browser.c:5709
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Valikko"
 
-#: ../midori/midori-browser.c:6289
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Odottamaton asetus \"%s\""
-
-#: ../midori/midori-extension.c:286
+#: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr "Lisäosan \"%s\" asetusten lataus epäonnistui: %s\n"
+msgstr "Laajennuksen \"%s\" asetusten lataus epäonnistui: %s\n"
 
-#: ../midori/midori-extension.c:668 ../midori/midori-extension.c:765
-#: ../midori/midori-extension.c:862 ../midori/midori-extension.c:974
-#: ../extensions/addons.c:1638
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr "Lisäosan \"%s\" asetusten tallennus epäonnistui. %s\n"
+msgstr "Laajennuksen \"%s\" asetusten tallennus epäonnistui. %s\n"
 
-#: ../midori/midori-locationaction.c:393
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Valinta historiasta epäonnistui\n"
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "Vie varmenne"
 
-#: ../midori/midori-locationaction.c:477
-#, c-format
-msgid "Search for %s"
-msgstr "Etsi verkosta: %s"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Varmenteen allekirjoittajataho on tuntematon."
 
-#: ../midori/midori-locationaction.c:500
-#, c-format
-msgid "Search with %s"
-msgstr "Käytä hakua %s"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../midori/midori-locationaction.c:1311
-#, c-format
-msgid "Failed to execute database statement\n"
-msgstr "Tietokantakomennon suoritus epäonnistui\n"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Varmenteen aktivointiaika on tulevaisuudessa."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Varmenne on vanhentunut"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Jokin muu virhe varmenteen kelvollisuutta tarkistaessa."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Vie varmenne"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Salauksen tiedot"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1367
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "_Liitä ja siirry"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Varmentamaton"
 
-#: ../midori/midori-locationaction.c:1830
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Varmennettu ja salattu yhteys"
 
-#: ../midori/midori-panel.c:390 ../midori/midori-panel.c:391
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Avoin, salaamaton yhteys"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Aseta sivupaneeli oikealle"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Sulje paneeli"
 
-#: ../midori/midori-websettings.c:203
-msgid "Show Blank page"
-msgstr "Näytä tyhjä sivu"
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Aseta sivupaneeli vasemmalle"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Näytä pikavalinta"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Näytä kotisivu"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Näytä viimeksi avoimet välilehdet"
 
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Näytä viimeksi avoimet välilehdet lataamatta niitä"
 
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Näytä tyhjä sivu"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Näytä oletushakukone"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Näytä omavalintainen sivu"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanilainen (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:244
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Uusi välilehti"
 
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Nykyinen välilehti"
 
-#: ../midori/midori-websettings.c:261
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Oletus"
 
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Kuvakkeet"
 
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Pienet kuvakkeet"
 
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Teksti"
 
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Kuvakkeet ja teksti"
 
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Teksti kuvakkeiden vierellä"
 
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automaattinen (GNOME tai ympäristö)"
 
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
-msgstr "HTTP-välipalvelin"
+msgstr "HTTP-välityspalvelin"
 
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
-msgstr "Ei välipalvelinta"
-
-#: ../midori/midori-websettings.c:298
-msgid "All cookies"
-msgstr "Kaikki evästeet"
+msgstr "Ei välityspalvelinta"
 
-#: ../midori/midori-websettings.c:299
-msgid "Session cookies"
-msgstr "Istunnon evästeet"
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:300 ../katze/katze-utils.c:675
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:318
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:319
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:372
-msgid "Remember last window size"
-msgstr "Muista ikkunan koko"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Työkalupalkin painikkeiden tyyli"
 
-#: ../midori/midori-websettings.c:373
-msgid "Whether to save the last window size"
-msgstr "Tallennetaanko ikkunan koko lopetettaessa"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Käytä aina fonttivalintojani"
 
-#: ../midori/midori-websettings.c:381
-msgid "Last window width"
-msgstr "Edellinen ikkunan leveys"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Ohita sivustojen fontit omilla valinnoillani"
 
-#: ../midori/midori-websettings.c:382
-msgid "The last saved window width"
-msgstr "Viimeisin tallennettu Ikkunan leveys"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Asetusten lataus epäonnistui: %s\n"
 
-#: ../midori/midori-websettings.c:390
-msgid "Last window height"
-msgstr "Edellinen ikkunan korkeus"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Asetusarvo \"%s\" ei kelpaa"
 
-#: ../midori/midori-websettings.c:391
-msgid "The last saved window height"
-msgstr "Viimeisin tallennettu ikkunan korkeus"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:416
-msgid "Last panel position"
-msgstr "Edellinen paneelin sijainti"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Näytä välilehden t_eksti"
 
-#: ../midori/midori-websettings.c:417
-msgid "The last saved panel position"
-msgstr "Viimeisin tallennettu paneelin paikka"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Näytä vain välilehden k_uvake"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:426
-msgid "Last panel page"
-msgstr "Edellinen paneelin sivu"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Sulje oi_kealla oleva välilehti"
+msgstr[1] "Sulje oi_kealla olevat välilehdet"
 
-#: ../midori/midori-websettings.c:427
-msgid "The last saved panel page"
-msgstr "Viimeisin tallennettu paneelin sivu"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Su_lje toinen välilehti"
+msgstr[1] "Su_lje muut välilehdet"
 
-#: ../midori/midori-websettings.c:435
-msgid "Last Web search"
-msgstr "Viimeisin verkkohaku"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Luota tähän sivustoon"
 
-#: ../midori/midori-websettings.c:436
-msgid "The last saved Web search"
-msgstr "Viimeisin tallennettu verkkohaku"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Tuntematon salaus"
 
-#: ../midori/midori-websettings.c:445
-msgid "Show Menubar"
-msgstr "Näytä valikkopalkki"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s haluaa tallentaa HTML5-tietokannan."
 
-#: ../midori/midori-websettings.c:446
-msgid "Whether to show the menubar"
-msgstr "Näytetäänkö valikkopalkki"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Estä"
 
-#: ../midori/midori-websettings.c:454
-msgid "Show Navigationbar"
-msgstr "Näytä navigointipalkki"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Salli"
 
-#: ../midori/midori-websettings.c:455
-msgid "Whether to show the navigationbar"
-msgstr "Näytetäänkö navigointipalkki"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s haluaa tietää sijaintisi."
 
-#: ../midori/midori-websettings.c:463
-msgid "Show Bookmarkbar"
-msgstr "Näytä kirjanmerkkipalkki"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:464
-msgid "Whether to show the bookmarkbar"
-msgstr "Näytetäänkö kirjanmerkkipalkki"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Sivua '%s' ei voitu ladata:"
 
-#: ../midori/midori-websettings.c:472
-msgid "Show Panel"
-msgstr "Näytä paneeli"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Varmista, että osoite ei sisällä kirjoitusvirheitä"
 
-#: ../midori/midori-websettings.c:473
-msgid "Whether to show the panel"
-msgstr "Näytetäänkö paneeli"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Varmista, että verkkolaitteet toimivat (esim. johto on kiinni tai wifi-"
+"sovitin on aktiivinen)"
 
-#: ../midori/midori-websettings.c:488
-msgid "Show Transferbar"
-msgstr "Näytä latauspalkki"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Varmista, että verkkoasetukset ovat oikein"
 
-#: ../midori/midori-websettings.c:489
-msgid "Whether to show the transferbar"
-msgstr "Näytetäänkö latauspalkki"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Yritä uudelleen"
 
-#: ../midori/midori-websettings.c:497
-msgid "Show Statusbar"
-msgstr "Näytä tilapalkki"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Hups - %s"
 
-#: ../midori/midori-websettings.c:498
-msgid "Whether to show the statusbar"
-msgstr "Näytetäänkö tilapalkki"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:507
-msgid "Toolbar Style:"
-msgstr "Työkalupalkin tyyli:"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Yritä uudelleen"
 
-#: ../midori/midori-websettings.c:508
-msgid "The style of the toolbar"
-msgstr "Työkalupalkin painikkeiden tyyli"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Lähetä viesti osoitteeseen %s"
 
-#: ../midori/midori-websettings.c:524
-msgid "Show progress in location entry"
-msgstr "Näytä eteneminen osoitekentässä"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Lisää _hakukone..."
 
-#: ../midori/midori-websettings.c:525
-msgid "Whether to show loading progress in the location entry"
-msgstr "Näytetäänkö latauksen eteneminen osoitekentässä"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Avaa _linkki"
 
-#: ../midori/midori-websettings.c:540
-msgid "Search engines in location completion"
-msgstr "Osoitteen täydennyksen hakukoneet"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Avaa linkki uudelle _välilehdelle"
 
-#: ../midori/midori-websettings.c:541
-msgid "Whether to show search engines in the location completion"
-msgstr "Näytetäänkö hakukoneet osoitteen täydennysvaihtoehdoissa"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Avaa linkki välilehdelle _etualalla"
 
-#: ../midori/midori-websettings.c:549
-msgid "Toolbar Items"
-msgstr "Työkakupalkin painikkeet"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Avaa linkki välilehdelle t_austalla"
 
-#: ../midori/midori-websettings.c:550
-msgid "The items to show on the toolbar"
-msgstr "Työkalupalkissa näytettävät painikkeet"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Avaa linkki uudessa i_kkunassa"
 
-#: ../midori/midori-websettings.c:558
-msgid "Compact Sidepanel"
-msgstr "Tiivis sivupaneeli"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "K_opioi linkin kohde"
 
-#: ../midori/midori-websettings.c:559
-msgid "Whether to make the sidepanel compact"
-msgstr "Tiivistetäänkö sivupaneelia"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Tallenna _nimellä…"
 
-#: ../midori/midori-websettings.c:576
-msgid "Show operating controls of the panel"
-msgstr "Näytä paneelin käyttöpainikkeet"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Avaa _kuva uudessa ikkunassa"
 
-#: ../midori/midori-websettings.c:577
-msgid "Whether to show the operating controls of the panel"
-msgstr "Näytetäänkö paneelissa sen käyttöpanikkeet"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Avaa kuva uudelle _välilehdelle"
 
-#: ../midori/midori-websettings.c:592
-msgid "Align sidepanel on the right"
-msgstr "Sijoita sivupaneeli oikealle"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Kopioi ku_va"
 
-#: ../midori/midori-websettings.c:593
-msgid "Whether to align the sidepanel on the right"
-msgstr "Sijoitetaanko sivupaneeli ikkunan oikeaan reunaan"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Tallenna _kuva"
 
-#: ../midori/midori-websettings.c:608
-msgid "Open panels in separate windows"
-msgstr "Avaa paneelit omissa ikkunoissaan"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Avaa k_uvankatselimessa"
 
-#: ../midori/midori-websettings.c:609
-msgid "Whether to always open panels in separate windows"
-msgstr "Avataanko paneelit aina erillisiksi ikkunoiksi"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopioi videon _osoite"
 
-#: ../midori/midori-websettings.c:618
-msgid "When Midori starts:"
-msgstr "Kun Midori käynnistyy:"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Lataa _video"
 
-#: ../midori/midori-websettings.c:619
-msgid "What to do when Midori starts"
-msgstr "Mitä tehdään, kun Midori käynnistyy"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Avaa osoite uudelle _välilehdelle"
 
-#: ../midori/midori-websettings.c:628
-msgid "Homepage:"
-msgstr "Kotisivu:"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "_Etsi sanalla"
 
-#: ../midori/midori-websettings.c:629
-msgid "The homepage"
-msgstr "Kotisivu"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Hae verkosta"
 
-#: ../midori/midori-websettings.c:644
-msgid "Show crash dialog"
-msgstr "Näytä kaatumisdialogi"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Avaa _kehys uudessa välilehdessä"
 
-#: ../midori/midori-websettings.c:645
-msgid "Show a dialog after Midori crashed"
-msgstr "Näytä dialogi, jos Midori on kaatunut"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Tutki _elementtiä"
 
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:661
-msgid "Show speed dial in new tabs"
-msgstr "Näytä pikavalinta uusissa välilehdissä"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Avaa tai lataa tiedosto kohteesta %s"
 
-#: ../midori/midori-websettings.c:662
-msgid "Show speed dial in newly opened tabs"
-msgstr "Näytä pikavalinta, kun uusia välilehtiä avataan"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Tiedostonimi: %s"
 
-#: ../midori/midori-websettings.c:670
-msgid "Save downloaded files to:"
-msgstr "Tiedostojen tallennuskohde:"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tiedostotyyppi: \"%s\""
 
-#: ../midori/midori-websettings.c:671
-msgid "The folder downloaded files are saved to"
-msgstr "Kansio, johon ladatut tiedostot tallennetaan"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tiedostotyyppi: %s (\"%s\")"
 
-#: ../midori/midori-websettings.c:694
-msgid "Ask for the destination folder"
-msgstr "Kysy kohdekansiota"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Koko: %s"
 
-#: ../midori/midori-websettings.c:695
-msgid "Whether to ask for the destination folder when downloading a file"
-msgstr "Kysytäänkö kohdekansiota, kun tiedosto ladataan"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Avaa %s"
 
-#: ../midori/midori-websettings.c:716
-msgid "Notify when a transfer has been completed"
-msgstr "Ilmoita latauksen valmistumisesta"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Tutki sivua - %s"
 
-#: ../midori/midori-websettings.c:717
-msgid "Whether to show a notification when a transfer has been completed"
-msgstr "Näytä huomautus. kun tiedoston lataus tulee valmiiksi"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori ei tallenna mitään henkilökohtaisia tietoja:"
 
-#: ../midori/midori-websettings.c:729
-msgid "Download Manager"
-msgstr "Lataussovellus"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Historiaa tai evästeitä ei tallenneta."
 
-#: ../midori/midori-websettings.c:730
-msgid "An external download manager"
-msgstr "Ulkoinen latauksien hallintasovellus"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Laajennukset eivät ole käytössä."
 
-#: ../midori/midori-websettings.c:738
-msgid "Text Editor"
-msgstr "Tekstieditori"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"HTML5-paikallistallennus, paikallinen tietokanta ja sovellusten välimuisti "
+"ovat pois käytöstä."
 
-#: ../midori/midori-websettings.c:739
-msgid "An external text editor"
-msgstr "Ulkoinen tekstieditori"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori estää verkkosivustoja jäljittämästä käyttäjää:"
 
-#: ../midori/midori-websettings.c:754
-msgid "News Aggregator"
-msgstr "Uutistenlukija"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Viittausosoitteet typistetään pelkkään palvelimen nimeen."
 
-#: ../midori/midori-websettings.c:755
-msgid "An external news aggregator"
-msgstr "Ulkoinen uutissyötteiden lukuohjelma"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS-esihaku on pois käytöstä."
 
-#: ../midori/midori-websettings.c:763
-msgid "Location entry Search"
-msgstr "Osoitekentän haku"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Kieli- ja aikavyöhykeasetuksia ei paljasteta verkkosivustoille."
 
-#: ../midori/midori-websettings.c:764
-msgid "The search to perform inside the location entry"
-msgstr "Osoitekentässä käytettävä hakukone"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+"Verkkosivustot eivät voi listata Flashia tai muita Netscape-lisäosia."
 
-#: ../midori/midori-websettings.c:772
-msgid "Preferred Encoding"
-msgstr "Oletusmerkistö"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
 
-#: ../midori/midori-websettings.c:773
-msgid "The preferred character encoding"
-msgstr "Oletusarvoisesti käytettävä merkistökoodaus"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Sivun lataus viivästetty:"
 
-#: ../midori/midori-websettings.c:783
-msgid "Always Show Tabbar"
-msgstr "Näytä aina välilehtipalkki"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"Viivästetty lataus sovelluksen kaatumisen tai käynnistysasetusten vuoksi."
 
-#: ../midori/midori-websettings.c:784
-msgid "Always show the tabbar"
-msgstr "Näytä välilehtipalkki aina"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Lataa sivu"
 
-#: ../midori/midori-websettings.c:792
-msgid "Close Buttons on Tabs"
-msgstr "Sulkemispainikkeet välilehdissä"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Tyhjä sivu"
 
-#: ../midori/midori-websettings.c:793
-msgid "Whether tabs have close buttons"
-msgstr "Onko välilehdissä sulkemispainikkeet"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "edellinen"
 
-#: ../midori/midori-websettings.c:801
-msgid "Open new pages in:"
-msgstr "Avaa uudet sivut:"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "seuraava"
 
-#: ../midori/midori-websettings.c:802
-msgid "Where to open new pages"
-msgstr "Miten uudet sivut avataan"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Tulosta taustakuvat"
 
-#: ../midori/midori-websettings.c:811
-msgid "Open external pages in:"
-msgstr "Avaa ulkoiset sivut:"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Tulosta myös verkkosivujen taustakuvat"
 
-#: ../midori/midori-websettings.c:812
-msgid "Where to open externally opened pages"
-msgstr "Miten ulkoisesti avatut sivut avataan"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Ominaisuudet"
 
-#: ../midori/midori-websettings.c:821
-msgid "Middle click opens Selection"
-msgstr "Keskipainike avaa valinnan"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s/%s"
 
-#: ../midori/midori-websettings.c:822
-msgid "Load an address from the selection via middle click"
-msgstr "Lataa valittuna olevan osoitteen hiiren keskipainikkeella"
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
 
-#: ../midori/midori-websettings.c:830
-msgid "Open tabs in the background"
-msgstr "Avaa välilehdet taustalla"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
 
-#: ../midori/midori-websettings.c:831
-msgid "Whether to open new tabs in the background"
-msgstr "Avataanko uudet välilehdet taustalla"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
 
-#: ../midori/midori-websettings.c:839
-msgid "Open Tabs next to Current"
-msgstr "Avaa välilehdet nykyisen vierelle"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s jäljellä"
 
-#: ../midori/midori-websettings.c:840
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "? t"
 
-#: ../midori/midori-websettings.c:848
-msgid "Open popups in tabs"
-msgstr "Avaa ponnahdusikkunat välilehdille"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-websettings.c:849
-msgid "Whether to open popup windows in tabs"
-msgstr "Avataanko ponnahdusikkunat välilehdille"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Ladattu tiedosto on virheellinen."
 
-#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:88
-msgid "Load images automatically"
-msgstr "Lataa kuvat automaattisesti"
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
 
-#: ../midori/midori-websettings.c:860
-msgid "Load and display images automatically"
-msgstr "Lataa ja näytä kuvat automaattisesti"
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Tiedostoa \"%s\" ei voi tallentaa tähän kansioon."
 
-#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:97
-msgid "Enable scripts"
-msgstr "Salli skriptit"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Sinulla ei ole kirjoitusoikeutta tähän sijaintiin."
 
-#: ../midori/midori-websettings.c:868
-msgid "Enable embedded scripting languages"
-msgstr "Salli upotetut skriptauskielet"
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Tila ei riitä tiedoston \"%s\" lataamiseen."
 
-#: ../midori/midori-websettings.c:875 ../extensions/statusbar-features.c:106
-msgid "Enable Netscape plugins"
-msgstr "Salli Netscape-liitännäiset"
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Tilaa tarvitaan %s, mutta jäljellä on vain %s."
 
-#: ../midori/midori-websettings.c:876
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Lataa upotetut Netscapen liitännäisobjektit"
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Pikavalinta"
 
-#: ../midori/midori-websettings.c:892
-msgid "Enable Spell Checking"
-msgstr "Ota oikoluku käyttöön"
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Lisää pikavalinta napsauttamalla"
 
-#: ../midori/midori-websettings.c:893
-msgid "Enable spell checking while typing"
-msgstr "Käytä oikolukua kirjoittaessa"
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Syötä pikavalinnan osoite"
 
-#: ../midori/midori-websettings.c:901
-msgid "Enable HTML5 database support"
-msgstr "Ota käyttöön HTML5:n tietokantatuki"
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Lisää pikavalinnan otsake"
 
-#: ../midori/midori-websettings.c:902
-msgid "Whether to enable HTML5 database support"
-msgstr "Otetaanko HTML5-merkkauksen tietokantatuki käyttöön"
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Haluatko varmasti poistaa tämän pikavalinnan?"
 
-#: ../midori/midori-websettings.c:908
-msgid "Enable HTML5 local storage support"
-msgstr "Ota käyttöön HTML5:n paikallinen tallennus"
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Käynnistys"
 
-#: ../midori/midori-websettings.c:909
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Otetaanko HTML5:n paikallisen tallennuksen tuki käyttöön"
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Kun Midori käynnistyy:"
 
-#: ../midori/midori-websettings.c:917
-msgid "Enable offline web application cache"
-msgstr "Tallenna verkkosovellukset paikallisesti"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Kotisivu:"
 
-#: ../midori/midori-websettings.c:918
-msgid "Whether to enable offline web application cache"
-msgstr "Tallennetaanko verkkosovellukset paikalliseen välimuistiin"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Käytä _nykyistä sivua"
 
-#: ../midori/midori-websettings.c:943
-msgid "Zoom Text and Images"
-msgstr "Suurenna tekstiä ja kuvia"
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Aseta nykyinen sivu kotisivuksi"
 
-#: ../midori/midori-websettings.c:944
-msgid "Whether to zoom text and images"
-msgstr "Suurennetaanko sekä tekstiä että kuvia"
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Fontit"
 
-#: ../midori/midori-websettings.c:959
-msgid "Find inline while typing"
-msgstr "Etsi sivulta kirjoittaessa"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Suhteellinen fontti"
 
-#: ../midori/midori-websettings.c:960
-msgid "Whether to automatically find inline while typing"
-msgstr "Etsitäänkö kirjoitettua tekstiä automaattisesti sivulta"
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Tekstin esittämiseen oletusarvoisesti käytettävä fontti"
 
-#: ../midori/midori-websettings.c:975
-msgid "Kinetic scrolling"
-msgstr "Kineettinen vieritys"
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Tekstin esittämiseen käytettävän fontin oletuskoko"
 
-#: ../midori/midori-websettings.c:976
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Vieritetäänkö sivua kineettisesti vieritysnopeuden mukaan"
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Tasavälinen fontti"
 
-#: ../midori/midori-websettings.c:984
-msgid "Accept cookies"
-msgstr "Salli evästeet"
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "Tasavälisen tekstin esittämiseen käytettävä fontti"
 
-#: ../midori/midori-websettings.c:985
-msgid "What type of cookies to accept"
-msgstr "Minkälaiset evästeet sallitaan"
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "Tasavälisen tekstin oletusfonttikoko"
 
-#: ../midori/midori-websettings.c:994
-msgid "Maximum cookie age"
-msgstr "Evästeiden enimmäisikä"
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Fontin vähimmäiskoko"
 
-#: ../midori/midori-websettings.c:995
-msgid "The maximum number of days to save cookies for"
-msgstr "Evästetietojen enimmäissäilytysaika päivinä"
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Pienin tekstin esittämiseen käytettävä koko"
 
-#: ../midori/midori-websettings.c:1004
-msgid "Maximum history age"
-msgstr "Historian enimmäisikä"
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Oletusmerkistö"
 
-#: ../midori/midori-websettings.c:1005
-msgid "The maximum number of days to save the history for"
-msgstr "Montako päivää sivuja säilytetään sivuhistoriassa "
-
-#: ../midori/midori-websettings.c:1020
-msgid "Remember last downloaded files"
-msgstr "Muista ladatut tiedostot"
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Toiminta"
 
-#: ../midori/midori-websettings.c:1021
-msgid "Whether the last downloaded files are saved"
-msgstr "Tallennetaanko ladattujen tiedostojen lista"
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Lataa kuvat automaattisesti"
 
-#: ../midori/midori-websettings.c:1038
-msgid "Proxy server"
-msgstr "Välipalvelin"
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Ota oikoluku käyttöön"
 
-#: ../midori/midori-websettings.c:1039
-msgid "The type of proxy server to use"
-msgstr "Käytettävän välipalvelimen tyyppi"
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Salli skriptit"
 
-#: ../midori/midori-websettings.c:1048
-msgid "HTTP Proxy Server"
-msgstr "HTTP-välipalvelin"
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Käytä WebGL-tukea"
 
-#: ../midori/midori-websettings.c:1049
-msgid "The proxy server used for HTTP connections"
-msgstr "HTTP-yhteyksille käytettävä välipalvelin"
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Suurenna tekstiä ja kuvia"
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1065
-msgid "Identify as"
-msgstr "Tunnistautuminen"
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Salli skriptien ponnahdusikkunat"
 
-#: ../midori/midori-websettings.c:1066
-msgid "What to identify as to web pages"
-msgstr "Mitä selain ilmoittaa itsestään verkkoselaimille"
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Avaa ponnahdusikkunat skripteistä automaattisesti"
 
-#: ../midori/midori-websettings.c:1082
-msgid "Identification string"
-msgstr "Tunnistautumismerkkijono"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Oletusmittakaava"
 
-#: ../midori/midori-websettings.c:1083
-msgid "The application identification string"
-msgstr "Sovelluksen tunnistautumismerkkijono"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Suurennuskerroin uusille välilehdille"
 
-#: ../midori/midori-websettings.c:1099
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Ensisijaiset kielet"
 
-#: ../midori/midori-websettings.c:1100
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1663,647 +1616,403 @@ msgstr ""
 "Pilkuin erotettu lista kielistä, joilla monikieliset sivut pitäisi esittää. "
 "Esimerkiksi \"fi\", \"fi,en\" tai \"fi-fi;q=1.0, en-us;q=0.667\""
 
-#: ../midori/midori-websettings.c:1115
-msgid "Clear private data"
-msgstr "Poista yksityisyystietoja"
-
-#: ../midori/midori-websettings.c:1116
-msgid "The private data selected for deletion"
-msgstr "Poistettavaksi valitut yksityisyystiedot"
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Tiedostojen tallennuskohde:"
 
-#: ../midori/midori-websettings.c:1131
-msgid "Clear data"
-msgstr "Poista tietoja"
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Selaaminen"
 
-#: ../midori/midori-websettings.c:1132
-msgid "The data selected for deletion"
-msgstr "Poistettavaksi valitut tiedot"
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Teema:"
 
-#: ../midori/midori-view.c:1269
-#, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "%s haluaa tallentaa HTML5-tietokannan-"
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Työkalupalkin tyyli:"
 
-#: ../midori/midori-view.c:1273 ../midori/midori-view.c:1303
-msgid "_Deny"
-msgstr "_Estä"
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Avaa uudet sivut:"
 
-#: ../midori/midori-view.c:1273 ../midori/midori-view.c:1303
-msgid "_Allow"
-msgstr "_Salli"
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Uuden välilehden toiminta:"
 
-#: ../midori/midori-view.c:1299
-#, c-format
-msgid "%s wants to know your location."
-msgstr "%s haluaa tietää sijaintisi."
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Sulkemispainikkeet välilehdissä"
 
-#. 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:1400 ../midori/midori-view.c:4771
-#: ../midori/midori-view.c:4775
-#, c-format
-msgid "Error - %s"
-msgstr "Virhe - %s"
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Avaa välilehdet nykyisen vierelle"
 
-#: ../midori/midori-view.c:1401
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Sivun \"%s\" lataus epäonnistui."
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi"
 
-#: ../midori/midori-view.c:1403
-msgid "Try again"
-msgstr "Yritä uudelleen"
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Avaa välilehdet taustalla"
 
-#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1422
-#, c-format
-msgid "Not found - %s"
-msgstr "Ei löydy - %s"
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Tekstieditori"
 
-#: ../midori/midori-view.c:1607 ../midori/midori-view.c:2576
-#, c-format
-msgid "Send a message to %s"
-msgstr "Lähetä viesti osoitteeseen %s"
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Uutistenlukija"
 
-#: ../midori/midori-view.c:2355 ../midori/midori-view.c:2743
-msgid "Inspect _Element"
-msgstr "Tutki _elementtiä"
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Verkko"
 
-#: ../midori/midori-view.c:2407 ../midori/midori-view.c:2477
-msgid "Open Link in New _Tab"
-msgstr "Avaa linkki uudelle _välilehdelle"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Välityspalvelin"
 
-#: ../midori/midori-view.c:2411
-msgid "Open Link in _Foreground Tab"
-msgstr "Avaa linkki välilehdelle _etualalla"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-view.c:2412
-msgid "Open Link in _Background Tab"
-msgstr "Avaa linkki välilehdelle t_austalla"
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Portti"
 
-#: ../midori/midori-view.c:2415 ../midori/midori-view.c:2484
-msgid "Open Link in New _Window"
-msgstr "Avaa linkki uudessa i_kkunassa"
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Tuetut välityspalvelinten tyypit:"
 
-#: ../midori/midori-view.c:2418
-msgid "Open Link as Web A_pplication"
-msgstr "Avaa linkki _verkkosovelluksena"
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Välimuisti"
 
-#: ../midori/midori-view.c:2421
-msgid "Copy Link de_stination"
-msgstr "K_opioi linkin kohde"
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Välimuistiin tallennettujen sivujen enimmäiskoko levyllä"
 
-#: ../midori/midori-view.c:2424 ../midori/midori-view.c:2496
-msgid "_Save Link destination"
-msgstr "_Tallenna linkin kohde"
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "Mt"
 
-#: ../midori/midori-view.c:2425 ../midori/midori-view.c:2490
-msgid "_Download Link destination"
-msgstr "_Lataa linkin kohde"
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Tunnistautuminen"
 
-#: ../midori/midori-view.c:2429 ../midori/midori-view.c:2459
-#: ../midori/midori-view.c:2501
-msgid "Download with Download _Manager"
-msgstr "Lataa latau_ssovelluksella"
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Yksityisyys"
 
-#: ../midori/midori-view.c:2438
-msgid "Open _Image in New Tab"
-msgstr "Avaa kuva uudelle _välilehdelle"
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Poista evästeet viiveellä:"
 
-#: ../midori/midori-view.c:2441
-msgid "Copy Image _Address"
-msgstr "Kopioi kuvan _osoite"
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Evästetietojen enimmäissäilytysaika päivinä"
 
-#: ../midori/midori-view.c:2444
-msgid "Save I_mage"
-msgstr "Tallenna _kuva"
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Hyväksy evästeet vain sivustoilta, joilla vierailet"
 
-#: ../midori/midori-view.c:2445
-msgid "Download I_mage"
-msgstr "Lataa _kuva"
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Estä kolmansien osapuolten sivustojen evästeet"
 
-#: ../midori/midori-view.c:2452
-msgid "Copy Video _Address"
-msgstr "Kopioi videon _osoite"
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Evästeisiin tallennetaan kirjautumistietoja, pelitilanteita sekä "
+"käyttäjäprofiileja mainostajille."
 
-#: ../midori/midori-view.c:2455
-msgid "Save _Video"
-msgstr "Tallenna _video"
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Tallenna verkkosovellukset paikallisesti"
 
-#: ../midori/midori-view.c:2455
-msgid "Download _Video"
-msgstr "Lataa _video"
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Ota käyttöön HTML5:n paikallinen tallennus"
 
-#: ../midori/midori-view.c:2521
-msgid "Search _with"
-msgstr "_Etsi sanalla"
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Typistä verkkosivuille lähetettävät viittaustiedot"
 
-#: ../midori/midori-view.c:2556 ../midori/midori-view.c:2563
-msgid "_Search the Web"
-msgstr "_Hae verkosta"
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+"Lähetetäänkö \"Referer\"-otsakkeessa pelkkä viittaavan palvelimen nimi"
 
-#: ../midori/midori-view.c:2584
-msgid "Open Address in New _Tab"
-msgstr "Avaa osoite uudelle _välilehdelle"
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Poista sivut historiasta viiveellä:"
 
-#: ../midori/midori-view.c:2885
-msgid "Open or download file"
-msgstr "Avaa tai lataa tiedosto"
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Montako päivää sivuja säilytetään sivuhistoriassa"
 
-#: ../midori/midori-view.c:2904
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Tiedostotyyppi: \"%s\""
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Laajennukset"
 
-#: ../midori/midori-view.c:2907
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tiedostotyyppi: %s (\"%s\")"
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Hallitse hakukoneita"
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2911
-#, c-format
-msgid "Open %s"
-msgstr "Avaa %s"
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Lisää hakukone"
 
-#: ../midori/midori-view.c:3480
-#, c-format
-msgid "Inspect page - %s"
-msgstr "Tutki sivua - %s"
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Muokkaa hakukonetta"
 
-#: ../midori/midori-view.c:3769
-msgid "Speed Dial"
-msgstr "Pikavalinta"
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Nimi:"
 
-#: ../midori/midori-view.c:3770
-msgid "Click to add a shortcut"
-msgstr "Lisää pikavalinta napsauttamalla"
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "Ku_vaus:"
 
-#: ../midori/midori-view.c:3771
-msgid "Enter shortcut address"
-msgstr "Syötä pikavalinnan osoite"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Osoite:"
 
-#: ../midori/midori-view.c:3772
-msgid "Enter shortcut title"
-msgstr "Lisää pikavalinnan otsake"
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Merkki:"
 
-#: ../midori/midori-view.c:3773
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Haluatko varmasti postaa pikavalinnan?"
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Hallitse hakukoneita"
 
-#: ../midori/midori-view.c:3774
-msgid "Set number of columns and rows"
-msgstr "Aseta sarakkeiden ja rivien määrä"
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Aseta _oletukseksi"
 
-#: ../midori/midori-view.c:3775
-msgid "Enter number of columns and rows:"
-msgstr "Syötä sarakkeiden ja rivien määrä:"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Hakukoneiden lataus epäonnistui. %s\n"
 
-#: ../midori/midori-view.c:3776
-msgid "Invalid input for the size of the speed dial"
-msgstr "Arvo ei ole käyttökelpoinen pikavalinnan koko"
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Hakukoneiden tallennus epäonnistui. %s"
 
-#: ../midori/midori-view.c:3777
-msgid "Thumb size:"
-msgstr "Pienoiskuvan koko:"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Kirjanmerkit ja historia"
 
-#: ../midori/midori-view.c:3778
-msgid "Small"
-msgstr "Pieni"
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Etsi verkosta: %s"
 
-#: ../midori/midori-view.c:3779
-msgid "Medium"
-msgstr "Keskisuuri"
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Historiasta valitseminen epäonnistui: %s"
 
-#: ../midori/midori-view.c:3780
-msgid "Big"
-msgstr "Suuri"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Etsi käyttäen..."
 
-#: ../midori/midori-view.c:3805
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "Document cannot be displayed"
-msgstr "Asiakirjaa ei voi näyttää"
+msgid "Search with %s"
+msgstr "Käytä hakua %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Avaa sovelluksessa"
 
-#: ../midori/midori-view.c:3828
+#: ../midori/sokoke.c:227
 #, c-format
-msgid "No documentation installed"
-msgstr "Dokumentaatiota ei ole asennettu"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Valitse sovellus tai komento, jolla \"%s\" avataan:"
 
-#: ../midori/midori-view.c:3948
-msgid "Page loading delayed"
-msgstr "Sivun lataus viivästetty"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Ulkoisen ohjelman suoritus epäonnistui."
 
-#: ../midori/midori-view.c:3949
-msgid "Loading delayed either due to a recent crash or startup preferences."
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
 msgstr ""
-"Viivästetty lataus sovelluksen kaatumisen tai käynnistysasetusten vuoksi."
-
-#: ../midori/midori-view.c:3950
-msgid "Load Page"
-msgstr "Lataa sivu"
 
-#: ../midori/midori-view.c:4091
-msgid "Blank page"
-msgstr "Tyhjä sivu"
-
-#: ../midori/midori-view.c:4343
-msgid "_Duplicate Tab"
-msgstr "_Monista välilehti"
-
-#: ../midori/midori-view.c:4348
-msgid "Show Tab _Label"
-msgstr "Näytä välilehden t_eksti"
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Hakupalkki:"
 
-#: ../midori/midori-view.c:4348
-msgid "Show Tab _Icon Only"
-msgstr "Näytä vain välilehden k_uvake"
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "_Edellinen"
 
-#: ../midori/midori-view.c:4354
-msgid "Close ot_her Tabs"
-msgstr "Sulje _muut välilehdet"
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Seu_raava"
 
-#: ../midori/midori-view.c:4949
-msgid "Print background images"
-msgstr "Tulosta taustakuvat"
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Huomioi kirjainkoko"
 
-#: ../midori/midori-view.c:4950
-msgid "Whether background images should be printed"
-msgstr "Tulosta myös verkkosivujen taustakuvat"
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Sulje hakupalkki"
 
-#: ../midori/midori-view.c:4986 ../midori/midori-preferences.c:412
-msgid "Features"
-msgstr "Ominaisuudet"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d kirjanmerkki"
+msgstr[1] "%d kirjanmerkkiä"
 
-#. Page "General"
-#: ../midori/midori-preferences.c:329
-msgid "General"
-msgstr "Yleiset"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d alikansio"
+msgstr[1] "%d alikansiota"
 
-#: ../midori/midori-preferences.c:330
-msgid "Startup"
-msgstr "Käynnistys"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Tyhjä kansio"
 
-#: ../midori/midori-preferences.c:345 ../midori/midori-preferences.c:352
-msgid "Use current page as homepage"
-msgstr "Aseta nykyinen sivu kotisivuksi"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Kansion sisältö: %s ja ei yhtäkään kirjanmerkkiä"
 
-#: ../midori/midori-preferences.c:362 ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Lataukset"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Kansion sisältö: %s"
 
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:380
-msgid "Appearance"
-msgstr "Ulkoasu"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Kansion sisältö: %s ja %s"
 
-#: ../midori/midori-preferences.c:381
-msgid "Font settings"
-msgstr "Kirjasinasetukset"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Kirjanmerkki kohteeseen: %s"
 
-#: ../midori/midori-preferences.c:383
-msgid "Default Font Family"
-msgstr "Oletuskirjasin"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s ja ei yhtäkään kirjanmerkkiä"
 
-#: ../midori/midori-preferences.c:386
-msgid "The default font family used to display text"
-msgstr "Tekstin esittämiseen oletusarvoisesti käytettävä kirjasin"
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s ja %s"
 
-#: ../midori/midori-preferences.c:389
-msgid "The default font size used to display text"
-msgstr "Tekstin esittämiseen käytettävän kirjasimen oletuskoko"
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Muokkaa valittua kirjanmerkkiä"
 
-#: ../midori/midori-preferences.c:391
-msgid "Fixed-width Font Family"
-msgstr "Tasavälinen kirjasin"
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Poista valittu kirjanmerkki"
 
-#: ../midori/midori-preferences.c:394
-msgid "The font family used to display fixed-width text"
-msgstr "Tasavälisen tekstin esittämiseen käytettävä kirjasin"
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Lisää uusi kansio"
 
-#: ../midori/midori-preferences.c:397
-msgid "The font size used to display fixed-width text"
-msgstr "Tasavälisen tekstin oletuskirjasinkoko"
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Erotin</i>"
 
-#: ../midori/midori-preferences.c:399
-msgid "Minimum Font Size"
-msgstr "Kirjasimen vähimmäiskoko"
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Avaa uudessa _välilehdessä"
 
-#: ../midori/midori-preferences.c:402
-msgid "The minimum font size used to display text"
-msgstr "Pienin tekstin esittämiseen käytettävä koko"
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Etsi kirjanmerkeistä"
 
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:411
-msgid "Behavior"
-msgstr "Käytös"
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historia"
 
-#: ../midori/midori-preferences.c:420
-msgid "Enforce 96 dots per inch"
-msgstr "Pakota 96 pistettä tuumalle"
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Tänään"
 
-#: ../midori/midori-preferences.c:421
-msgid "Enforce a video dot density of 96 DPI"
-msgstr "Pakota näytön pistetarkkuudeksi 96 DPI"
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Eilen"
 
-#: ../midori/midori-preferences.c:433
-msgid "Allow scripts to open popups"
-msgstr "Salli skriptien ponnahdusikkunat"
-
-#: ../midori/midori-preferences.c:434
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Avaa ponnahdusikkunat skripteistä automaattisesti"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:453
-msgid "Interface"
-msgstr "Käyttöliittymä"
-
-#: ../midori/midori-preferences.c:454
-msgid "Navigationbar"
-msgstr "Navigointipalkki"
-
-#: ../midori/midori-preferences.c:464
-msgid "Browsing"
-msgstr "Selaaminen"
-
-#. Page "Applications"
-#: ../midori/midori-preferences.c:482
-msgid "Applications"
-msgstr "Sovellukset"
-
-#: ../midori/midori-preferences.c:483
-msgid "External applications"
-msgstr "Ulkoiset sovellukset"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:499 ../midori/midori-preferences.c:500
-msgid "Network"
-msgstr "Verkko"
-
-#: ../midori/midori-preferences.c:506
-msgid "Hostname"
-msgstr "Isäntänimi"
-
-#. Page "Privacy"
-#: ../midori/midori-preferences.c:520
-msgid "Privacy"
-msgstr "Yksityisyys"
-
-#: ../midori/midori-preferences.c:521
-msgid "Web Cookies"
-msgstr "Evästeet"
-
-#: ../midori/midori-preferences.c:522
-msgid "Delete cookies when quitting Midori"
-msgstr "Poista evästeet, kun Midori suljetaan"
-
-#: ../midori/midori-preferences.c:529
-msgid "Delete old cookies after 1 hour"
-msgstr "Säilytä evästeitä yksi tunti"
-
-#: ../midori/midori-preferences.c:530
-msgid "Delete old cookies after 1 day"
-msgstr "Säilytä evästeitä yksi päivä"
-
-#: ../midori/midori-preferences.c:531
-msgid "Delete old cookies after 1 week"
-msgstr "Säilytä evästeitä yksi viikko"
-
-#: ../midori/midori-preferences.c:532
-msgid "Delete old cookies after 1 month"
-msgstr "Säilytä evästeitä yksi kuukausi"
-
-#: ../midori/midori-preferences.c:533
-msgid "Delete old cookies after 1 year"
-msgstr "Säilytä evästeitä yksi vuosi"
-
-#: ../midori/midori-preferences.c:554
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Evästeisiin tallennetaan kirjautumistietoja, pelitilanteita sekä "
-"käyttäjäprofiileja mainostajille."
-
-#: ../midori/midori-preferences.c:570 ../panels/midori-history.c:114
-msgid "History"
-msgstr "Historia"
-
-#: ../midori/midori-preferences.c:575
-msgid "days"
-msgstr "vrk"
-
-#: ../midori/midori-searchaction.c:921
-msgid "Add search engine"
-msgstr "Lisää hakukone"
-
-#: ../midori/midori-searchaction.c:921
-msgid "Edit search engine"
-msgstr "Muokkaa hakukonetta"
-
-#: ../midori/midori-searchaction.c:950
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: ../midori/midori-searchaction.c:994
-msgid "_Icon:"
-msgstr "_Kuvake:"
-
-#: ../midori/midori-searchaction.c:1008
-msgid "_Token:"
-msgstr "_Merkki:"
-
-#: ../midori/midori-searchaction.c:1240
-msgid "Manage Search Engines"
-msgstr "Hallitse hakukoneita"
-
-#: ../midori/midori-searchaction.c:1340
-msgid "Use as _default"
-msgstr "Aseta _oletukseksi"
-
-#: ../midori/sokoke.c:390
-msgid "Open with"
-msgstr "Avaa sovelluksessa"
-
-#: ../midori/sokoke.c:395
-#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Valitse sovellus tai komento, jolla \"%s\" avataan:"
-
-#: ../midori/sokoke.c:1406
-msgid "_Bookmark"
-msgstr "_Kirjanmerkki"
-
-#: ../midori/sokoke.c:1408
-msgid "Add Boo_kmark"
-msgstr "Luo ki_rjanmerkki"
-
-#: ../midori/sokoke.c:1409
-msgid "_Console"
-msgstr "K_onsoli"
-
-#: ../midori/sokoke.c:1410
-msgid "_Extensions"
-msgstr "_Liitännäiset"
-
-#: ../midori/sokoke.c:1412
-msgid "_Homepage"
-msgstr "_Kotisivu"
-
-#: ../midori/sokoke.c:1413
-msgid "_Userscripts"
-msgstr "Käyttäjän _skriptit"
-
-#: ../midori/sokoke.c:1414
-msgid "New _Tab"
-msgstr "Uusi _välilehti"
-
-#: ../midori/sokoke.c:1415
-msgid "_Transfers"
-msgstr "_Lataukset"
-
-#: ../midori/sokoke.c:1416
-msgid "Netscape p_lugins"
-msgstr "_Netscape-liitännäiset"
-
-#: ../midori/sokoke.c:1419
-msgid "New _Folder"
-msgstr "Uusi ka_nsio"
-
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:228
-msgid "_Inline Find:"
-msgstr "_Hakupalkki:"
-
-#: ../toolbars/midori-findbar.c:262
-msgid "Previous"
-msgstr "_Edellinen"
-
-#: ../toolbars/midori-findbar.c:268
-msgid "Next"
-msgstr "Seu_raava"
-
-#: ../toolbars/midori-findbar.c:272
-msgid "Match Case"
-msgstr "Huomioi kirjainkoko"
-
-#: ../toolbars/midori-findbar.c:281
-msgid "Highlight Matches"
-msgstr "Korosta osumat"
-
-#: ../toolbars/midori-findbar.c:292
-msgid "Close Findbar"
-msgstr "Sulje hakupalkki"
-
-#: ../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 '<b>%s</b>' has been downloaded."
-msgstr "Tiedoston \"<b>%s</b>\" lataus on valmis."
-
-#: ../toolbars/midori-transferbar.c:126
-msgid "Transfer completed"
-msgstr "Tiedosto siirretty"
-
-#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144
-msgid "Clear All"
-msgstr "Tyhjennä"
-
-#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302
-msgid "Some files are being downloaded"
-msgstr "Tiedostojen lataus on kesken"
-
-#: ../toolbars/midori-transferbar.c:306
-msgid "_Quit Midori"
-msgstr "_Sulje Midori"
-
-#: ../toolbars/midori-transferbar.c:308
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Lataukset peruuntuvat, jos midori suljetaan."
-
-#: ../panels/midori-bookmarks.c:116
-msgid "Bookmarks"
-msgstr "Kirjanmerkit"
-
-#: ../panels/midori-bookmarks.c:276
-#, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Kirjanmerkin lisääminen epäonnistui: %s\n"
-
-#: ../panels/midori-bookmarks.c:446
-msgid "Edit the selected bookmark"
-msgstr "Muokkaa valittua kirjanmerkkiä"
-
-#: ../panels/midori-bookmarks.c:454
-msgid "Delete the selected bookmark"
-msgstr "Poista valittu kirjanmerkki"
-
-#: ../panels/midori-bookmarks.c:468
-msgid "Add a new folder"
-msgstr "Lisää uusi kansio"
-
-#: ../panels/midori-bookmarks.c:602 ../panels/midori-history.c:565
-msgid "<i>Separator</i>"
-msgstr "<i>Erotin</i>"
-
-#: ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "Liitännäiset"
-
-#: ../panels/midori-history.c:146
-msgid "A week ago"
-msgstr "Viikko sitten"
-
-#: ../panels/midori-history.c:148
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../panels/midori-history.c:151
-msgid "Today"
-msgstr "Tänään"
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "Viikko sitten"
 
-#: ../panels/midori-history.c:153
-msgid "Yesterday"
-msgstr "Eilen"
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Kohteen poistaminen sivuhistoriasta epäonnistui: %s\n"
 
-#: ../panels/midori-history.c:305
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Haluatko varmasti tyhjentää koko sivuhistorian?"
 
-#: ../panels/midori-history.c:350
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Luo kirjanmerkki sivuhistorian kohteeseen"
 
-#: ../panels/midori-history.c:359
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Poista valittu kohde sivuhistoriasta"
 
-#: ../panels/midori-history.c:367
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Tyhjennä koko sivuhistoria"
 
-#: ../panels/midori-transfers.c:481
-msgid "Open Destination _Folder"
-msgstr "Avaa _kohdekansio"
-
-#: ../panels/midori-transfers.c:484
-msgid "Copy Link Loc_ation"
-msgstr "Kopioi linkin ko_hde"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Etsi historiasta"
 
-#: ../katze/katze-http-auth.c:213
+#: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Ole hyvä ja tunnistaudu"
 
-#: ../katze/katze-http-auth.c:229
+#: ../katze/katze-http-auth.c:226
 msgid ""
 "A username and a password are required\n"
 "to open this location:"
@@ -2311,196 +2020,172 @@ msgstr ""
 "Sijainnin avaamiseen tarvitaan\n"
 "käyttäjätunnus ja salasana:"
 
-#: ../katze/katze-http-auth.c:243
+#: ../katze/katze-http-auth.c:240
 msgid "Username"
 msgstr "Tunnus"
 
-#: ../katze/katze-http-auth.c:256
+#: ../katze/katze-http-auth.c:253
 msgid "Password"
 msgstr "Salasana"
 
-#: ../katze/katze-http-auth.c:270
+#: ../katze/katze-http-auth.c:267
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../katze/katze-throbber.c:879
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Nimetyn kuvakkeen \"%s\" lataus epäonnistui"
-
-#: ../katze/katze-throbber.c:892
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Vakiokuvakkeen \"%s\" lataus epäonnistui"
-
-#: ../katze/katze-throbber.c:964
-msgid "Animation frames are broken"
-msgstr "Animaation kuvissa on vikaa"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ei mitään"
 
-#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Ominaisuus \"%s\" ei kelpaa kohteelle %s"
 
-#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585
-#: ../extensions/addons.c:313
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Valitse tiedosto"
 
-#: ../katze/katze-utils.c:571
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Valitse kansio"
 
-#: ../katze/katze-preferences.c:95
-#, c-format
-msgid "Preferences for %s"
-msgstr "????Kohteen %s asetukset"
-
-#: ../extensions/adblock.c:415
-msgid "Configure Advertisement filters"
-msgstr "Säädä mainossuodattimia"
-
-#: ../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 ""
-"Kirjoita valmiin suodatinlistan osoite tekstikenttään ja ota se käyttöön "
-"napsauttamalla \"Lisää\". Löydät lisää listoja osoitteesta %s."
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 tunti"
 
-#: ../extensions/adblock.c:587
-msgid "Configure _Advertisement filters…"
-msgstr "Säädä _mainossuodattimia…"
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 päivä"
 
-#: ../extensions/adblock.c:841
-msgid "Edit rule"
-msgstr "Muokkaa sääntöä"
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 viikko"
 
-#: ../extensions/adblock.c:854
-msgid "_Rule:"
-msgstr "_Nimi:"
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 kuukausi"
 
-#: ../extensions/adblock.c:908
-msgid "Bl_ock image"
-msgstr "_Estä kuva"
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 vuosi"
 
-#: ../extensions/adblock.c:913
-msgid "Bl_ock link"
-msgstr "_Estä linkki"
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "%s - asetukset"
 
-#: ../extensions/adblock.c:1492
-msgid "Advertisement blocker"
-msgstr "Mainosten estäjä"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-tarkistussumma:"
 
-#: ../extensions/adblock.c:1493
-msgid "Block advertisements according to a filter list"
-msgstr "Estä mainosten lataaminen suodatinlistan avulla"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-tarkistussumma:"
 
 #. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:223
-msgid "This page appears to contain a user script. Do you wish to install it?"
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "Sivu näyttää sisältävän käyttäjän skriptin. Asennetaanko se?"
 
-#: ../extensions/addons.c:224
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "_Asenna käyttäjän skripti"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:229
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr "Sivu näyttää sisältävän käyttäjän tyylimäärityksiä. Asennetaanko ne?"
 
-#: ../extensions/addons.c:230
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Asenna käyttäjän tyylit"
 
-#: ../extensions/addons.c:238
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Älä asenna"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:685
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Käyttäjän skriptit"
 
-#: ../extensions/addons.c:329 ../extensions/addons.c:687
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Käyttäjän tyylit"
 
-#: ../extensions/addons.c:385 ../extensions/addons.c:461
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Virhe"
 
-#: ../extensions/addons.c:425
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Poistetaanko \"%s\"?"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Poista käyttäjän skripti"
 
-#: ../extensions/addons.c:432
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Poista käyttäjän tyyli"
 
-#: ../extensions/addons.c:436
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
-msgstr "Tiedoston <b>%s</b> poistetaan pysyvästi."
+msgstr "Tiedosto <b>%s</b> poistetaan pysyvästi."
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:649
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Avaa tekstieditorissa"
 
-#: ../extensions/addons.c:574 ../extensions/addons.c:658
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Avaa kohdekansio"
 
-#: ../extensions/addons.c:640
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Lisää lisäosa"
 
-#: ../extensions/addons.c:667
-msgid "Open target folder for selected addon"
-msgstr "Avaa valitun lisäosan kohdekansio"
-
-#: ../extensions/addons.c:668
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Poista valittu lisäosa"
 
-#: ../extensions/addons.c:1639 ../extensions/addons.c:1801
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Käyttäjän lisäosat"
 
-#: ../extensions/addons.c:1760
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Kansiota \"%s\" ei voi valvoa: %s"
 
-#: ../extensions/addons.c:1802
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Käyttäjän skriptien ja tyylien tuki"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Värikkäät välilehdet"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Sävytä välilehdet eri väreillä"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:82
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
 #: ../extensions/cookie-manager/main.c:35
 msgid "Cookie Manager"
 msgstr "Evästeiden hallinta"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:112
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Poista kaikki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:114
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2508,31 +2193,31 @@ msgstr ""
 "Poista näkyvät evästeet. Jos suodatin on asetettu, poistetaan ainoastaan "
 "suodatinta vastaavat evästeet."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:129
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Laajenna kaikki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:136
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Supista kaikki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:578
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Haluatko varmasti poistaa kaikki evästeet?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:580
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Kysymys"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:589
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Vain suodatinta vastaavat kuvakkeet poistetaan."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Istunnon lopuksi"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2549,15 +2234,16 @@ msgstr ""
 "<b>Suojattu</b>: %s\n"
 "<b>Vanhentuu</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ei"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:700
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2566,29 +2252,22 @@ msgstr ""
 "<b>Verkkotunnus</b>: %s\n"
 "<b>Evästeet</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1030
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
-msgstr "Nimi:"
+msgstr "Nimi"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1083
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Laajenna kaikki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1091
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Supista kaikki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Filter:"
-msgstr "Suodata:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1149
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Syötä suodatin nähdäksesi ainoastaan evästeet, joiden nimi tai verkkkotunnus "
-"vastaavat syötettyä merkkijonoa"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Etsi evästeistä nimellä tai osoitteella"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
@@ -2606,34 +2285,103 @@ msgstr "Kopioi osoitteet välilehdiltä"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopioi kaikkien välilehtien osoitteet leikepöydälle"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Viivästetty lataus"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Lataa sivu vasta, kun välilehteä käytetään."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Kaksoisnapsauta saadaksesi lisätietoja"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Tämä laajennus näyttää glib-virheviestit ilmaisinalueella."
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Tapahtui virhe tiedoston latausta yrittäessä seuraavalla laajennuksella:\n"
+"%s\n"
+"\n"
+"Virhe:\n"
+"%s\n"
+"\n"
+"Jatka ilman tätä laajennusta."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Erillinen latausten hallinta - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Lataa tiedostot Aria2:lla"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Erillinen latausten hallinta - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Lataa tiedostot SteadyFlow'lla"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Komento:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Lataa tiedostot sovelluksella \"%s\" tai omavalintaisella komennolla"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Erillinen latausten hallinta - komentorivi"
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "XML ei sisällä tarvittavia Atom \"entry\"-elementtejä."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "XML ei sisällä tarvittavia Atom \"feed\"-elementtejä."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:392
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Päivitetty: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:661
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Syötteet"
 
-#: ../extensions/feed-panel/feed-panel.c:714
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Lisää syöte"
 
-#: ../extensions/feed-panel/feed-panel.c:721
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Poista syöte"
 
-#: ../extensions/feed-panel/feed-panel.c:803
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "Syött_eet"
 
@@ -2642,216 +2390,546 @@ msgstr "Syött_eet"
 msgid "Failed to find root element in feed XML data."
 msgstr "Syötteen XML ei sisällä juurielementtiä."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
-msgstr "Syöttemuotoa ei tueta."
+msgstr "Syötemuotoa ei tueta."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "XML-syötteen jäsennys epäonnistui: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "RSS-syötteen XML ei sisällä \"channel\"-elementtiä."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "RSS-syötteen versiota ei tueta."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "XML ei sisällä tarvittavia RSS \"item\"-elementtejä."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "XML ei sisällä tarvittavia RSS \"channel\"-elementtejä."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Syöte \"%s\" on jo olemassa"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Virhe ladattaessa syötettä \"%s\"."
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Syötepaneeli"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
-msgstr "Lue Atom/RSS-syötteitä"
+msgstr "Lue Atom-/RSS-syötteitä"
 
-#: ../extensions/formhistory.c:146
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "Lomakkeen arvon lisääminen epäonnistui: %s\n"
 
-#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Tietokantakäskyn suoritus epäonnistui: %s\n"
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Lomakehistoria"
 
-#: ../extensions/formhistory.c:520
-msgid "Stores history of entered form data"
-msgstr "Muistaa syötetyt lomaketiedot"
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Pääsalasana vaaditaan\n"
+"salasanatietokannan avaamiseksi"
 
-#: ../extensions/formhistory.c:524
-#, c-format
-msgid "Not available: %s"
-msgstr "Ei saatavilla: %s"
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Haluatko selaimen muistavan tämän sivun salasanan?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Muista"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ei nyt"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Ei koskaan tällä sivulla"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
 
-#: ../extensions/formhistory.c:525
-msgid "Resource files not installed"
-msgstr "Resurssitiedostoja ei ole asennettu"
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
 
-#: ../extensions/formhistory.c:531
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Lomakehistorian täyttäjä"
 
-#. i18n: Data entered into web forms by the user
-#: ../extensions/formhistory.c:543
-msgid "_Form History"
-msgstr "_Lomakehistoria"
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Muistaa syötetyt lomaketiedot"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Ehdotusten valinta epäonnistui\n"
 
-#: ../extensions/history-list.vala:149
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Kaikilla välilehdillä on jo vierailtu"
 
-#: ../extensions/history-list.vala:231
-msgid "Next Tab (History List)"
-msgstr "Seuraava välilehti (historialista)"
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Historialista"
 
-#: ../extensions/history-list.vala:232
-msgid "Next tab from history"
-msgstr "Seuraava välilehti sivuhistoriasta"
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Välilehden sulkemisen jälkeen"
 
-#: ../extensions/history-list.vala:241
-msgid "Previous Tab (History List)"
-msgstr "Edellinen välilehti (historialista)"
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Älä tee mitään"
 
-#: ../extensions/history-list.vala:242
-msgid "Previous tab from history"
-msgstr "Edellinen välilehti sivuhistoriasta"
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Vaihda viimeksi katseltuun välilehteen"
 
-#: ../extensions/history-list.vala:251
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Vaihda uusimpaan välilehteen"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Seuraava uusi välilehti (historialista)"
 
-#: ../extensions/history-list.vala:252
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Seuraava uusi välilehti sivuhistoriasta"
 
-#: ../extensions/history-list.vala:261
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Edellinen uusi välilehti (historialista)"
 
-#: ../extensions/history-list.vala:262
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Edellinen uusi välilehti sivuhistoriasta"
 
-#: ../extensions/history-list.vala:347
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Näytä valittu välilehti taustalla"
+
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Historialista"
 
-#: ../extensions/history-list.vala:348
-msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-msgstr "Selaa välilehtiä käyttöjärjestyksessä painamalla Ctrl+Tab"
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"Siirry viimeksi käytettyyn välilehteen suljettaessa tai vaihdettaessa "
+"välilehtiä"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL epäonnistui: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Hyväksy tämän istunnon ajaksi"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Estä"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Laajennuksen tietokannan avaaminen ei onnistunut: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Tietokantalausekkeen suorittaminen epäonnistui: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Haluatko varmasti poistaa kaikki JavaScript-luvat?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Poistetaanko kaikki JavaScript-luvat?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Tämä toiminto poistaa kaikki nykyiset JavaScript-luvat. Sinulta kysytään "
+"luvista uudelleen jokaisella eri sivustolla."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "NoJS:n asetukset"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Verkkotunnus"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Käytäntö"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Poista _kaikki"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Salli skriptit kaikilla sivustoilla"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "_Estä skriptit oletuksena tuntemattomista verkkotunnuksista"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Kiellä %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Salli %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Salli %s tämän käyttökerran ajan"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Selainikkuna"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Määrittämätön"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Sallittu"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Kielletty"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"NoJS-laajennuksen toiminnan estävä vakava virhe. Poista laajenus käytöstä."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Virhe NoJS-laajennuksessa"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Syy"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Asetuskansion luominen epäonnistui laajennukselle: %s"
 
-#: ../extensions/mouse-gestures.c:301
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Laajennuksen asetuskansion luominen ei onnistunut."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Laajennuksen tietokannan avaaminen ei onnistunut."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Tietokannan polku"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Salli kaikki sivustot"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Tuntemattoman verkkotunnuksen käytäntö"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Hyväksy väliaikaisesti"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Hiirieleet"
 
-#: ../extensions/mouse-gestures.c:302
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Ohjaa Midoria hiiren liikkeillä"
 
-#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:128 ../extensions/page-holder.c:174
-msgid "Pageholder"
-msgstr "Sivusäilö"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Lataa sivu uudelleen tai lopeta lataus"
 
-#: ../extensions/page-holder.c:158
-msgid "_Pageholder"
-msgstr "_Sivusäilö"
-
-#: ../extensions/page-holder.c:175
-msgid "Keep one or multiple pages open in parallel to your tabs"
-msgstr "Pidä yksi tai useampi sivu avoinna välilehtien vierellä"
-
-#: ../extensions/shortcuts.c:170
+#: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
 msgstr "Muokkaa pikanäppäimiä"
 
-#: ../extensions/shortcuts.c:276
+#: ../extensions/shortcuts.c:275
 msgid "Customize Sh_ortcuts…"
-msgstr "Muokkaa pika_näppäimiä,,,"
+msgstr "Muokkaa pika_näppäimiä"
 
-#: ../extensions/shortcuts.c:313
+#: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../extensions/shortcuts.c:314
+#: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
 msgstr "Näytä ja muokkaa toimintojen pikanäppäimiä"
 
-#: ../extensions/status-clock.c:174
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Tilapalkin kello"
 
-#: ../extensions/status-clock.c:175
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Näytä päiväys ja aika tilapalkissa"
 
-#: ../extensions/statusbar-features.c:85
+#: ../extensions/statusbar-features.c:152
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../extensions/statusbar-features.c:94
+#: ../extensions/statusbar-features.c:162
 msgid "Scripts"
 msgstr "Skriptit"
 
-#: ../extensions/statusbar-features.c:103
+#: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
 msgstr "Netscape-liitännäiset"
 
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Salli Netscape-liitännäiset"
+
+#: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Tilapalkin ominaisuudet"
 
-#: ../extensions/statusbar-features.c:141
+#: ../extensions/statusbar-features.c:260
 msgid "Easily toggle features on web pages on and off"
 msgstr "Hallitse verkkosivujen käyttämiä ominaisuuksia vaivattomasti"
 
-#: ../extensions/tab-panel.c:585 ../extensions/tab-panel.c:643
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Välilehtipaneeli"
 
-#: ../extensions/tab-panel.c:626
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "_Välilehtipaneeli"
 
-#: ../extensions/tab-panel.c:644
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Näytä välilehdet pystypaneelissa"
 
-#: ../extensions/tabs-minimized.c:77
+#: ../extensions/tabs-minimized.c:76
 msgid "Only Icons on Tabs by default"
 msgstr "Uusissa välilehdissä vain kuvakkeet"
 
-#: ../extensions/tabs-minimized.c:78
+#: ../extensions/tabs-minimized.c:77
 msgid "New tabs have no label by default"
 msgstr "Uusien välilehtien otsaketta ei näytetä oletusarvoisesti"
 
-#: ../extensions/toolbar-editor.c:387
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
-msgstr "Mukauta työkalupalkkia"
+msgstr "Muokkaa työkalupalkkia"
 
-#: ../extensions/toolbar-editor.c:403
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2859,30 +2937,560 @@ msgstr ""
 "Valitse työkalupalkissa näkyvät kohteet. Voit järjestää kohteita raahaamalla "
 "ja pudottamalla."
 
-#: ../extensions/toolbar-editor.c:419
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Käytettävissä"
 
-#: ../extensions/toolbar-editor.c:440
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Käytössä"
 
-#: ../extensions/toolbar-editor.c:575
-msgid "Customize _Toolbar…"
-msgstr "Mukauta työ_kalupalkkia…"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Muokkaa työkalupalkkia…"
 
-#: ../extensions/toolbar-editor.c:604
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Työkalupalkin muokkain"
 
-#: ../extensions/toolbar-editor.c:605
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Muokkaa työkalupalkin asettelua vaivattomasti"
 
-#: ../extensions/web-cache.c:472 ../extensions/web-cache.c:481
-msgid "Web Cache"
-msgstr "Välimuisti"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Poista yksityisyystietoja"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Poista yksityisyystiedot"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Poista seuraavat tiedot:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Viim_eksi avoinna olleet välilehdet"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Poista yksityisyystiedot, kun _Midori suljetaan"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Tallen_netut käyttäjätunnukset ja salasanat"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Evästeet ja verkkosivujen data"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Sivustojen kuvakkeet"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Historian tyhjentäminen epäonnistui: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Vanhojen sivuhistorian kohteiden poistaminen epäonnistui: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Kirjanmerkin lisääminen epäonnistui: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Kirjanmerkin päivittäminen epäonnistui: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Kirjanmerkkikohteen poistaminen epäonnistui: %s\n"
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr "Juurivarmennetta ei löydy. SSL-varmenteita ei voi todentaa."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Asetusten tallennus epäonnistui. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Roskakorin tallennus epäonnistui. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori kaatui viimeisimmällä käynnistyskerralla. Voit ilmoittaa ongelmasta - "
+"%s."
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Muokkaa _asetuksia"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Poista kaikki laaje_nnukset käytöstä"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Näytä dialogi, jos Midori on kaatunut"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Hylkää vanhat välilehdet"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Näytä kaatum_isloki"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Suorita _vianjäljittimessä"
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Midori on jo käynnissä, muttei vastaa.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Kirjanmerkkien lataus epäonnistui: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Istunnon lataus epäonnistui: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Roskakorin lataus epäonnistui: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Historian lataus epäonnistui: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Seuraavat virheet tapahtuivat:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ohita"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Haluatko varmasti poistaa kaikki evästeiden oikeudet?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Haluatko poistaa kaikki evästeiden oikeudet?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Tämä toiminto poistaa kaikki evästeiden oikeudet. Sinulta kysytään "
+"evästeiden oikeuksista uudelleen, kun vierailet eri verkkosivuilla."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Evästeiden oikeuksien hallinta"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Määritä evästeiden oikeudet"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Alla on lista verkkosivustoista ja niille asetetuista käytännöistä. Voit "
+"poistaa käytäntöjä merkitsemällä haluamasi kohdat ja napsauttamalla "
+"<i>Poista</i>. Voit asettaa käytännön verkkotunnuksella käsin syöttämällä "
+"verkkotunnuksen alle, valitsemalla käytännön ja napsauttamalla <i>Lisää</i>."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Virhe evästeiden oikeuksien hallinnan laajennuksessa"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Istunnon loppuun asti"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Verkkosivusto %s haluaa tallentaa %d evästettä."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Verkkosivusto %s haluaa tallentaa evästeen."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Useat verkkosivustot haluavat tallentaa yhteensä %d evästettä."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Hyväksy"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Hyväksy _tämän istunnon ajaksi"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "_Estä"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Estä tämän _kerran"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Polku"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Arvo"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Vanhenemispäivä"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Evästeiden turvallisuuden hallinta"
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Hallitse evästeiden oikeuksia sivustokohtaisesti"
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Uuden käynnistimen (%s) luominen epäonnistui: %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Käynnistin luotu"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "<b>%s</b> on nyt suoritettavissa käynnistimestä tai valikosta"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Virhe käynnistintä luotaessa"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Sovellukset"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Uusi _profiili"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Uusi _sovellus"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Luo uuden sovelluksen yksittäisestä sivustosta"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Virhe käynnistäessä"
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Luo _käynnistin"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Hallitse sovelluksena asennettuja verkkosivustoja"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Lataukset"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Tyhjennä"
 
-#: ../extensions/web-cache.c:473
-msgid "Cache HTTP communication on disk"
-msgstr "Välimuistita HTTP-liikenne levylle"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Latauksen avaaminen epäonnistui: %s"
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Avaa _kohdekansio"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopioi linkin ko_hde"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Tiedoston \"<b>%s</b>\" lataus on valmis."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' ja %d muuta tiedostoa on ladattu."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Tiedosto siirretty"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Tiedostojen lataus on kesken"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Lopeta Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Lataukset perutaan, jos Midori lopetetaan."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Latausten hallinta"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Näytä ladatut tiedostot"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Tietokannan päivittäminen epäonnistui: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Valinta tietokannasta epäonnistui: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Välilehtien ja istuntojen hallinta"
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Uuden muistiinpanon lisääminen tietokantaan epäonnistui: %s\n"
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Muistiinpanot"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Uusi muistiinpano"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Uusi muistiinpano"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Nimeä muistiinpano uudelleen"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Kopioi muistiinpano leikepöydälle"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Poista muistiinpano"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Kopioi valinta muistiinpanoksi"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Tallenna tekstileikkeitä verkkosivuilta muistiinpanoiksi"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Mainosten estäjä"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Estä mainosten lataaminen suodatinlistan avulla"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Säädä mainossuodattimia"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "_Estä kuva"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Estä linkki"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Muokkaa sääntöä"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Sääntö:"
index 8c6a8b43484c38f5dc2f764290a23ff4b4821333..e19bac8e23675accc4a3d4eef753b00ca473da8f 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
 # Jérôme Geulfucci <jeromeg@xfce.org> 2009
 # Stéphane Marguet <smarguet@gmail.com> 2009-2010
 # Patrick Douart <patrick.2@laposte.net> 2010
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-24 11:54+0000\n"
-"PO-Revision-Date: 2012-12-07 14:55+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-01-09 22:32+0000\n"
+"Last-Translator: Thomas Moraine <th.moraine@gmail.com>\n"
 "Language-Team: French <fr@li.org>\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-Launchpad-Export-Date: 2015-01-10 05:32+0000\n"
+"X-Generator: Launchpad (build 17298)\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Rechercher sur Internet"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navigateur Web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navigateur Web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Naviguer sur le web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nouvelle fenêtre de navigation privée"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nouvel onglet"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nouvelle fenêtre"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navigateur Internet"
+msgid "New Private Browsing Window"
+msgstr "Nouvelle fenêtre de navigation privée"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori (Navigation privée)"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Ouvrir une nouvelle fenêtre (Navigation privée)"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navigation privée"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Ouvrir une nouvelle fenêtre de navigation privée"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Capture enregistrée sous : %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr "Lancer l'ADRESSE comme une application internet"
+msgstr "Lancer ADRESSE comme une application internet"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Utiliser DOSSIER comme dossier de configuration"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "DOSSIER"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navigation privée, les modifications ne sont pas enregistrées"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 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"
+"Mode portable, tous les fichiers exécutables sont stockés en un seul endroit"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Fenêtre GTK+ simple avec WebKit, semblable à GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Afficher une fenêtre de diagnostic"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
-msgstr "Exécuter à l'intérieur de gdb et enregistrer une trace du crash"
+msgstr "Exécuter avec gdb et enregistrer une trace du crash"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Lancer le fichier spécifié en tant que javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Prendre une capture de l'URI spécifiée"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Exécuter la commande spécifiée"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Lister les commandes disponibles avec l'option -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Afficher la version du programme"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresses"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 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:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "MODÈLE"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDES"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Erreur : « gdb » est introuvable\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
-"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :"
+"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
-msgstr "Vérifier l'existence de nouvelles versions à :"
+msgstr "Vérifier l'existence de nouvelles versions à :"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Une erreur inconnue est survenue."
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Signets"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Ajouter un s_ignet"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensions"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historique"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Scripts _utilisateur"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Styles utilisateur"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nouvel o_nglet"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferts"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Greffons _Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Onglets _fermés"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nouvelle _fenêtre"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nouveau dossier"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adresses]"
 
 #: ../midori/midori-array.c:549
 msgid "File not found."
-msgstr "Fichier non trouvé."
+msgstr "Fichier introuvable."
 
 #: ../midori/midori-array.c:574 ../midori/midori-array.c:613
 #: ../midori/midori-array.c:637 ../midori/midori-array.c:647
@@ -234,137 +235,153 @@ msgstr "Document mal formé."
 
 #: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
-msgstr "Format de signets inconnus."
+msgstr "Format de signets non reconnu."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Aller à la sous-page suivante"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Recherche Web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
-msgstr "Actualiser la page courante"
+msgstr "Recharger la page courante"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Arrêter le chargement de la page courante"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Impossible de mettre à jour le titre : %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "La valeur « %s » n'est pas valide pour %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Paramètre inattendu « %s »"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Action inattendue « %s »."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navigation privée)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Sélectionner [texte]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Modifier le dossier"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nouveau signet"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Modifier le signet"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Modifier un signet"
 
-#: ../midori/midori-browser.c:973
-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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+"Veuillez saisir un nom pour votre signet et sélectionner un emplacement où "
+"l'enregistrer."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Ajouter à la page d'appel rapide"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Veuillez saisir un nom pour ce dossier et sélectionner un emplacement où "
+"l'enregistrer."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Afficher dans la _barre d'outils"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Afficher dans la _barre des signets"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Lancer comme une application _internet"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Ajouter à la page d'appel rapide"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Enregistrer le fichier sous"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "sauver les _ressources associées"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Une nouvelle fenêtre a été ouverte"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Un nouvel onglet a été ouvert"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Erreur pendant l'ouverture de l'image !"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 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:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Erreur lors du téléchargement de l'image !"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Ne peut pas télécharger l'image sélectionnez."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Enregistrer le fichier"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Actualiser la page sans mettre en cache"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Ouvrir le fichier"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -373,36 +390,30 @@ msgid ""
 "automatically."
 msgstr ""
 "Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a "
-"habituellement un menu ou un bouton \"Nouvel abonnement\",  \"Nouvelles RSS "
-"\" ou similaires. \\ nAlternativement allez dans Préférences, Applications "
-"de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous "
-"cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement."
+"habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS "
+"\" ou similaires.\n"
+"Alternativement allez dans Préférences, Applications de Midori, et "
+"sélectionnez un agrégateur de flux. La prochaine fois que vous cliquerez sur "
+"l'icône de fil de nouvelles, il sera ajouté automatiquement."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nouveau flux"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Ajouter un nouveau signet"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Partager cette page"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Vide"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Activer ou désactiver la navigation au curseur"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -410,113 +421,103 @@ 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:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Navigation au _curseur"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Tout ouvrir dans des _onglets"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Ouvrir dans un nouvel _onglet"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Ouvrir dans une nouvelle _fenêtre"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importer des signets…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importer des signets"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Application :"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importer depuis un fichier XBEL ou HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importer depuis un fichier"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Impossible d'importer les signets"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Signets XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Signets Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Impossible d'exporter les signets"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un navigateur Internet léger."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 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:4764
+#: ../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 "
@@ -528,7 +529,7 @@ 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:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Christian Dywan <christian@twotoasts.de>\n"
@@ -536,364 +537,409 @@ msgstr ""
 "Robert-André Mauchin <zebob.m@pengzone.org>\n"
 "Pascal Gervais <pggervais@yahoo.ca>\n"
 "Jérôme Geulfucci <jeromeg@xfce.org>\n"
-"Iliyas Jorio <inv.jorio@gmail.com>"
+"Iliyas Jorio <inv.jorio@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adrien Touminet https://launchpad.net/~pardaigle\n"
+"  Aleph https://launchpad.net/~aleph.donbinard\n"
+"  Christian Dywan https://launchpad.net/~kalikiana\n"
+"  Cody Garver https://launchpad.net/~codygarver\n"
+"  Corentin Noël https://launchpad.net/~tintou\n"
+"  Florent (LSc) https://launchpad.net/~lorkscorguar\n"
+"  Gaël Rousseau https://launchpad.net/~rodney78310\n"
+"  Iliyas Jorio https://launchpad.net/~inv-jorio\n"
+"  Ismael Cormier https://launchpad.net/~ismael-cormier\n"
+"  Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n"
+"  Marin Moulinier https://launchpad.net/~marinmoulinier\n"
+"  Matthieu Giraud https://launchpad.net/~matthieu-giraud-deactivatedaccount\n"
+"  Nikos https://launchpad.net/~nicolas-jovanovic\n"
+"  Pierre van Mart https://launchpad.net/~pierrevanmart\n"
+"  Pixmix https://launchpad.net/~vic952\n"
+"  Soukki44 https://launchpad.net/~psycolive\n"
+"  Stéphane Marguet https://launchpad.net/~stemp\n"
+"  Suriteka https://launchpad.net/~suriteka\n"
+"  Thomas Moraine https://launchpad.net/~th-moraine\n"
+"  TiBounise https://launchpad.net/~tibounise\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  frenchy82 https://launchpad.net/~cartes\n"
+"  gilles chaon https://launchpad.net/~g-chaon\n"
+"  jc1 https://launchpad.net/~jc1-quebecos\n"
+"  jman6495 https://launchpad.net/~jman6495\n"
+"  londumas https://launchpad.net/~helion331990\n"
+"  miyoyo https://launchpad.net/~smartandroidtv95\n"
+"  qperroit https://launchpad.net/~quentin-perroit\n"
+"  v4nadium https://launchpad.net/~v4nadium\n"
+"  xavierd https://launchpad.net/~magicrhesus"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dupliquer l'onglet actif"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Ouvrir une nouvelle fenêtre"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Ouvrir un nouvel onglet"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nouvelle fenêtre (Navigation _privée)"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Sauvegarder la page sous…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Enregistrer dans un fichier"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Ajouter à la page d'appel rapi_de"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Souscrire au flux de _nouvelles"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Fe_rmer l'onglet"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Fermer l'onglet actuel"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Fer_mer la fenêtre"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "Partager"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimer la page actuelle"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Fermer _toutes les fenêtres"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Trouver"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Rechercher un mot ou une phrase dans la page"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Rechercher le sui_vant"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Rechercher le _précédent"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configurer les préférences de l'application"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Barre d'outils"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Actualiser la page sans mettre en cache"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Augmenter le niveau d'agrandissement"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Diminuer le niveau d'agrandissement"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Encodage"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Afficher le code so_urce"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Voir la source _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navigation au _curseur"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Activer/désactiver le plein écran"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Défilement à _gauche"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Défilement en _bas"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Défilement en _haut"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Défilement à _droite"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Lisible"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "A_ller"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Aller à la page précédente"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Aller à la sous-page précédente"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Suivant ou Précédent"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Aller à la prochaine page ou onglet de l'historique"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Page d'a_ccueil"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Aller à la page d'accueil"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Vider la corbeille"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "A_nnuler la fermeture de l'onglet"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Ajouter un nouveau _dossier"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exporter des signets"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importer des signets…"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Gestion des moteurs de recherche"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exporter des signets…"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Effacer les informations privées"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Gestion des _moteurs de recherche..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "Supprimer les données de navigation…"
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspecter la page"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Onglet _précédent"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Onglet _suivant"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Déplacer l'onglet à la première position"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Déplacer l'onglet en _arrière"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Déplacer l'onglet en avant"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Déplacer l'onglet à la dernière position"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Mettre le focus sur l'onglet _actuel"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Mettre le focus sur la vue _suivante"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Afficher uniquement l'icône de l'onglet _courant"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Dupliquer l'onglet actif"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Fermer les _autres onglets"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Ouvrir la _dernière session"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Questions fréquentes"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Signaler un _problème"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barre de _menu"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barre de _navigation"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Panneau la_téral"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panneau latéral"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barre des _signets"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barre d'ét_at"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatique"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chinois traditionnel (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chinois simplifié (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonais (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russe (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Occidental (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personnalisé…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Impossible d'initialiser l'historique : %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Séparateur"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Emplacement…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Ouvrir un emplacement particulier"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Recherche _Internet…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Lancer une recherche sur Internet"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Afficher les signets sauvegardés"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "O_nglets"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Afficher une liste de tous les onglets ouverts"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
@@ -902,36 +948,36 @@ msgstr "Menu"
 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:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exporter le certificat"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "L'autorité de signature de certificat est inconnue."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 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:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -939,40 +985,40 @@ msgstr ""
 "Le certificat a été révoqué conformément à la liste de révocation de "
 "certificats GTL Connexions."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "L'algorithme du certificat est considéré comme peu sûr."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 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:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exporter le certificat"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Auto-signé"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Détails de sécurité"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Coller et continue_r"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Non vérifié"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Connection sécurisée"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Ouvrir une connection sécurisée"
 
@@ -989,438 +1035,452 @@ msgstr "Fermer le panneau"
 msgid "Align sidepanel to the left"
 msgstr "Aligner le panneau latéral sur la gauche"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Montrer l'Appel rapide"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Afficher la page d'accueil"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Afficher les derniers onglets ouverts"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Afficher les derniers onglets sans les charger"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Voir page blanche"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Voir le moteur de recherche par défaut"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Voir la page personnalisée"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonais (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nouvel onglet"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Onglet actuel"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Icônes"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Petites icônes"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Texte"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Icônes et texte"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Texte à côté des icônes"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatique (GNOME ou de l'environnement)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Serveur mandataire HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Pas de serveur mandataire"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Le style de la barre d'outils"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Toujours utiliser les polices choisies"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "Forcer toute page web à utiliser les polices ci-dessus"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "La configuration n'a pu être chargée : %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Valeur de paramètre non valide « %s »"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Impossible d'injecter feuille de style :%s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Afficher l'intitulé de l'onglet"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Afficher l'icône de l'onglet uniquement"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Fermer l'onglet de dro_ite"
+msgstr[1] "Fermer les onglets de dro_ite"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Faire confiance à ce site"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Sécurité inconnue"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s veut enregistrer une base de donnée HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Autoriser"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s veut connaître votre position"
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Erreur - %s"
+msgid "'%s' can't be found"
+msgstr "Impossible de trouver « %s »"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "La page « %s » n'a pu être chargée."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Impossible de charger la page « %s » :"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Réessayer"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Vérifiez la syntaxe de l'adresse"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Vérifiez qu'un câble ethernet est branché ou bien que la carte wifi est "
+"activée."
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Vérifiez que vos paramètres réseaux soient corrects"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Essayez de nouveau"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Oups - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Quelque chose a mal tournél avec « %s »."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Réessayer"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Envoyer un message à %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Ajouter un moteur de recherche"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Inspecter l'élé_ment"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ouvrir le _lien"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Ouvrir le lien dans un nouvel _onglet"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Ouvrir le lien en a_vant plan"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Ouvrir le lien en a_rrière plan"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Ouvrir le lien dans une nouvelle _fenêtre"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Ouvrir le lien comme une appli_cation internet"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copier l'adre_sse du lien"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Sauvegarder sous…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Ouvrir l'image dans une nouvelle fenêtre"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Ouvrir l'image dans un _nouvel onglet"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copier l'im_age"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Enregistrer l'i_mage"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Ouvrir dans la _Visionneuse d'images"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copier l'_adresse de la vidéo"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Enregistrer la _vidéo"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Télécharger la _vidéo"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Ouvrir l'adresse dans un nouvel _onglet"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Rechercher _avec"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Rechercher sur Internet"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Ouvrir l'adresse dans un nouvel _onglet"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Ouvrir le cadre dans un _nouvel onglet"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspecter l'élé_ment"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Ouvrir ou télécharger le fichier depuis %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nom du fichier : %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Type de fichier : « %s »"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Type de fichier : %s (« %s »)"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, 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:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Ouvrir %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Analyser la page - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Pas de documentation installée"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori ne stocke aucune donnée personnelle :"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Aucun historique ou cookie n'est enregistré."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Les extensions sont désactivées."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 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:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori empêche les sites web de traquer l'utilisateur :"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 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:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Le DNS préchargé est désactivé."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 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:4511
-msgid "Page loading delayed"
-msgstr "Chargement de la page différé"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Chargement de la page retardé :"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Charger la page"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Page vierge"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Dupliquer l'onglet"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Afficher l'intitulé de l'onglet"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Afficher l'icône de l'onglet uniquement"
-
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Fermer l'_autre onglet"
-msgstr[1] "Fermer les _autres onglets"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "précedent"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "suivant"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Imprimer les images d'arrière-plan"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Indique s'il faut imprimer les images d'arrière-plan"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Fonctionnalités"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s sur %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1428,27 +1488,27 @@ msgstr[0] "%d seconed"
 msgstr[1] "%d secondes"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s restantes"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?o"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Le fichier téléchargé est erroné."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1456,132 +1516,129 @@ 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."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Vous n'avez pas la permission pour écrire à cet endroit."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, 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-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Appel rapide"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Cliquez pour ajouter un raccourci"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Entrez l'adresse du raccourci"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Entrez le titre du raccourci"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Démarrage"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Au lancement de Midori :"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Page d'accueil :"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Utiliser la page _actuelle"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Utiliser la page courante comme page d'accueil"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Polices"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Police proportionnelle"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Police à largeur fixe"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
-msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe"
+msgstr ""
+"Famille de la police utilisée pour afficher les textes à largeur fixe"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Taille minimale de la police"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "La taille minimale de la police utilisée pour afficher les textes"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Encodage favori"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportement"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Charger les images automatiquement"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Activer la vérification de l'orthographe"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Activer les scripts"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Activer le support WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Activer les greffons Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Agrandir le texte et les images"
@@ -1596,132 +1653,141 @@ msgstr ""
 "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives "
 "(popups) automatiquement"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Niveau de zoom par défaut"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+"Niveau d'agrandissement dans lequel seront ouverts les nouveaux onglets"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Langues préférés"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
+"pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-"
+"fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Enregistrer les téléchargements dans :"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navigation"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Thème :"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Style de la barre d'outils"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Ouvrir les nouvelles pages dans :"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Comportement du nouvel onglet :"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Boutons de fermeture sur les onglets"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Toujours afficher la barre d'onglets"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Ouvrir les onglets à côté de l'onglet actif"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Ouvrir les onglets en arrière-plan"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Éditeur de texte"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agrégateur de flux"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Réseau"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Serveur mandataire"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nom de l'hôte"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Types de proxy supportés :"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Cache internet"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "Mo"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "S'identifier comme"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Vie privée"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Effacer les anciens cookies après :"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 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-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "N'accepter les cookies que de sites que vous visitez"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Bloquer les cookies envoyés par des sites tiers"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1730,125 +1796,124 @@ msgstr ""
 "jeu ou des profils informations\n"
 " sur vous utilisées à des fins publicitaires."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Activer le cache d'applications web hors ligne"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 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/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 "Si l'en-tête « Referer » (qui fournit des informations à propos de la page "
 "précédente où vous vous trouviez) doit être raccourcie au nom d'hôte"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Effacer les pages de l'historique après :"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Le nombre maximal de jours durant lesquels conserver l'historique"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Gestion des moteurs de recherche"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Ajouter un moteur de recherche"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Modifier le moteur de recherche"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Description :"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Identifiant :"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gestion des moteurs de recherche"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Par dé_faut"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, 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/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historique"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Favoris et Historique"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Impossible d'initialiser l'historique : %s"
+msgid "Search for %s"
+msgstr "Rechercher %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Impossible de sélectionner dans l'historique : %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Rechercher %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Rechercher avec…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Rechercher avec %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Choisir une application ou une commande pour ouvrir \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Impossible de lancer le programme externe."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -1873,79 +1938,136 @@ msgstr "Sensible à la casse"
 msgid "Close Findbar"
 msgstr "Fermer la barre de recherche"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Échec de l'ajout du signet : %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d signet"
+msgstr[1] "%d signets"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d sous-dossier"
+msgstr[1] "%d sous-dossiers"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Dossier vide"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Dossier contenant %s mais aucun signet"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Dossier contenant %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Dossier contenant %s et %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Signet vers : %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Échec à l'ajout du signet : %s\n"
+msgid "%s and no bookmark"
+msgstr "%s mais aucun signet"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s et %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Modifier le signet sélectionné"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Supprimer le signet sélectionné"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Ajouter un nouveau dossier"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Séparateur</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Ouvrir dans un nouvel _onglet"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Recherche dans signets"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historique"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Hier"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Il y a une semaine"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, 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:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Supprimer l'élément sélectionné dans l'historique"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Effacer tout l'historique"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Historique de recherche"
 
@@ -1973,126 +2095,75 @@ msgstr "Mot de passe"
 msgid "_Remember password"
 msgstr "Se _souvenir du mot de passe"
 
-#: ../katze/katze-throbber.c:947
-#, 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:960
-#, 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:1040
-msgid "Animation frames are broken"
-msgstr "Les trames d'animation sont corrompues"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Aucun"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "La propriété « %s » n'est pas valide pour %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Choisissez un fichier"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Choisissez un dossier"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 heure"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 jour"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 semaine"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mois"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 an"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Préférences pour %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Somme de contrôle MD5 :"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Somme de contrôle SHA1 :"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurer les filtres de publicité"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte "
-"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de "
-"listes à %s."
+"Cette page semble contenir un script utilisateur. Voulez-vous l'installer?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Modifier les règles"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Installer le script utilisateur"
 
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Règles :"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "_Bloquer l'image"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "B_loquer le lien"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Bloqueur de publicités"
-
-#: ../extensions/adblock.c:1926
-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
-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
-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
-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?"
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+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
 msgid "_Install user style"
@@ -2102,16 +2173,16 @@ msgstr "_Installer un style utilisateur"
 msgid "Don't install"
 msgstr "Ne pas installer"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Scripts utilisateur"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Styles utilisateur"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Erreur"
 
@@ -2133,40 +2204,40 @@ msgstr "Supprimer un style utilisateur"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Le fichier « <b>%s</b> » sera définitivement supprimé."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Ouvrir dans l'éditeur de texte"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Ouvrir le _dossier de destination"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Ajouter une extension"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Supprimer l'extension sélectionnée"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Extensions utilisateur"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Impossible de surveiller le dossier « %s » : %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Support des scripts et styles utilisateur"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Onglets colorés"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Donner une couleur distincte à chaque onglet"
 
@@ -2175,11 +2246,11 @@ msgstr "Donner une couleur distincte à chaque onglet"
 msgid "Cookie Manager"
 msgstr "Gestionnaire de cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Supprimer tous"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2187,31 +2258,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:116
 msgid "Expand All"
 msgstr "Afficher tous"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Masquer tous"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Question"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "À la fin de la session"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2229,15 +2300,15 @@ msgstr ""
 "<b>Expire</b> : %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Oui"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Non"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2246,20 +2317,20 @@ msgstr ""
 "<b>Domaine</b> : %s\n"
 "<b>Fichiers témoins</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nom"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Afficher tous"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Masquer tous"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Recherche les cookies par nom ou domaine"
 
@@ -2279,28 +2350,50 @@ msgstr "Copie l'adresse des onglets"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copier les adresses de tous les onglets vers le presse-papiers"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Chargement différé"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Délai en secondes avant le chargement de la page :"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr ""
 "Retard de chargement des pages jusqu'à ce que vous utilisez réellement "
 "l'onglet."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Double cliquez pour avoir plus d'informations"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Cette extension affiche les messages d'erreur de glib dans la barre des "
+"tâches"
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Une erreur est survenue en essayant de télécharger un fichier avec le plugin "
-"suivant charge différée: \n"
+"Une erreur est survenue lors du téléchargement d'un fichier à l'aide du "
+"plugin suivant:\n"
+"%s\n"
+"\n"
+"Erreur:\n"
+"%s\n"
+"\n"
+"Veuillez continuer sans ce plugin."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2308,7 +2401,7 @@ msgstr "Gestionnaire de téléchargement externe - Aria2"
 
 #: ../extensions/external-download-manager.vala:176
 msgid "Download files with Aria2"
-msgstr "Télécharger des fichiers avec Aria2"
+msgstr "Télécharger les fichiers avec Aria2"
 
 #: ../extensions/external-download-manager.vala:202
 msgid "External Download Manager - SteadyFlow"
@@ -2343,25 +2436,25 @@ msgstr ""
 "Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Dernière mise à jour : %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Flux"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Ajouter un nouveau flux"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Supprimer un flux"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Flux"
 
@@ -2380,41 +2473,41 @@ msgstr "Format de flux non pris en charge."
 msgid "Failed to parse XML feed: %s"
 msgstr "Impossible d'analyser le flux XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 "Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "La version trouvée du flux RSS n'est pas prise en charge."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 "Impossible de trouver les éléments \"item\" requis dans les données XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Impossible de trouver les éléments RSS \"channel\" requis dans les données "
 "XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Le flux « %s » existe déjà"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Erreur lors du chargement du flux « %s »"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panneau de flux"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Lire des flux Atom et RSS"
 
@@ -2435,123 +2528,414 @@ msgstr ""
 "Le mot de passe maître est requis\n"
 "pour ouvrir la base de mots de passe"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Se souvenir du mot de passe sur cette page ?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Mémoriser"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Pas maintenant"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Jamais sur cette page"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Basculer vers l'état de l'historique du formulaire"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Activer ou désactiver l'historique de l'onglet courant."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Impossible d'ouvrir la base de données : %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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 "
+"Active seulement l'historique via le raccourci clavier (Ctrl+Maj+F) par "
 "onglet"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Autocomplétion des formulaires"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Stocke l'historique des saisies de formulaire"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Impossible de sélectionner les suggestions\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Ils n'y a pas d'onglets qui n'ont pas été visités"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Liste historique"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Comportement de la fermeture d'onglet"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Basculer vers le dernier onglet vu"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Basculer vers l'onglet le plus récent"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Clignoter en cas d'onglet en arrière-plan"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Nouvel onglet suivant (depuis l'historique)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Onglet suivant dans l'historique"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Nouvel onglet précédent (depuis l'historique)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Onglet précédent dans l'historique"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Afficher l'onglet en arrière-plan (liste de l'historique)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Afficher les onglets sélectionnés en arrière-plan"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Liste de l'historique des onglets"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Aller au onglets utilisé quand on change ou ferme des onglets"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL échoué : %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Accepter"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Accepter pour la session"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloquer"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Impossible d'ouvrir la base de données de l'extension : %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Impossible d'exécuter l'instruction de la base de données : %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+"Souhaitez-vous vraiment supprimer toutes les permissions JavaScript ?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Supprimer toutes les permissions JavaScript ?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Cette action supprimera toutes les permissions JavaScript. On vous demandera "
+"de nouveau la permission à chaque prochains sites visités."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Gestionnaire d'instance"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instance vers le gestionnaire NoJS globale"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurer NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Voici ci-dessous la liste de tous les sites et leurs préférences "
+"respectives. Vous pouvez supprimer les préférences en cochant les entrées "
+"puis cliquer sur <i>Supprimer</i>"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domaine"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Politique"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Supprimer tous"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "A_utoriser les scripts sur tous les sites"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blo_quer par défaut les scripts issus de domaines iconnus"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Chang_er les permissions sur les domaines de second niveau"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Interdire %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Autoriser %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Autoriser %s pour cette session"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Fenêtre du Navigateur"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Cette exemple de vue du navigateur web Midori appartient à"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Afficher"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Cette vue du navigateur web Midori appartient à"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "État de l'icône du menu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "État de l'icône de menu à afficher dans la barre d'état"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Indéterminé"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Autorisé"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mixte"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Refusé"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Une erreur fatale empêche l'extension NoJS de continuer. Vous devriez la "
+"désactiver."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Erreur dans l'extension NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Raison"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Impossible de créer le dossier de configuration pour extension : %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Impossible de créer le dossier de configuration pour extension."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Impossible d'ouvrir la base de données des extensions."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"Impossible de configurer la structure de la base de données extension."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instance d'extension"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "L'instance d'extension Midori pour cette extension"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instance d'application"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "L'instance de l'application Midori cette extension appartient à"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instance base de données"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Pointer vers l'instance de base de données SQLite utilisée par cette "
+"extension"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Chemin base de données"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Pointer vers l'instance de base de données SQLite utilisée par cette "
+"extension"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Autoriser tous les sites"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Si vrai, cette extension n'appliquera pas de politique restrictive à chaque "
+"site mais leur permettra de s’exécuter."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Deuxième niveau seulement"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Si vrai, cette extension réduira chaque nom de domaine à son second niveau "
+"(www.exemple.org sera réduit à exemple.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Politque de domaine inconnue"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Polituque à appliquer sur les domaines iconnus."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Accepter temporairement"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Mouvements de souris"
@@ -2580,11 +2964,11 @@ msgstr "Raccourcis"
 msgid "View and edit keyboard shortcuts"
 msgstr "Afficher et modifier les raccourcis clavier"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Horloge de barre d'état"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Afficher la date et l'heure dans la barre d'état"
 
@@ -2600,6 +2984,10 @@ msgstr "Scripts"
 msgid "Netscape plugins"
 msgstr "Greffons Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activer les greffons Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Fonctionnalités dans la barre d'état"
@@ -2609,15 +2997,15 @@ 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:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panneau d'onglets"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "P_anneau d'onglets"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Afficher les onglets dans un panneau vertical"
 
@@ -2629,11 +3017,11 @@ 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:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personnaliser la barre d'outils"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2641,67 +3029,58 @@ 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:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Éléments disponibles"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Éléments affichés"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Personnaliser la barre d'outi_ls…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Éditeur de barre d'outils"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Éditer facilement la disposition de la barre d'outils"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Mettre en cache les communication HTTP sur le disque"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Échec au chargement des cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Effacer les informations privées"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Effacer les informations privées"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Effacer les informations suivantes :"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Derniers ongle_ts ouverts"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Effacer les informations privées en _quittant Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Mots de _passe et identifiants enregistrés"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies et données des sites web"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Icônes des pages Internet"
 
@@ -2709,190 +3088,133 @@ msgstr "Icônes des pages Internet"
 msgid "Open tabs"
 msgstr "Onglets ouverts"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Plus onglets ouverts..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Impossible de supprimer l'historique : %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, 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/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "Impossible d'attacher la vielle db"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "impossible d'importer la vielle db"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "impossible d'annuler la transaction"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "impossible de détacher"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Impossible de créer la table des signets :%s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Échec de l'ajout du signet : %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Impossible d'ouvrir la vielle base de données : %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Impossible de mettre à jours le signet : %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Les signets n'ont pas pu être enregistrés. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Impossible de supprimer le signet : %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "La configuration n'a pas pu être enregistrée. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "La session n'a pas pu être chargée : %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "La session n'a pas pu être enregistrée. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "La corbeille n'a pas pu être enregistrée. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Midori semble s'être interrompu de façon inattendue lors de la dernière "
-"utilisation. Si cela se produit de façon répétée, essayez l'une des options "
-"suivantes pour résoudre le problème."
+"Midori s'est arrêté inopinément lors de votre dernière utilisation. Si ce "
+"problème se répéte, vous pouvez soumettre votre problème à  %s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modifier les _préférences"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Désactiver toutes les _extensions"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Ignorer les derniers onglets"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Afficher le journal de la dernière panne"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Exécuter dans _debugger"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Les signets n'ont pas pu être chargés : %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "La session n'a pas pu être chargée : %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "La corbeille n'a pas pu être chargée : %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "L'historique n'a pas pu être chargé : %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Les erreurs suivantes sont survenues :"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL échoué : %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Accepter"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Accepter pour la session"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Bloquer"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Impossible d'ouvrir la base de données des extensions : %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Impossible d'exécuter l'instruction de la base de données : %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Voulez-vous vraiment supprimer toutes les autorisations cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Supprimer toutes les autorisations cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2900,20 +3222,20 @@ msgstr ""
 "Cette action permet de supprimer toutes les permissions cookies. Il vous "
 "sera demandé pour les permissions à nouveau pour chaque site Web visité."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Gestionnaire de permission de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instance du manager de permission  cookie courant"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configurer la permission cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2927,23 +3249,14 @@ msgstr ""
 "pour un domaine manuellement en entrant le nom de domaine ci-dessous, en "
 "choisissant la politique et en cliquant sur <i>Ajouter</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domaine"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Politique"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Supprimer tous"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+"Politique de cookies pour les domaines ne figurant pas dans la liste "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Demander la politique si elle est inconnue pour un domaine"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Demander une décision"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2957,475 +3270,338 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Erreur dans le extension du gestionnaire de cookie de permission"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Raison"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Impossible de créer le dossier de configuration pour extension : %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Impossible de créer le dossier de configuration pour extension."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Impossible d'ouvrir la base de données des extensions."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Impossible de configurer la structure de la base de données extension."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "Impossible de déterminer la politique cookie globale à définir pour le "
 "domaine : %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Jusqu'à fin de la session"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Le sites Web %s veut stocker %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Le sites Web %s veut stocker un cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Plusieurs sites Web veulent stocker %d cookies au total."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Accepter pour cette _session"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "De_nier"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Refuser ce_tte fois"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Chemin"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valeur"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Date d'expiration"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instance d'extension"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"La politique à appliquer pour les domaines n'est pas configurée "
+"individuellement. Cela n'agit que pour restreindre davantage la politique "
+"globale des cookies définie dans les paramètres de Midori."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "L'instance d'extension Midori pour cette extension"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Gestionnaire de sécurité des cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instance d'application"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "gérer les permissions cookies par site"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "L'instance de l'application Midori cette extension appartient à"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Échec de la récupération de l'icone de l'application dans %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instance base de données"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-"Pointer vers l'instance de base de données SQLite utilisée par cette "
-"extension"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Impossible de créer un nouveau lanceur (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Chemin base de données"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Lanceur créé"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
 msgstr ""
-"Pointer vers l'instance de base de données SQLite utilisée par cette "
-"extension"
+"Vous pouvez désormais démarrer <b>%s</b> à partir de votre lanceur ou du "
+"menu Applications"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Interroger pour une politique inconnue"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Une erreur s'est produite lors la création du lanceur"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"Si vrai cette extension demande la politique pour chaque domaine inconnu. "
-"Si  faux cette extension utilise la politique cookie globale  définie dans "
-"les paramètres midori."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applications"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Indéterminé"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Nouveau _Profil"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Gestionnaire de sécurité des cookies"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Créer un nouveau profile ainsi que le lanceur associé"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "gérer les permissions cookies par site"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nouvelle _application"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Applications"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Créer une nouvelle application pour ce site web"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Erreur de lancement"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Créer un _lanceur"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Gestionnaire d'application Web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Gérer des sites Web comme des applications installées"
 
-#: ../extensions/transfers.vala:89
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "Transferts"
 
-#: ../extensions/transfers.vala:102 ../extensions/transfers.vala:365
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Effacer tout"
 
-#: ../extensions/transfers.vala:196
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Impossible d'ouvrir le téléchargement : %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Ouvrir le _dossier de destination"
 
-#: ../extensions/transfers.vala:203
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copier l'_adresse du lien"
 
-#: ../extensions/transfers.vala:428
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Le fichier « <b>%s</b> » a été téléchargé."
 
-#: ../extensions/transfers.vala:429
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+"Le fichier '<b>%s</b>' ainsi que %d autres fichiers ont été téléchargés."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transfert terminé"
 
-#: ../extensions/transfers.vala:456 ../extensions/transfers.vala:457
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Des fichiers sont en cours de téléchargement"
 
-#: ../extensions/transfers.vala:459
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Quitter Midori"
 
-#: ../extensions/transfers.vala:461
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Les transferts seront annulés si Midori se ferme."
 
-#: ../extensions/transfers.vala:508
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Gestionnaire de transferts"
 
-#: ../extensions/transfers.vala:509
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Voir les fichiers téléchargés"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Un clic milieu ouvre la sélection"
-
-#~ 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"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "Impossible d'obtenir le chemin d'accès à la configuration d'extension : "
-#~ "chemin est VIDE"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr ""
-#~ "Impossible d'obtenir le chemin d'accès à la configuration d'extension."
-
-#~ msgid "Custom..."
-#~ msgstr "Personnalisé…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Confirmer cookie de stockage"
-
-#~ msgid "_Details"
-#~ msgstr "_Détails"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Comment s'identifier sur les pages Internet"
-
-#~ msgid "Writing failed."
-#~ msgstr "L'écriture a échoué."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Défilement cinétique"
-
-#~ 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"
-
-#~ msgid "_Window"
-#~ msgstr "Fe_nêtre"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Redirige les avertissements console dans le FICHIER spécifié"
-
-#~ msgid "FILENAME"
-#~ msgstr "FICHIER"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Ajouter un raccourci sur le _bureau"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Surligner les résultats"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Se souvenir de la taille de la fenêtre"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre"
-
-#~ msgid "Last window width"
-#~ msgstr "Dernière largeur de la fenêtre"
-
-#~ msgid "The last saved window width"
-#~ msgstr "La dernière largeur enregistrée de la fenêtre"
-
-#~ msgid "Last window height"
-#~ msgstr "Dernière hauteur de la fenêtre"
-
-#~ msgid "The last saved window height"
-#~ msgstr "La dernière hauteur enregistrée de la fenêtre"
-
-#~ msgid "Last panel position"
-#~ msgstr "Dernière position du panneau"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "La dernière position enregistrée du panneau"
-
-#~ msgid "Last panel page"
-#~ msgstr "Dernière page du panneau"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "La dernière page enregistrée du panneau"
-
-#~ msgid "Last Web search"
-#~ msgstr "Dernière recherche sur Internet"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "La dernière recherche sur Internet enregistrée"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Afficher la barre de menu"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Indique s'il faut afficher la barre de menu"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Afficher la barre de navigation"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Indique s'il faut afficher la barre de navigation"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Afficher la barre des _signets"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Indique s'il faut afficher la barre des signets"
-
-#~ msgid "Show Panel"
-#~ msgstr "Afficher le panneau"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Indique s'il faut afficher le panneau"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Afficher la barre d'état"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Indique s'il faut afficher la barre d'état"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Éléments de la barre d'outils"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Les éléments à afficher dans la barre d'outils"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Panneau latéral compact"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Indique s'il faut mettre le panneau latéral compact"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Aligner le panneau latéral sur la droite"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Indique s'il faut aligner le panneau latéral sur la droite"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Ouvrir les panneaux dans une fenêtre séparée"
-
-#~ 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 "What to do when Midori starts"
-#~ msgstr "Que faire au lancement de Midori"
-
-#~ msgid "The homepage"
-#~ msgstr "La page d'accueil"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Le dossier où enregistrer les fichiers téléchargés"
-
-#~ msgid "An external text editor"
-#~ msgstr "Un éditeur de texte externe"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "Un agrégateur de flux externe"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Recherche depuis la barre d'adresse"
-
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Encodage favori des caractères"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Toujours afficher la barre d'onglets"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Lieu où les nouvelles pages doivent être ouvertes"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Ouvrir les fenêtre intempestives dans des onglets"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr ""
-#~ "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des "
-#~ "onglets"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Impossible de mettre à jour la base de données : %s"
 
-#~ msgid "Load and display images automatically"
-#~ msgstr "Charger et afficher les images automatiquement"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Impossible d'extraire de la base de données : %s"
 
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Active la prise en charge interne des scripts"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+"Une erreur s'est produite lors de l'importation de l'ancienne session : %s"
 
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Active la prise en charge interne des greffons Netscape"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Activer la vérification de l'orthographe lors de la saisie"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestion des onglets et des sessions."
 
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Activer le support de base de données HTML5"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Indique s'il faut activer le support de base de données de HTML5"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Cette extension fournit une file de tâches pour des mises à jour ou des "
+"événements réguliers."
 
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Indique s'il faut activer le support de stockage local de HTML5"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Impossible d'ajouter une nouvelle dans la base de données :  %s\n"
 
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Indique s'il faut activer le cache des applications web hors ligne"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Impossible de supprimer une note de la base de données : %s\n"
 
-#~ 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"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Impossible de renommer une note : %s\n"
 
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Permettre aux sites d'utiliser le rendu OpenGL"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Impossible de mettre à jour une note : %s\n"
 
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Indique s'il faut agrandir le texte et les images"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notes"
 
-#~ msgid "Find inline while typing"
-#~ msgstr "Chercher pendant la saisie"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nouvelle note"
 
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr ""
-#~ "Indique s'il faut chercher automatiquement dans la page pendant la saisie"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Crée une nouvelle note vide, indépendante des pages ouvertes"
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Le type de serveur mandataire à utiliser"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nouvelle note"
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "Serveur mandataire HTTP"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+"Impossible de sélectionner à partir de la base de données de notes : %s\n"
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Le serveur mandataire (proxy) pour les connexions HTTP"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Renommer la note"
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr ""
-#~ "Le port utilisé pour contacter le serveur mandataire (proxy) pour les "
-#~ "connexions HTTP"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copier la note dans le presse-papier"
 
-#~ msgid "Identification string"
-#~ msgstr "Chaîne d'identification"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Supprimer la note"
 
-#~ msgid "The application identification string"
-#~ msgstr "La chaîne d'identification de l'application"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copier la sélection en tant que note"
 
-#~ msgid "Clear private data"
-#~ msgstr "Effacer les informations privées"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+"Sauvegarder des extraits de textes issus de sites web en tant que notes"
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Les informations privées sélectionnées pour la suppression"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueur de publicités"
 
-#~ msgid "Clear data"
-#~ msgstr "Effacer les informations"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquer les publicités en fonction d'une liste de filtres"
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "Les informations sélectionnées pour la suppression"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurer les filtres de publicité"
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Signet"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "_Bloquer l'image"
 
-#~ msgid "_Console"
-#~ msgstr "_Console"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "B_loquer le lien"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "Dossier supérieur"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Modifier les règles"
 
-#~ msgid "_Title:"
-#~ msgstr "_Titre :"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Règles :"
diff --git a/po/gd.po b/po/gd.po
new file mode 100644 (file)
index 0000000..59adc95
--- /dev/null
+++ b/po/gd.po
@@ -0,0 +1,3490 @@
+# German translations for midori package.
+# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the midori package.
+# Enrico Tröger <enrico.troeger@uvena.de> 2008
+# Christian Dywan <christian@twotoasts.de> 2008-2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori 0.3.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-02-19 19:55+0000\n"
+"Last-Translator: GunChleoc <Unknown>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
+"(n > 2 && n < 20) ? 2 : 3;\n"
+"X-Launchpad-Export-Date: 2015-02-20 05:10+0000\n"
+"X-Generator: Launchpad (build 17341)\n"
+"Language: de\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Brabhsair-lìn"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Brabhsair-lìn Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Brabhsaich an lìon"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;eadar-lìon;taisgealaiche;brabhsair;browser;"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Taba ùr"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Uinneag ùr"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Uinneag brabhsair phrìobhaideach ùr"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Brabhsadh prìobhaideach Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Brabhsadh prìobhaideach"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Fosgail uinneag brabhsaidh phrìobhaideach ùr"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Chaidh glacadh-sgrìn a shàbhaladh gu: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Ruith an SEÒLADH mar phrògram-lìn"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "SEÒLADH"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Cleachd am PASGAN mar phasgan rèiteachaidh"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "PASGAN"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Brabhsadh prìobhaideach, cha dèid atharrachadh sam bith a shàbhaladh"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Modh so-ghiùlan, thèid gach faidhle runtime a shàbhaladh san aon àite"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Uinneag GTK+ lom leWebKit coltach ri GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Seall an còmhradh diagnosachd"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Riuth ainm an fhaidhle a shònraich thu mar JavaScript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Dèan glacadh-sgrìn dhen URI a shònraich thu"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Ruith an àithne a shònraich thu"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Seall na h-àitheantan a tha ri làimh gus an ruith le -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Seall tionndadh a' phrògraim"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Seòlaidhean"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Bac URIean a-rèir an regular expression PATTERN"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PÀTRAN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Ath-shuidhich Midori às dèidh DIOGAN gun ghnìomh"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "DIOGAN"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Cuir do bheachdan 's aithrisean aig bugaichean gu:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Thoir sùil airson tionndadh ùr air:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Thachair mearachd nach aithne dhuinn"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Comharran-lìn"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Cuir ris _comharra-lìn"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Leudachain"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "Eac_hdraidh"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Sgrio_btaichean a' chleachdaiche"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Stoidhlichean a' chleachdaiche"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "_Taba ùr"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Tar-chuir"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "P_lugain Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "Tabai_chean dùinte"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Uinneag ùr"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_Pasgan ùr"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Seòlaidhean]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Cha deach am faidhle a lorg."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Sgrìobhainn air a dhroch-chumadh."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Fòrmat comharra-lìn neo-aithnichte."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Air adhart dhan ath-dhuilleag"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Air adhart dhan ath fho-dhuilleag"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Ath-luchdaich an duilleag seo"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Sguir de luchdadh na duilleige seo"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Dh'fhàillig ùrachadh an tiotail: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Tha an luach \"%s\" mì-dhligheach airson %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Roghainn \"%s\" ris nach robh dùil"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Gnìomh \"%s\" ris nach robh dùil"
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Brabhsadh prìobhaideach)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+"Cha b' urrainn dhuinn am ball ùr a chur a-steach dhan eachdraidh: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Comharran-lìn"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Pasgan ùr"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Deasaich am pasgan"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Deasaich an comharra-lìn"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Cuir ris na grad-cheanglaichean"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Sàbhail am faidhle mar"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Sàbhail na goi_reasan co-cheangailte"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Chaidh uinneag ùr fhosgladh"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Chaidh taba ùr fhosgladh"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Mearachd a' fosgladh an deilbh!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+"Cha b' urrainn dhuinn an dealbh a thagh thu fhosgladh san t-sealladair "
+"bhunaiteach."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Mearachd a' luchdadh a-nuas an deilbh!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Cha ghabh an dealbh a thagh thu a luchdadh a-nuas."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Sàbhail am faidhle"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Ath-luchdaich an duilleag gun a chur dhan tasgadan"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Fosgail faidhle"
+
+#: ../midori/midori-browser.c:2692
+msgid ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+msgstr ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "New feed"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Add a new bookmark"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Falamh"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Toggle text cursor navigation"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Enable Caret Browsing"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Open all in _Tabs"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Fosgail ann an _uinneag ùr"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Import bookmarks…"
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Import bookmarks"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Application:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Import from XBEL or HTML file"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Ion-phortaich o fhaidhle"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Failed to import bookmarks"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL Bookmarks"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Comharran-lìn Netscape"
+
+#: ../midori/midori-browser.c:4546
+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:4558
+msgid "Failed to export bookmarks"
+msgstr "Failed to export bookmarks"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "A lightweight web browser."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "See about:version for version info."
+
+#: ../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 ""
+"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:4780
+msgid "translator-credits"
+msgstr ""
+"Enrico Tröger <enrico.troeger@uvena.de>\n"
+"Christian Dywan <christian@twotoasts.de>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Akerbeltz https://launchpad.net/~fios\n"
+"  Christian Dywan https://launchpad.net/~kalikiana\n"
+"  GunChleoc https://launchpad.net/~gunchleoc\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicate Current Tab"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Faidhle"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Ein neues Fenster öffnen"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Einen neuen Reiter öffnen"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "New P_rivate Browsing Window"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Fosgail faidhle"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Save Page As…"
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Save to a file"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Add to Speed _dial"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Subscribe to News _feed"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Dùin an taba"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Close the current tab"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "_Dùin an uinneag"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Clò-bhuail an duilleag làithreach"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Close a_ll Windows"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "D_easaich"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Lorg…"
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Find a word or phrase in the page"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Find _Next"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Find _Previous"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Configure the application preferences"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Sealladh"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Toolbars"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Increase the zoom level"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Decrease the zoom level"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Còdachadh"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "View So_urce"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Ca_ret Browsing"
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Toglaich sealladh na làn-sgrìn"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Scroll _Left"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Scroll _Down"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Scroll _Up"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Scroll _Right"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Readable"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Siuthad"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Go back to the previous page"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Go to the previous sub-page"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Next or Forward"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Go to the next sub-page or next page in history"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Go to your homepage"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Falamhaich an sgudal"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Undo _Close Tab"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Add a new _folder"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Import bookmarks…"
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Export bookmarks…"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "_Inspect Page"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "An taba _roimhe"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "An ath-tha_ba"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "Move Tab _Backward"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "_Move Tab Forward"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "Focus _Current Tab"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Focus _Next view"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "Only show the Icon of the _Current Tab"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Close Ot_her Tabs"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "Open last _session"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "Cob_hair"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Frequent Questions"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_Report a Problem…"
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Innealan"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Menubar"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "_Navigationbar"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "Side_panel"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Sidepanel"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "_Bookmarkbar"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "Bàr na staide"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "Fèin-obr_achail"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinese Traditional (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinese Simplified (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanese (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Korean (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Russian (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Gnàthaichte..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Location…"
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Open a particular location"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_Web Search…"
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Run a web search"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Reopen a previously closed tab or window"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Show the saved bookmarks"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tabaichean"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Show a list of all open tabs"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Menu"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Clàr-taice"
+
+#: ../midori/midori-extension.c:341
+#, 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:894 ../extensions/addons.c:1680
+#, 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:1325
+msgid "Export certificate"
+msgstr "Export certificate"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Chan aithne dhuinn ùghdarras soidhneadh nan teisteanasan"
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Chan eil an teisteanas seo a' freagairt ri ID na làraich-lìn (on a fhuaradh "
+"e) ris an robh dùil"
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Tha àm gnìomhachadh an teisteanais seo san àm ri teachd fhathast."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Dh'fhalbh an ùine air an teisteanas"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Thathar dhen bheachd nach eil algairim an teisteanais tèarainte."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Some other error occurred validating the certificate."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Export certificate"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Self-signed"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Security details"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr "Paste and p_roceed"
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Not verified"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Verified and encrypted connection"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Open, unencrypted connection"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Align sidepanel to the right"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Close panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Align sidepanel to the left"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Show Speed Dial"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Show Homepage"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Show last open tabs"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Show last tabs without loading"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japanese (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Taba ùr"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Uinneag ùr"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Current tab"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Bun-roghainn"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ìomhaigheagan"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Small icons"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Teacsa"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Icons and text"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Text beside icons"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatic (GNOME or environment)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "HTTP proxy server"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "No proxy server"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "The style of the toolbar"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Always use my font choices"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Override fonts picked by websites with user preferences"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "The configuration couldn't be loaded: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Invalid configuration value '%s'"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Failed to inject stylesheet: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Show Tab _Label"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Show Tab _Icon Only"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Close Tab to the R_ight"
+msgstr[1] "Close Tabs to the R_ight"
+msgstr[2] "Close Tabs to the R_ight"
+msgstr[3] "Close Tabs to the R_ight"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Close Ot_her Tab"
+msgstr[1] "Close Ot_her Tabs"
+msgstr[2] "Close Ot_her Tabs"
+msgstr[3] "Close Ot_her Tabs"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Trust this website"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Security unknown"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s wants to save an HTML5 database."
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Deny"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Allow"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s wants to know your location."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Feuch ris a-rithist"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Feuch ris a-rithist"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Send a message to %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Add _search engine..."
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Open Link in New _Tab"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Open Link in _Foreground Tab"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Open Link in _Background Tab"
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Fosgail an ceangal ann an _uinneag ùr"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Copy Link de_stination"
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Sàbhail m_ar…"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Open _Image in New Tab"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Save I_mage"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Open in Image _Viewer"
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Copy Video _Address"
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Download _Video"
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Open Address in New _Tab"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Search _with"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Search the Web"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Open _Frame in New Tab"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspect _Element"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Open or download file from %s"
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "File Name: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "File Type: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "File Type: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Meud: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Fosgail %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspect page - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori doesn't store any personal data:"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "No history or web cookies are being saved."
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Extensions are disabled."
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "HTML5 storage, local database and application caches are disabled."
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori prevents websites from tracking the user:"
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Referrer URLs are stripped down to the hostname."
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS prefetching is disabled."
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "The language and timezone are not revealed to websites."
+
+#: ../midori/midori-view.c:3906
+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:3949
+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:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+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:4002
+msgid "Load Page"
+msgstr "Load Page"
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Blank page"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "previous"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "next"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Print background images"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Whether background images should be printed"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Features"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s à %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uair a thìde"
+msgstr[1] "%d uair a thìde"
+msgstr[2] "%d uairean a thìde"
+msgstr[3] "%d uair a thìde"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d mhionaid"
+msgstr[1] "%d mhionaid"
+msgstr[2] "%d mionaidean"
+msgstr[3] "%d mionaid"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d diog"
+msgstr[1] "%d dhiog"
+msgstr[2] "%d diogan"
+msgstr[3] "%d diog"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s remaining"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "The downloaded file is erroneous."
+
+#: ../midori/midori-download.vala:221
+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."
+
+#: ../midori/midori-download.vala:366
+#, 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-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "You don't have permission to write in this location."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "There is not enough free space to download \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "The file needs %s but only %s are left."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Speed Dial"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Click to add a shortcut"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Enter shortcut address"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Enter shortcut title"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Are you sure you want to delete this shortcut?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Startup"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "When Midori starts:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Duilleag-dhachaigh:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Use _current page"
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Use current page as homepage"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Cruthan-clò"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Proportional Font Family"
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "The default font family used to display text"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "The default font size used to display text"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Fixed-width Font Family"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "The font family used to display fixed-width text"
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "The font size used to display fixed-width text"
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Minimum Font Size"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "The minimum font size used to display text"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Preferred Encoding"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Giùlan"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Load images automatically"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Enable Spell Checking"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Enable scripts"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Enable WebGL support"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom Text and Images"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Allow scripts to open popups"
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Whether scripts are allowed to open popup windows automatically"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Preferred languages"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Save downloaded files to:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Browsing"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Ùrlar:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Toolbar Style:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Open new pages in:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Close Buttons on Tabs"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Open Tabs next to Current"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Open tabs in the background"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Deasaiche teacsa"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "News Aggregator"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Lìonra"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxy server"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Web Cache"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "The maximum size of cached pages on disk"
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identify as"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Prìobhaideachd"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Delete old Cookies after:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "The maximum number of days to save cookies for"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Only accept Cookies from sites you visit"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Block cookies sent by third-party websites"
+
+#: ../midori/midori-preferences.c:599
+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:606
+msgid "Enable offline web application cache"
+msgstr "Enable offline web application cache"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Enable HTML5 local storage support"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Whether the \"Referer\" header should be shortened to the hostname"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Delete pages from history after:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "The maximum number of days to save the history for"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Leudachain"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Manage Search Engines"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Add search engine"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Edit search engine"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "Ai_nm:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Description:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Address:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Token:"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Manage Search Engines"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Use as _default"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "The search engines couldn't be loaded. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "The search engines couldn't be saved. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Search for %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Search with…"
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Search with %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Fosgail le"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Choose an application or command to open \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Could not run external program."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI mì-dhligheach"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Inline Find:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Air ais"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Air adhart"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Match Case"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Close Findbar"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s agus %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Edit the selected bookmark"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Delete the selected bookmark"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Add a new folder"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Separator</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Fosgail ann an _taba ùr"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Lorg sna comharran-lìn"
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Eachdraidh"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "An-diugh"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "An-dè"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d latha air ais"
+msgstr[1] "%d latha air ais"
+msgstr[2] "%d làithean air ais"
+msgstr[3] "%d latha air ais"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "A week ago"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Failed to remove history item: %s\n"
+
+#: ../panels/midori-history.c:312
+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:358
+msgid "Bookmark the selected history item"
+msgstr "Bookmark the selected history item"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Delete the selected history item"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Clear the entire history"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Search History"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Tha feum air dearbhadh"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"A username and a password are required\n"
+"to open this location:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Ainm-cleachdaiche"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Facal-faire"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "Cuimhnich am facal-fai_re"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Chan eil gin"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "Property '%s' is invalid for %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Choose file"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Choose folder"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "uair a thìde"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "latha"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "seachdain"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "mìos"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "bliadhna"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Preferences for %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+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:223
+msgid "_Install user script"
+msgstr "_Install user script"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+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:229
+msgid "_Install user style"
+msgstr "_Install user style"
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Don't install"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Userscripts"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Userstyles"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Mearachd"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Do you want to delete '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Delete user script"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Delete user style"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file <b>%s</b> will be permanently deleted."
+msgstr "The file <b>%s</b> will be permanently deleted."
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr "Open in Text Editor"
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr "Open Target Folder"
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr "Add new addon"
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr "Remove selected addon"
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr "User addons"
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Can't monitor folder '%s': %s"
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr "Support for userscripts and userstyles"
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Colorful Tabs"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Tint each tab distinctly"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Cookie Manager"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Delete All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr "Expand All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Collapse All"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+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:573
+msgid "Question"
+msgstr "Ceist"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+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:668
+msgid "At the end of the session"
+msgstr "At the end of the session"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Tha"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Chan eil"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Ainm"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Leudaich na h-uile"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "C_o-theannaich na h-uile"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Search Cookies by Name or Domain"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "List, view and delete cookies"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr "Copy Tab _Addresses"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Copy Addresses of Tabs"
+
+#: ../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"
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Àithne:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "Failed to find required Atom \"entry\" elements in XML data."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Last updated: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Feeds"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Add new feed"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Delete feed"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Feeds"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Failed to find root element in feed XML data."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Unsupported feed format."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Failed to parse XML feed: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Failed to find \"channel\" element in RSS XML data."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Unsupported RSS version found."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Failed to find required RSS \"item\" elements in XML data."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Failed to find required RSS \"channel\" elements in XML data."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Feed '%s' already exists"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Error loading feed '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Feed Panel"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Read Atom/ RSS feeds"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Failed to add form value: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Form history"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Master password required\n"
+"to open password database"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Remember password on this page?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Cuimhnich"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Chan ann an-dràsta"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Never for this page"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Toggle form history state"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Activate or deactivate form history for the current tab."
+
+#: ../extensions/formhistory/formhistory.c:598
+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:655
+msgid "Form history filler"
+msgstr "Form history filler"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Stores history of entered form data"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Failed to select suggestions\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "There are no unvisited tabs"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "History-List"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Tab closing behavior"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Na dèan dad"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Switch to last viewed tab"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Switch to newest tab"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Flash window on background tabs"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Next new Tab (History List)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Next new tab from history"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Previous new Tab (History List)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Previous new tab from history"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Display tab in background (History List)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Display the current selected tab in background"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "History List"
+
+#: ../extensions/history-list.vala:649
+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/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Gabh ris"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bac"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Àrainn"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Sealladh"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Ceadaichte"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Air a dhiùltadh"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Mouse Gestures"
+
+#: ../extensions/mouse-gestures.c:514
+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"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Customize Keyboard shortcuts"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Ath-ghoiridean"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "View and edit keyboard shortcuts"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Statusbar Clock"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Display date and time in the statusbar"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Dealbhan"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Sgriobtaichean"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape plugins"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Enable Netscape plugins"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Statusbar Features"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Easily toggle features on web pages on and off"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Tab Panel"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "T_ab Panel"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Show tabs in a vertical panel"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Only Icons on Tabs by default"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "New tabs have no label by default"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Customize Toolbar"
+
+#: ../extensions/toolbar-editor.c:417
+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:433
+msgid "Available Items"
+msgstr "Available Items"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Displayed Items"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Customize Toolbar…"
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Deasaiche nam bàr-inneal"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Easily edit the toolbar layout"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Clear Private Data"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Clear private data"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Clear the following data:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Last open _tabs"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Clear private data when _quitting Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Saved logins and _passwords"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies and Website data"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Website icons"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Tabaichean fosgailte"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Failed to clear history: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Failed to remove old history items: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Failed to add bookmark item: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+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/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "The configuration couldn't be saved. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "The trash couldn't be saved. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Modify _preferences"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Disable all _extensions"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Show a dialog after Midori crashed"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Discard old tabs"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+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/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Bookmarks couldn't be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "The session couldn't be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "The trash couldn't be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "The history couldn't be loaded: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "The following errors occured:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "Le_ig seachad"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Gabh ris"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Slighe"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Luach"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplacaidean"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "_Pròifil ùr"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Create _Launcher"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transfers"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Falamhaich na h-uile"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Open Destination _Folder"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copy Link Loc_ation"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "The file '<b>%s</b>' has been downloaded."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transfer completed"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Some files are being downloaded"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Quit Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "The transfers will be cancelled if Midori quits."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Nòtaichean"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Advertisement blocker"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Block advertisements according to a filter list"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configure Advertisement filters"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_ock image"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_ock link"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Edit rule"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Rule:"
index 97bd2d12c24adb357153864fd7844bd9721ffc67..3973e094fd1b9cc0e7e4fc7875d07a407908ae9d 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,215 +10,215 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori-0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-07 08:21+0000\n"
-"PO-Revision-Date: 2013-05-07 21:02+0200\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-03-05 11:48+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
-"Language: gl\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: Virtaal 0.7.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:00+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: gl\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Navegar pola Rede"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navegador web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navegar pola Rede"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nova xanela de navegación privada"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nova lapela"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nova xanela"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navegador web"
+msgid "New Private Browsing Window"
+msgstr "Nova xanela de navegación privada"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori, navegación privada"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Abrir unha nova xanela de navegación privada"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navegación privada"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Abrir unha nova xanela de navegación privada"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Captura gardada en: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Executar ENDEREZO como un aplicativo web"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ENDEREZO"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Usar CARTAFOL como cartafol de configuración"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "CARTAFOL"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navegación privada, non se garda ningún cambio"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 "Mo do portábel, todos os ficheiros en tempo de execución almacénanse no "
 "mesmo lugar"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Xanela sinxela GTK+ con WebKit, semellante a GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Amosar un diálogo de diagnóstico"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Executar sen gdb e gardar o tracexado inverso ao quebrar"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Execute o nome de ficheiro especificado como JavaScript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Facer unha captura do URI especificado"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Executar a orde especificada"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Liste as ordes dispoñíbeis para executar con -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Amosar a versión do programa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Enderezos"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Bloquear os URI de acordo ca expresión regular PATRÓN"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATRÓN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGUNDOS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Erro: Non foi posíbel atopar «gdb»\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Envíe comentarios, suxestións e fallos a:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Comprobar se existen novas versións en:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Produciuse un erro descoñecido"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Engadir mar_cador"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensións"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historial"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Scripts de usuario"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Estilos de usuario"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nova _lapela"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferencias"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "En_gadidos de Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Lapelas pechadas"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nova _xanela"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Cartafol _novo"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Enderezos]"
 
@@ -235,134 +235,146 @@ msgstr "Documento mal construído."
 msgid "Unrecognized bookmark format."
 msgstr "Formato de marcador non recoñecido."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Ir á seguinte páxina"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ir á seguinte subpáxina"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Buscar na web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Recargar a páxina actual"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Deter a carga da páxina"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Produciuse un erro ao actualizar o título: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "O valor «%s» non é válido para %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Opción inesperada «%s»"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Acción inesperada «%s»"
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navegación privada)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Seleccionar [texto]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Novo cartafol"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Editar cartafol"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Editar cartafol"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Novo marcador"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Editar o marcador"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+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-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Enga_dir a marcación rápida"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Escriba un nome para este cartafol e escolla onde gardalo."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Amosar na _barra de ferramentas"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Amosar na _barra de marcadores"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Executar como aplicativo _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Enga_dir a marcación rápida"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Gardar o ficheiro como"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Gardar os _recursos asociados"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Abriuse unha nova xanela"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Abriuse unha nova lapela"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Produciuse un erro ao abrir a imaxe!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Non é posíbel abrir a imaxe no visor predeterminado"
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Produciuse un erro ao descargar a imaxe!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Non foi posíbel descargar a imaxe seleccionada."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Gardar ficheiro"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Recargar a páxina sen usar a caché"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -377,31 +389,24 @@ msgstr ""
 "Agregador de novas. A seguinte vez que prema na icona da fonte de novas "
 "engadirase automaticamente."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nova fonte"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Engadir novo marcador"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Compartir esta páxina"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Baleiro"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Activar/desactivar a navegación con cursor"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -409,109 +414,99 @@ msgstr ""
 "Premendo F7 conmuta a navegación con cursor. Cando está activado aparece un "
 "cursor de texto en todos os sitios web."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Activar a _navegación con cursor"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Abrir todo en  _lapelas"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Abrir nunha nova _lapela"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Abrir nunha nova  _xanela"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importar marcadores…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importar marcadores"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplicativo:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importar desde un ficheiro XBEL ou HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importar desde un ficheiro"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Produciuse un erro ao importar os marcadores"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Marcadores XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Marcadores de Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Produciuse un erro ao exportar os marcadores"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un navegador moi lixeiro"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Ver a información de versión en about:version"
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -523,370 +518,387 @@ msgstr ""
 "Free Software Foundation; tanto na versión 2.1 ou, opcionalmente, calquera "
 "versión posterior."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Miguel Anxo Bouzada<mbouzada@gmail.com>, 2008, 2009, 2010, 2011, 2012, 2013\n"
 "Leandro Regueiro <leandro.regueiro@gmail.com>, 2009, 2010\n"
 "\n"
-"Proxecto Trasno http://trasno.net"
+"Proxecto Trasno http://trasno.net\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
+"  Xosé https://launchpad.net/~ubuntu-galizaweb"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicar a lapela actual"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Abrir unha nova xanela"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Abrir unha nova lapela"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nova xanela de navegación p_rivada"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Gardar a páxina como…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Gardar nun ficheiro"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Enga_dir a marcación rápida"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Subscribirse á _fonte de novas"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Pechar a _lapela"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Pechar a xanela"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Compartir"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimir a páxina actual"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Pechar todas as xane_las"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Buscar…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Buscar unha palabra ou frase nesta páxina"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Buscar _seguinte"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Buscar _anterior"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configurar as preferencias do aplicativo"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ver"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Barra de ferramentas"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Recargar a páxina sen usar a caché"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Aumentar o nivel de zoom"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Diminuír o nivel de zoom"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codificación"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ver o códi_go da páxina"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "View a orixe _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navegación con cu_rsor"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Activar/desactivar a pantalla completa"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Desprazar cara á _esquerda"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Desprazar cara a_baixo"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Desprazar cara _arriba"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Desprazar cara á _dereita"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Lexíbel"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ir á páxina anterior"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ir á anterior subpáxina"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Seguinte ou adiante"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Ir á seguinte sub-páxina ou á seguinte páxina no historial"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "P_áxina de inicio"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ir á súa páxina de inicio"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Baleirar o lixo"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Desfa_cer o pechar lapela"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Engadir un carta_fol novo"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exportar os marcadores"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importar marcadores..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "Ad_ministrador de motores de busca"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exportar marcadores..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Xestionar motores de busca..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Limpar datos privados"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Limpar os datos privados..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspeccionar a páxina"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Lapela _anterior"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Lapela _seguinte"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Mover a lapela á _primeira posición"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Mover a lapela cara _atrás"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mover a lapela cara adiante"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Mover a lapela á ú_ltima posición"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Enfocar a lapela a_ctual"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Enfocar a _seguinte vista"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Amosar só a icona da lapela a_ctual"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Duplicar a lapela actual"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Pechar ou_tras lapelas"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Abrir a última _sesión"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Preguntas _frecuentes"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Informar dun problema…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra de _menú"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra de _navegación"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Panel lateral"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panel lateral"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barra de marcadores"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra de es_tado"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chinés tradicional(BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chinéss simplificado (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Xaponés (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ruso (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Occidental (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalizado…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Produciuse un erro ao iniciar o historial: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separador"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "Lugar"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Abrir un enderezo determinado"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Buscar no _web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Executar unha busca no web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Volver abrir xanelas ou lapelas pechadas"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Amosar os marcadores gardados"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Lapelas"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Amosar unha lista de todas as lapelas abertas"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menú"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menú"
 
@@ -895,20 +907,20 @@ msgstr "Menú"
 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:880 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportar o certificado"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Non se coñece a firma da Entidade de acreditación"
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -916,15 +928,15 @@ msgstr ""
 "O certificado non coincide coa identidade agardada do sitio do que foi "
 "obtido."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Este certificado xa caducou"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -932,40 +944,40 @@ msgstr ""
 "O certificado foi revogado conforma a lista de revogación de certificados "
 "GTlsConnection"
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "O algoritmo do certificado está considerado como inseguro."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Produciuse algún outro erro ao verificar o certificado."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportar o certificado"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Autoasinado"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Detalles de seguranza"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Pegar e _continuar"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Non verificada"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Conexión verificada e cifrada"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Conexión aberta e non cifrada"
 
@@ -982,437 +994,451 @@ msgstr "Pechar o panel"
 msgid "Align sidepanel to the left"
 msgstr "Aliñar o panel lateral á esquerda"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Amosar a marcación rápida"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Amosar a páxina inicial"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Amosar as últimas lapelas abertas"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Amosar as últimas lapelas sen cargalas"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Amosar unha páxina en branco"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Amosar o motor de busca predeterminado"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Amosar unha páxina personalizada"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Xaponés (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nova lapela"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nova xanela"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Lapela actual"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Predeterminada"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Iconas"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Iconas pequenas"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Texto"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Iconas e texto"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Texto a carón das iconas"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automático (GNOME ou entorno)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Servidor proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Sen servidor proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "O estilo da barra de ferramentas"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Utilizar sempre as miñas escollas de tipo de letras"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 "Substituír os tipos de letras dos sitios web polos preferidos do usuario"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Non foi posíbel cargar a configuración: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "O valor de configuración «%s» non é válido"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Produciuse un erro ao inxectar a folla de estilo: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Amosar a _etiqueta da lapela"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Amosar só a _icona da lapela"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Pechar a lapela da _dereita"
+msgstr[1] "Pechar sa lapelas da _dereita"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Confiar neste sitio web"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Seguranza descoñecida"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s desexa gardar unha base de datos HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Permitir"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s desexa coñecer a súa localización."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Erro - %s"
+msgid "'%s' can't be found"
+msgstr "Non é posíbel atopar «%s»"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Non foi posíbel cargar a páxina «%s»."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Non foi posíbel cargar a páxina «%s»:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Comprobar erros de escritura no enderezo"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Asegúrese de que hai un cable de Ethernet conectado ou que o receptor WiFi "
+"estea activado"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Comprobe que a configuración de rede sexa a correcta"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Ténteo de novo"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Eeei - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Algo saíu mal con «%s»"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Ténteo de novo"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Enviarlle unha mensaxe a  %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Engadir un _motor de busca"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Inspeccionar _elemento"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Abrir a _ligazón"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Abrir a ligazón nunha nova _lapela"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Abrir a ligazón na lapela de _primeiro plano"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Abrir a ligazón na lapela de _segundo plano"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Abrir a ligazón nunha _xanela nova"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Abrir a ligazón como aplicativo _web"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copiar o de_stino da ligazón"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Gardar _como…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Abrir a _imaxe nunha nova xanela"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Abrir a _imaxe nunha nova lapela"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copiar a im_axe"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Gardar a i_maxe"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Abrir no _visor de imaxes"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copiar o _enderezo do vídeo"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Gardar o _vídeo"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Descargar o _vídeo"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Abrir o enderezo nunha nova _lapela"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
-msgstr "Buscar _con: "
+msgstr "Buscar _con:"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Buscar na rede"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Abrir o enderezo nunha nova _lapela"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Abrir o _marco nunha nova lapela"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspeccionar _elemento"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Abrir ou descargar o ficheiro de %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nome de ficheiro: «%s»"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipo de ficheiro: «%s»"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipo de ficheiro: %s («%s»)"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, 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:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Abrir %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspeccionar a páxina - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "A documentación non está instalada"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori non almacena ningún dato persoal:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Non se gardan cookies nin historiais."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Os complementos están desactivados."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "Caché de almacenamento HTML5, a base de datos local e o aplicativo están "
 "desactivados."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori evita que os sitios web fagan un seguimento do usuario:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Os URL de referencia foron despoxados do nome de máquina."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "A obtención previa de DNS está desactivada."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "Os números de versión entre os corchetes amosan a versión en tempo de "
 "execución."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Pospúxose a carga da páxina"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Atraso na carga da páxina:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Cargar a páxina"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Páxina en branco"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Duplicar a lapela"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Amosar a _etiqueta da lapela"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Amosar só a _icona da lapela"
-
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Pechar ou_tra lapela"
-msgstr[1] "Pechar ou_tras lapelas"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "anterior"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "seguinte"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Imprimir imaxes de fondo"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Se se imprimen (ou non) as imaxes de fondo"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Funcionalidades"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1420,27 +1446,27 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "- restan %s"
+msgstr " - restan %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "O ficheiro descargado é erróneo."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1449,131 +1475,127 @@ msgstr ""
 "Probabelmente isto signfica que o ficheiro está incompleto ou que foi "
 "modificado despois do cálculo."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Non ten permiso para escribir nesta localización."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Non hai espazo libre abondo para descargar «%s»."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "O ficheiro precisa %s pero só quedan %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Marcación rápida"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Prema para engadir un atallo"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Introduza o enderezo do atallo"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Introduza o título do atallo"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Está seguro de que desexa eliminar este atallo?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Cando se inicia Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Páxina de inicio:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Usar a páxina a_ctual"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Usar a páxina actual como páxina de inicio"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Familia de letras proporcionais"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Tipo de letra predeterminado utilizada para amosar o texto"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Tamaño predeterminado do tipo de letra usado para amosar o texto"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Tipo de letra de largo fixo"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Tipo de letra que se usa para amosar texto de largo fixo"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "O tamaño do tipo de letra que se usa para amosar texto de largo fixo"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Tamaño mínimo do tipo de letra"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Tamaño mínimo do tipo de letra para amosar texto"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codificación preferida"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Cargar as imaxes automaticamente"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Activar a corrección ortográfica"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Activar scripts"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Activar a compatibilidade para WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Activar os engadidos de Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Zoom sobre o texto e as imaxes"
@@ -1588,11 +1610,19 @@ msgstr ""
 "Definir se os scripts teñen permiso ou non para abrir xanelas emerxentes "
 "automaticamente"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Nivel de ampliación predeterminado"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Factor inicial co que ampliar as novas lapelas"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Idiomas preferidos"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1600,116 +1630,116 @@ msgstr ""
 "Un lista separada por comas de idiomas preferidos para amosar páxinas web "
 "multiidioma, por exemplo «de», «ru,nl» ou «en-us;q=1.0, fr-fr;q=0.667»"
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Gardar os ficheiros descargados en:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navegación"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Estilo da barra de ferramentas:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Abrir as páxinas novas en:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Comportamento da nova lapela:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Botón de pechar nas lapelas"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Amosar sempre a barra de lapelas"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Abrir lapelas xunto á actual"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Abrir as lapelas en segundo plano"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor de texto"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregador de novas"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Rede"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nome de máquina"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Porto"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Tipos de proxy admitidos:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Caché web"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "O tamaño máximo da caché de páxinas no disco"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identificarse como"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Intimidade"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Eliminar as «cookies» antigas despois de:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 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-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Só se aceptan as «cookies» dos sitios que visite"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Bloquear as «cookies» dos sitios de terceiros"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1717,123 +1747,123 @@ msgstr ""
 "As «cookies» almacenan datos de sesión e gardan xogos ou perfís de usuario "
 "para publicidade."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Activar a caché de aplicativos web sen conexión"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Activar a opción de almacenamento local de HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 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-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Eliminar as páxinas do historial despois de:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 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"
+msgstr ""
+"Tempo máximo, en días, durante os que se gardará un dato do historial"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensións"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Ad_ministrador de motores de busca"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Engadir un motor de busca"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editar o motor de busca"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descrición"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Marca"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Xestionar os motores de busca"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Usar como pre_determinado"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, 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/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Non foi posíbel gardar os motores de busca. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historial"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Marcadores e historial"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Produciuse un erro ao iniciar o historial: %s"
+msgid "Search for %s"
+msgstr "Buscar %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Produciuse un erro ao seleccionar do historial: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Buscar %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Buscar con…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Buscar con %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Abrir con"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Escoller un aplicativo ou orde para abrir «%s»:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Non foi posíbel executar o programa externo."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "O URI non é correcto"
 
@@ -1858,81 +1888,138 @@ msgstr "Diferenciar maiúsculas de minúsculas"
 msgid "Close Findbar"
 msgstr "Pechar a barra de buscas"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d marcador"
+msgstr[1] "%d marcadores"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Non foi posíbel actualizar o marcador: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subcartafol"
+msgstr[1] "%d subcartafoles"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Cartafol baleiro"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "O cartafol contén %s e sen marcadores"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "O cartafol contén %s"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "O cartafol contén %s e %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "O marcador apunta a: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s e sen marcadores"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s e %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editar o marcador seleccionado"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Eliminar o marcador seleccionado"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Engadir un cartafol novo"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separador</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Abrir nunha nova _lapela"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Buscar marcadores"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historial"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Onte"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] "Fai %d día"
-msgstr[1] "Fai %d días"
+msgstr[0] "Hai %d día"
+msgstr[1] "Hai %d días"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
-msgstr "Fai unha semana"
+msgstr "Hai unha semana"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, 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:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Por en marcadores o elemento seleccionado no historial"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Eliminar o elemento seleccionado no historial"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Limpar completamente o historial"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
-msgstr "Buscar no historial "
+msgstr "Buscar no historial"
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -1958,120 +2045,69 @@ msgstr "Contrasinal"
 msgid "_Remember password"
 msgstr "_Lembrar o contrasinal"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Non foi posíbel cargar a icona chamada «%s»"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Non é posíbel cargar a icona de inventario «%s»"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Os marcos de animación están rotos"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Ningunha"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "A propiedade «%s» non é válida para %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Escoller un ficheiro"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Escoller un cartafol"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 día"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 semana"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mes"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 ano"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferencias de %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Suma de comprobación MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Suma de comprobación SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurar os filtros de publicidade"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 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."
+"Parece que esta páxina contén un script de usuario. Desexa instalalalo?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Editar regra"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regra:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_oquear a imaxe"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_oquear a ligazón"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Bloqueo de publicidade"
-
-#: ../extensions/adblock.c:1926
-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:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr ""
-"Parece que esta páxina contén un script de usuario. Desexa instalalalo?"
-
-#: ../extensions/addons.c:223
-msgid "_Install user script"
-msgstr "_instalar un script de usuario"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_instalar un script de usuario"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
@@ -2087,16 +2123,16 @@ msgstr "_instalar un estilo de usuario"
 msgid "Don't install"
 msgstr "Non instalar"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "«Scripts» de usuario"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Estilos de usuario"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Erro"
 
@@ -2118,40 +2154,40 @@ msgstr "Eliminar o estilo de usuario"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Eliminouse de forma permanente o ficheiro <b>%s</b>."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Abrir nun editor de texto"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Abrir o cartafol de destino"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Engadir un novo complemento"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Eliminar o complemento seleccionado"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Complementos de usuario"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Non é posíbel monitorizar o cartafol «%s»: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Compatibilidade para «scripts» e estilos de usuario"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Lapelas de cores"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Colorea cada lapela para distinguilas"
 
@@ -2160,11 +2196,11 @@ msgstr "Colorea cada lapela para distinguilas"
 msgid "Cookie Manager"
 msgstr "Administrador de «cookies»"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Eliminar todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2172,31 +2208,31 @@ msgstr ""
 "Elimina todas as cookies amosadas. 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:116
 msgid "Expand All"
 msgstr "Expandir todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Contraer todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pregunta"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Na fin da sesión"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2214,15 +2250,15 @@ msgstr ""
 "<b>Caduca</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Si"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Non"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2231,20 +2267,20 @@ msgstr ""
 "<b>Dominio</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nome"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandir todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Contraer todo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Buscar cookies por nome ou dominio"
 
@@ -2264,26 +2300,46 @@ msgstr "Copiar os enderezos das lapelas"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copiar os enderezos de todas as lapelas ao portarretallos"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Carga atrasada"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Atraso en segundos ata que se cargue a páxina:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Atraso na carga da páxina ata que realmente utilice a lapela."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Prema dúas veces para obter máis información"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Esta extensión amosa as mensaxes de erro do glib na área de notificación."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Produciuse un erro cando se tentaba descargar un ficheiro co seguinte "
-"engadido:\n"
+"Produciuse un erro ao tentar descargar un ficheiro co seguinte engadiso:\n"
+"%s\n"
+"\n"
+"Erro:\n"
+"%s\n"
+"\n"
+"Continuar sen este engadido."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2325,25 +2381,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Última actualización: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Fontes"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Engadir unha nova fonte"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Eliminar fonte"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Fontes"
 
@@ -2362,39 +2418,39 @@ msgstr "Formato de fonte non admitido."
 msgid "Failed to parse XML feed: %s"
 msgstr "Non foi posíbel analizar a fonte XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Non foi posíbel atopar o elemento «channel» nos datos XML do RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Versión de RSS non admitida."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 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."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 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."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "A fonte «%s» xa existe"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Atopouse un erro ao cargar a fonte «%s»"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel de fontes"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Lector de fontes Atom/RSS"
 
@@ -2415,124 +2471,412 @@ msgstr ""
 "Precísanse un nome de usuario e un\n"
 "contrasinal para abrir esta localización:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Lembrar o contrasinal desta páxina?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Non agora"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nunca para esta páxina"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Alternar o estado do historial de formularios"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 "Activar ou desactivar o historial dos formularios para a lapela actual."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Produciuse un fallo ao abrir a base de datos: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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"
+"Activar o historial de formularios só a través das teclas de atallo "
+"(Ctrl+Shift+F) por lapela"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Completador de historial de formularios"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Almacena un historial dos datos introducidos nos formularios"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Produciuse un erro ao seleccionar suxestións\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Non hai lapelas sen visitar"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Lista do historial"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Comportamento ao pechar as lapelas"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Non facer nada"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Cambiar á última lapela vista"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Cambiar á lapela máis nova"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Xanela intermitente nas lapelas en segundo plano"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Seguinte lapela nova (historial de lapelas)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Seguinte lapela nova do historial"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Lapela nova anterior (historial de lapelas)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Lapela nova anterior do historial"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Amosar a lapela en segundo plano (lista do historial)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Amosar a lapela actual en segundo plano"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Lista do historial"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Ir para a última lapela usada ao cambiar ou pechar lapelas"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Fallos de SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Aceptar para a sesión"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloque"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Non foi posíbel abrir a base de datos da extensión: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Produciuse un erro ao executar a instrución de base de datos: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Confirma que quere eliminar todos os permisos de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Eliminar todos os permisos de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Esta acción eliminará todos os permisos de JavaScript. Preguntaráselle polos "
+"permisos para cada sitio que visite."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instancia do administrador"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instancia para o administrador xeral de NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurar NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"A seguir amosase unha lista de todos os sitios web e a política estabelecida "
+"para eles. Pode eliminar as políticas marcando as entradas premendo en "
+"<i>Eliminar</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Directiva"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Eliminar _todo"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Permitir os scripts de todos os sitios"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blo_quear de xeito predeterminado os scripts dos sitios descoñecidos"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Estabelecer os permisos nos dominios de segundo nivel"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Denegar %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permitir %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permitir %s nesta sesión"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Xanela do navegador"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "A instancia do navegador Midori desta vista pertence a"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Ver"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "A vista da instancia do Midori desta vista pertence a"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Estado da icona do menú"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Estado da icona do menú que amosar na barra de estado"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Sen determinar"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permitido"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mesturado"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Denegado"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Produciuse un erro grave que impide que a extensión NoJS continúe. Ten que "
+"desactivala."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Produciuse un erro na extensión de NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Razón"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Non foi posíbel crear o cartafol de configuración da extensión: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Non foi posíbel crear o cartafol de configuración da extensión."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Non foi posíbel abrir a base de datos da extensión."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"Non foi posíbel estabelecer a estrutura da base de datos da extensión."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instancia da extensión"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "A instancia do aplicativo de Midori desta extensión"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instancia do aplicativo"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "A instancia do aplicativo de Midori desta extensión pertence a"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instancia da base de datos"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Punteiro da instancia da base de datos SQLite empregada por esta extensión"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Ruta da base de datos"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Ruta da instancia da base de datos SQLite empregada por esta extensión"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permitir todos os sitios"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Se é verdadeiro, esta extensión non comprobará a política de cada sitio e "
+"permitiraos."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Só o segundo nivel"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Se é verdadeiro, esta extensión reducirá cada dominio ao seu segundo nivel "
+"(www.exemplo.org reducirase a exemplo.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Política do dominio descoñecida"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Política a seguir nos dominios descoñecidos"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Aceptar temporalmente"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Xestos do rato"
@@ -2561,11 +2905,11 @@ msgstr "Atallos"
 msgid "View and edit keyboard shortcuts"
 msgstr "Ver e modificar os atallos de teclado"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Reloxo na barra de estado"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Amosar a data e a hora na barra de estado"
 
@@ -2581,6 +2925,10 @@ msgstr "Scripts"
 msgid "Netscape plugins"
 msgstr "Engadidos de Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activar os engadidos de Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Características da barra de estado"
@@ -2589,15 +2937,15 @@ msgstr "Características da barra de estado"
 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:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panel de lapelas"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Panel de _lapelas"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Amosar as lapelas nun panel vertical"
 
@@ -2609,11 +2957,11 @@ msgstr "De xeito predeterminado só se amosan as iconas nas lapelas"
 msgid "New tabs have no label by default"
 msgstr "De xeito predeterminado as novas lapelas non teñen etiqueta"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personalizar a barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2621,67 +2969,58 @@ msgstr ""
 "Seleccionar os elementos que van amosarse na barra de ferramentas. Os "
 "elementos poden reordenarse arrastrando e soltando."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Elementos dispoñíbeis"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Elementos amosados"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Personalizar a barra de ferramentas…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor da barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Gardar unha caché da comunicación HTTP no disco"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Produciuse un erro cargar as cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Limpar os datos privados"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Limpar os datos privados"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Limpar os seguintes datos:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Últimas lapelas abertas"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "_Limpar os datos privados ao saír de Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Gardar os nomes de usuario e os _contrasinais"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies e datos do sitio web"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Iconas de sitios web"
 
@@ -2689,188 +3028,132 @@ msgstr "Iconas de sitios web"
 msgid "Open tabs"
 msgstr "Abrir lapelas"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Máis lapelas abertas…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Produciuse un erro ao limpar o historial: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Produciuse un fallo ao eliminar elementos antigos do historial: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "produciuse un erro ao ANEXAR a antiga base de datos"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "produciuse un erro ao importar desde a antiga base de datos"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "produciuse un erro ao desfacer a transacción"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "produciuse un erro ao SEPARAR"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Non foi posíbel crear a táboa de marcadores: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Non foi posíbel importar desde a antiga base de datos: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Non foi posíbel actualizar o marcador: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Non foi posíbel gardar os marcadores. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Non foi posíbel retirar o elemento do marcador: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Non foi posíbel gardar a configuración. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Non foi posíbel cargar a sesión: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Non foi posíbel gardar a sesión. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Non foi posíbel gardar o lixo. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
 "Midori quebrou a última vez que foi aberto. Pode informar do problema en %s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modificar as _preferencias"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Desactivar todas as _extensións"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Amosar un cadro de dialogo despois de que Midori falle"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Desbotar as lapelas antigas"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Amosar o último _rexistro de quebra"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Executar en modo _depuración"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Non foi posíbel cargar os marcadores: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Non foi posíbel cargar a sesión: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Non foi posíbel cargar o lixo: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Non foi posíbel cargar o historial: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Producíronse os seguintes erros:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Fallos de SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Aceptar para a sesión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Bloque"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Non foi posíbel abrir a base de datos da extensión: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Produciuse un erro ao executar a instrución de base de datos: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Confirma que quere eliminar todos os permisos das cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Eliminar todos os permisos das cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2878,20 +3161,20 @@ msgstr ""
 "Esta acción eliminará todos os permisos das cookies. Pediránselle de novo os "
 "permisos para cada sitio web visitado."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Administrador de permisos para as cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instancia do actual administrador de permisos para as cookies"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configurar os permisos das cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2905,23 +3188,13 @@ msgstr ""
 "para un dominio introducindo o dominio a seguir, escollendo a directiva e "
 "premendo en <i>Engadir</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Dominio"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Directiva"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Eliminar _todo"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Política para as cookies dos dominios que non estean na lista: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "_Pregunte pola directiva se non se coñece un dominio"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Solicitar unha decisión"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2936,130 +3209,68 @@ msgid "Error in cookie permission manager extension"
 msgstr ""
 "Produciuse un erro na extensión administradora de permisos para as cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Razón"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Non foi posíbel crear o cartafol de configuración da extensión: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Non foi posíbel crear o cartafol de configuración da extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Non foi posíbel abrir a base de datos da extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Non foi posíbel estabelecer a estrutura da base de datos da extensión."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "Non foi posíbel determinar unha directiva global de cookies que estabelecer "
 "para o dominio: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Ata a fin da sesión"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "O sitio %s quere gardar %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "O sitio %s quere gardar unha cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Múltiplos sitios queren gardar %d cookies en total."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Aceptar para esta _sesión"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "De_negar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Denegar desta _volta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Ruta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valor"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Data de caducidade"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instancia da extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "A instancia do aplicativo de Midori desta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instancia do aplicativo"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "A instancia do aplicativo de Midori desta extensión pertence a"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instancia da base de datos"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-"Punteiro da instancia da base de datos SQLite empregada por esta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Ruta da base de datos"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Ruta da instancia da base de datos SQLite empregada por esta extensión"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Preguntar por unha directiva descoñecida"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
-"Se é verdadeiro esta extensión preguntará polas directivas para cada dominio "
-"descoñecido. Se é falso esta extensión utiliza a directiva global de "
-"cookies establecida na configuración de Midori."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Sen determinar"
+"A política a seguir para os dominios non está configurada de xeito "
+"individual. Isto só serve para restrinxir aínda máis a política global de "
+"cookies configurada no Midori."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3069,19 +3280,68 @@ msgstr "Administrador de seguranza das cookies"
 msgid "Manage cookie permission per site"
 msgstr "Administrar os permisos das cookies por sitio"
 
-#: ../extensions/apps.vala:82
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Non foi posíbel obter a icona do aplicativo en %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Non foi posíbel crear un novo iniciador (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Creouse o iniciador"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Agora pode executar <b>%s</b> co seu iniciador ou desde o menú"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Produciuse un erro ao crear o iniciador"
+
+#: ../extensions/apps.vala:191
 msgid "Applications"
 msgstr "Aplicativos"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Novo _Perfil"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Crea un novo perfil independente e un iniciador"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Novo _aplicativo"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Crea un novo aplicativo para un sitio específico"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Produciuse un erro no inicio"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Crear _iniciador"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Administrador de aplicativos web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Administrar sitios web instalados como aplicativos"
 
@@ -3089,829 +3349,193 @@ msgstr "Administrar sitios web instalados como aplicativos"
 msgid "Transfers"
 msgstr "Transferencias"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Non foi posíbel abrir a descarga: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Abrir o carta_fol de destino"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copiar o enderezo da lig_azón"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Descargouse o ficheiro «<b>%s</b>»."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+"«<b>%s</b>» e outros %d ficheiros foron descargados satisfactoriamente."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transferencia completada"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Estanse a descargar algúns ficheiros"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "Saír de Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Se sae de Midori hanse cancelar as transferencias."
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Administrador de transferencias"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Ver os ficheiros descargados"
 
-#~ msgid "Writing failed."
-#~ msgstr "Produciuse un fallo de escritura."
-
-#~ msgid "_Window"
-#~ msgstr "_Xanela"
-
-#~ msgid "Custom..."
-#~ msgstr "Personalizado…"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Como se identifica nas páxinas web"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Desprazamento cinético"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "O desprazamento móvese de acordo ca velocidade"
-
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Prema no botón central para abrir a selección"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Cargue un enderezo da selección premendo no botón central do rato"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Redirixir os avisos ao NOMEFICHEIRO indicado"
-
-#~ msgid "FILENAME"
-#~ msgstr "NOMEFICHEIRO"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Engadir un atallo no _escritorio"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Lembrar o último tamaño de xanela"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Gardar (ou non) o último tamaño de xanela"
-
-#~ msgid "Last window width"
-#~ msgstr "Última largura da xanela"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Última largura da xanela gardada"
-
-#~ msgid "Last window height"
-#~ msgstr "Última altura da xanela"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Última altura da xanela gardada"
-
-#~ msgid "Last panel position"
-#~ msgstr "Última posición do panel"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Última posición gardada do panel"
-
-#~ msgid "Last panel page"
-#~ msgstr "Última páxina do panel"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Última páxina gardada do panel"
-
-#~ msgid "Last Web search"
-#~ msgstr "Última busca no web"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Última busca no web gardada"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Mostrar a barra de menú"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Mostrar (ou non) a barra de menú"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Mostrar a barra de navegación"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Mostrar (ou non) a barra de navegación"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Mostrar a barra de marcadores"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Mostrar (ou non) a barra de marcadores"
-
-#~ msgid "Show Panel"
-#~ msgstr "Mostrar o panel"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Mostrar (ou non) o panel"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Mostrar a barra de estado"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Mostrar (ou non) a barra de estado"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Elementos da barra de ferramentas"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Elementos que se van mostrar na barra de ferramentas"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Panel lateral compacto"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Facer (ou non) o panel lateral compacto"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Aliñar á dereita o panel lateral"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Aliñar (ou non) á dereita o panel lateral"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Abrir os paneis en xanelas separadas"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Indica se os paneis se abren sempre en xanelas separadas"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Que facer ao iniciar Midori"
-
-#~ msgid "The homepage"
-#~ msgstr "A páxina de inicio"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "O cartafol de descargas foi gardado en"
-
-#~ msgid "An external text editor"
-#~ msgstr "Un editor de texto externo"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "Un agregador de novas externo"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Busca de barra de enderezos"
-
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "Facer unha busca a partir do contido da barra de enderezos"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Codificación de caracteres preferida"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Mostrar sempre a barra de lapelas"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Cada unha das lapelas terá o seu botón para pechala"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Onde se van abrir as páxinas novas"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Abrir (ou non) as novas lapelas en segundo plano"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Abrir as xanelas emerxentes en lapelas"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "Abrir (ou non) as xanelas emerxentes en lapelas"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Cargar e mostrar as imaxes automaticamente"
-
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Activar linguaxes de script incrustadas"
-
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Activar o engadido de obxectos incrustados de Netscape"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Activar o corrector ortográfico ao escribir"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Activar a compatibilidade de base de datos HTML5"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Activar ou desactivar a compatibilidade de base de datos HTML5"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr ""
-#~ "Activar ou desactivar a compatibilidade de almacenamento local de HTML5"
-
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Activar ou desactivar a caché de aplicativos web sen conexión"
-
-#~ 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"
-
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Permitir que os sitios web empreguen OpenGL"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Aplicar zoom (ou non) ao texto e ás imaxes"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Buscar en liña ao escribir"
-
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "Buscar en liña automaticamente (ou non) mentres se escribe"
-
-#~ msgid "The type of proxy server to use"
-#~ msgstr "O tipo de servidor proxy a usar"
-
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "Servidor proxy HTTP"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Servidor proxy que se usa para as conexións HTTP"
-
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "Servidor proxy que se usa para as conexións HTTP"
-
-#~ msgid "Identification string"
-#~ msgstr "Cadea de identificación"
-
-#~ msgid "The application identification string"
-#~ msgstr "Cadea de identificación do aplicativo"
-
-#~ msgid "Clear private data"
-#~ msgstr "Limpar a información persoal"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Os datos privados seleccionados para eliminar"
-
-#~ msgid "Clear data"
-#~ msgstr "Limpar os datos"
-
-#~ msgid "The data selected for deletion"
-#~ msgstr "Os datos seleccionados para eliminar"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Resaltar coincidencias"
-
-#~ 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…"
-#~ msgstr ""
-#~ "Inspeccionar os detalles de páxina e acceder ás ferramentas de "
-#~ "desenvolvemento…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Cambiar á lapela anterior"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Cambiar á lapela seguinte"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Poñer a lapela detrás da lapela anterior"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Poñer a lapela antes da seguinte lapela"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Enfocar a lapela actual"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Mostrar só a icona da lapela actual"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplicar a lapela actual"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Pechar todas as lapelas agás a lapela actual"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Abre as lapelas gardadas na última sesión"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Mostrar as preguntas frecuentes"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Abrir o xestor de reporte de fallos de Midori"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Mostrar información sobre o programa"
-
-#~ msgid "Show menubar"
-#~ msgstr "Mostrar barra de menú"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Mostrar a barra de navegación"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Mostrar panel lateral"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Mostrar a barra de marcadores"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Mostrar a barra de estado"
-
-#~ msgid "No filename specified"
-#~ msgstr "Nome de ficheiro sen especificar"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Non se atopou - %s"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Definir o número de columnas e filas"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Introduza o número de columnas e filas:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Tamaño de entrada non válido para a marcación rápida"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Tamaño da miniatura:"
-
-#~ msgid "Small"
-#~ msgstr "Pequeno"
-
-#~ msgid "Medium"
-#~ msgstr "Mediano"
-
-#~ msgid "Big"
-#~ msgstr "Grande"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Non se pode mostrar o documento"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Aplicar 96 puntos por polgada"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configurar os filtros de _publicidade…"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Permite cambiar de lapela usando Ctrl+Tab seleccionando nunha lista "
-#~ "ordenada por último uso"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% cargada"
-
-#~ msgid "Quit the application"
-#~ msgstr "Saír do aplicativo"
-
-#~ msgid "_Contents"
-#~ msgstr "_Contido"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Mostrar a documentación"
-
-#~ msgid "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 "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 "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 "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 "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 year"
-#~ msgstr "Borrar as cookies antigas despois de 1 ano"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Abrir o cartafol destino para o complemento seleccionado"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Seguinte lapela (historial de lapelas)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Lapela anterior (historial de lapelas)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Lapela anterior do historial"
-
-#~ msgid "Pageholder"
-#~ msgstr "Cadro de páxinas"
-
-#~ msgid "_Pageholder"
-#~ msgstr "Cadro de _páxinas"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Manter unha ou varias páxinas abertas en paralelo nas lapelas"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Produciuse un erro ao limpar o historial de buscas: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Separar o panel seleccionado da xanela "
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Ocultar os controis de operación"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Corrección ortográfica"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Lista de idiomas, separados por comas, a empregar para a corrección "
-#~ "ortográfica, p.ex. «en_GB,de_DE»"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimizar a lapela a_ctual"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimizar a lapela actual"
-
-#~ msgid "External Applications"
-#~ msgstr "Aplicativos externos"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Asociar esquemas de URL con ordes externas"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Dicionarios de ortografía:"
-
-#~ msgid "Console"
-#~ msgstr "Consola"
-
-#~ msgid "Copy _All"
-#~ msgstr "Copiar _todo"
-
-#~ msgid "Copy All"
-#~ msgstr "Copiar todo"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Xestor de _cookies"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "Páxinas visitadas _recentemente"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Volver abrir as páxinas que visitou antes"
-
-#~ msgid "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"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Non foi posíbel actualizar a base de datos: %s"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Non foi posíbel seleccionar da base de datos: %s"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Restaurar a lapela"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Non foi posíbel importar a sesión herdada: %s"
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimizar a lapela"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "A hora do reloxo é incorrecta"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Xestión de lapelas e sesións."
 
-#~ 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."
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Copiar %s ao cartafol %s."
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Esta extensión fornece unha cola de tarefas para traballos de actualización "
+"ou accións recorrentes."
 
-#~ msgid "New tabs open minimized"
-#~ msgstr "As novas lapelas ábrense minimizadas"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Non foi posíbel engadir unha nota nova na base de datos: %s\n"
 
-#~ msgid "REGEX"
-#~ msgstr "EXP.REG"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Non foi posíbel retirar a nota da base de datos: %s\n"
 
-#~ msgid "Open _Link"
-#~ msgstr "Abrir unha _ligazón"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Non foi posíbel renomear a nota: %s\n"
 
-#~ 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."
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Non foi posíbel actualizar a nota: %s\n"
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Produciuse un erro ao obter a hora actual: %s\n"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notas"
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Mostrar os _títulos dos paneis"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nota nova"
 
-#~ msgid "Options"
-#~ msgstr "Opcións"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Crear unha nota nova baleira, sen relación coas páxinas abertas"
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Non dispoñible nesta plataforma"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova nota"
 
-#~ msgid "View Selection Source"
-#~ msgstr "Mostrar código da selección"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Non foi posíbel facer a selección de notas na base de datos: %s\n"
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Ver o código fonte da selección"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Renomear a nota"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Lembrar as últimas sesións de formularios"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copiar a nota no portapapeis"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Lembrar (ou non) as últimas sesións cos seus datos de formularios"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Retirar a nota"
 
-#~ msgid "Cache size"
-#~ msgstr "Tamaño da caché"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiar a selección como unha nota"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Tamaño asignado á memoria caché"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Gardar os fragmentos de texto dos sitios web como notas"
 
-#~ msgid "Encoding"
-#~ msgstr "Codificación"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueo de publicidade"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Codificación de caracteres prefedeterminada"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquear a publicidade de acordo cunha lista de filtros"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Reducir as imaxes automaticamente"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurar os filtros de publicidade"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Redimensionar as imaxes automaticamente para axustalas"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_oquear a imaxe"
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Activar ferramentas de desenvolvedor"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_oquear a ligazón"
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Activar as extensións especiais para desenvolvedores"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editar regra"
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Pintar as lapelas con cores diferentes"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regra:"
index 992b960327c9e220850d3f5e69110ef7fb1d6259..4f00da27bc5ca4f99c7453741b448361798c54b4 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -8,515 +8,368 @@ 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 <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-20 01:07+0000\n"
+"Last-Translator: Dor <dor.gallego@gmail.com>\n"
 "Language-Team: גזר\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-Launchpad-Export-Date: 2014-12-21 05:33+0000\n"
+"X-Generator: Launchpad (build 17286)\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
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "דפדפן Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "דפדפן"
+
+#: ../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:2
+#: ../data/midori.desktop.in.h:5
 msgid "Internet;WWW;Explorer"
 msgstr "אינטרנט;רשת;דפדפן"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2020 ../midori/main.c:2044
-#: ../midori/main.c:2058 ../midori/midori-websettings.c:312
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "לשונית חדשה"
 
-#: ../data/midori.desktop.in.h:4
-msgid "Web Browser"
-msgstr "דפדפן"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "חלון חדש"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+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 "פתיחת חלון גלישה פרטית חדש"
+msgstr "גלישה פרטית ב  Midori"
 
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4147
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "גלישה פרטית"
 
-#: ../midori/main.c:96 ../midori/main.c:102
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "ההגדרות לא ניתנות לטעינה: %s\n"
-
-#: ../midori/main.c:150
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "הערך %s אינו תקף עבור %s"
-
-#: ../midori/main.c:155 ../midori/main.c:259
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "ערך הגדרה אינו תקף '%s'"
-
-#: ../midori/main.c:364
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n"
-
-#: ../midori/main.c:418
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "נכשל בניקוי ההיסטוריה: %s\n"
-
-#: ../midori/main.c:438 ../midori/main.c:565
-#: ../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:508
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "נכשל בהסרת פריטי היסטוריה ישנים: %s\n"
-
-#: ../midori/main.c:548 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "נכשל בהסרת פריט היסטוריה: %s\n"
-
-#: ../midori/main.c:595
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "הסימנייה לא ניתנת לשמירה. %s"
-
-#: ../midori/main.c:617
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "ההגדרות לא ניתנות לשמירה. %s"
-
-#: ../midori/main.c:652
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "מנועי החיפוש לא ניתנים לשמירה. %s"
-
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:689
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "האשפה לא ניתנת לשמירה. %s"
-
-#: ../midori/main.c:730 ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "הרחבות"
-
-#: ../midori/main.c:744
-msgid "Privacy"
-msgstr "פרטיות"
-
-#: ../midori/main.c:756
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"עוגיות מאחסנות פריטי גישה, משחקים שמורים או פרופילים של משתמשים למטרות פרסום."
-
-#: ../midori/main.c:812
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "ההפעלה לא ניתנת לשמירה. %s"
-
-#: ../midori/main.c:1030
-msgid ""
-"No root certificate file is available. SSL certificates cannot be verified."
-msgstr "אין אישורי על (root) זמינים. לא ניתן לאמת את אישורי ה־SSL."
-
-#: ../midori/main.c:1099
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"נראה ש־Midori קרס בפעם הקודמת שנפתח. אם זה יקרה שוב, נסה את אחת האפשרויות "
-"הבאות לפתירת התקלה."
-
-#: ../midori/main.c:1118
-msgid "Modify _preferences"
-msgstr "עריכת ה_העדפות"
-
-#: ../midori/main.c:1122
-msgid "Disable all _extensions"
-msgstr "נטרול כל ה_הרחבות"
-
-#: ../midori/main.c:1135
-msgid "Discard old tabs"
-msgstr "התעלמות מלשוניות חדשות"
-
-#: ../midori/main.c:1136 ../midori/midori-websettings.c:221
-msgid "Show last tabs without loading"
-msgstr "הצגת הלשוניות האחרונות מבלי לטעון אותן"
-
-#: ../midori/main.c:1137 ../midori/midori-websettings.c:220
-msgid "Show last open tabs"
-msgstr "הצג רשימת לשוניות שנפתחו קודם"
-
-#: ../midori/main.c:1372 ../midori/main.c:2436
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "פתיחת חלון גלישה פרטית חדש"
 
-#: ../midori/main.c:1510
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
-msgstr "Snapshot saved to: %s\n"
+msgstr "תצלום בזק נשמר ל %s\n"
 
-#: ../midori/main.c:1923
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr "Run ADDRESS as a web application"
+msgstr "הרצת  ADDRESS אינטרנט"
 
-#: ../midori/main.c:1923
+#: ../midori/main.c:79
 msgid "ADDRESS"
-msgstr "ADDRESS"
+msgstr "כתובת"
 
-#: ../midori/main.c:1926
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "Use FOLDER as configuration folder"
+msgstr ""
 
-#: ../midori/main.c:1926
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1929
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
-msgstr "Private browsing, no changes are saved"
+msgstr "גלישה פרטית, לא נשמרו שינויים"
 
-#: ../midori/main.c:1931
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "מצב נייד, כל קבצי ההרצה שמורים במקום אחד"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
-msgstr "Show a diagnostic dialog"
+msgstr "הצגת דו שיח אבחון"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "הרצה עם gdb ושמירת התחקות אחר קריסה"
 
-#: ../midori/main.c:1933
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
-msgstr "Run the specified filename as javascript"
+msgstr "הרצת הקובץ המצוין כתסריט java"
 
-#: ../midori/main.c:1935
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
-msgstr "Take a snapshot of the specified URI"
+msgstr "צילום בזק של הכתובת המצוינת"
 
-#: ../midori/main.c:1937
+#: ../midori/main.c:99
 msgid "Execute the specified command"
-msgstr "Execute the specified command"
+msgstr "ביצוע הפקודה המצוינת"
 
-#: ../midori/main.c:1939
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
-msgstr "List available commands to execute with -e/ --execute"
+msgstr "הצגת פקודות זמינות לביצוע באמצעות - e/ --execute"
 
-#: ../midori/main.c:1941
+#: ../midori/main.c:103
 msgid "Display program version"
-msgstr "Display program version"
+msgstr "הצגת גרסת תוכנה"
 
-#: ../midori/main.c:1943
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "כתובות"
 
-#: ../midori/main.c:1945
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
-msgstr "Block URIs according to regular expression PATTERN"
+msgstr "חסימת כתובות בהתאם לתבנית הגייה רגילה"
 
-#: ../midori/main.c:1945
+#: ../midori/main.c:107
 msgid "PATTERN"
-msgstr "PATTERN"
+msgstr "תבנית"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1949
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr "Reset Midori after SECONDS seconds of inactivity"
+msgstr "אתחול מידורי אחרי SECONDS שניות של חוסר פעילות"
 
-#: ../midori/main.c:1949
+#: ../midori/main.c:111
 msgid "SECONDS"
-msgstr "SECONDS"
+msgstr "שניות"
 
-#: ../midori/main.c:1952
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Redirects console warnings to the specified FILENAME"
-
-#: ../midori/main.c:1952
-msgid "FILENAME"
-msgstr "FILENAME"
-
-#: ../midori/main.c:2017
-msgid "[Addresses]"
-msgstr "[כתובות]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
 
-#: ../midori/main.c:2059
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "×\90× ×\90 ×\93×\95×\95×\97 ×ª×\92×\95×\91×\95ת, ×\94צע×\95ת ×\95×\91×\90×\92×\99×\9d ×\90ל:"
+msgstr "× ×\90 ×\9c×\93×\95×\95×\97 ×¢×\9c ×\94ער×\95ת, ×\94צע×\95ת ×\95ש×\99×\91×\95ש×\99×\9d ל:"
 
-#: ../midori/main.c:2061
+#: ../midori/main.c:164
 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 "פרטי גישה וססמאות ש_נשמרו"
-
-#: ../midori/main.c:2147
-msgid "Cookies and Website data"
-msgstr "קובצי עוגיה ונתוני אתרים"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2151 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "מטמון רשת"
+msgstr "בדיקת גיסאות חדשות ב:"
 
-#: ../midori/main.c:2154
-msgid "Website icons"
-msgstr "אייקונים של אתרים"
-
-#: ../midori/main.c:2260
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr "אירעה שגיאה בלתי מוכרת"
-
-#: ../midori/main.c:2367
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "מופע של Midori כבר רץ אך אינו מגיב. \n"
-
-#: ../midori/main.c:2403
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "לא ניתן לטעון את הסימנייה: %s\n"
-
-#: ../midori/main.c:2451
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "האשפה לא ניתנת לטעינה: %s\n"
-
-#: ../midori/main.c:2464
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n"
-
-#: ../midori/main.c:2480
-msgid "The following errors occured:"
-msgstr "השגיאות הבאות התרחשו:"
-
-#: ../midori/main.c:2496
-msgid "_Ignore"
-msgstr "הת_עלמות"
-
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_סימניה"
+msgstr "התרחשה שגיאה בלתי ידועה"
 
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_סימניות"
 
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "הוסף סימ_ניה"
 
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_מסוף"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1155
 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:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_היסטוריה"
 
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_דף הבית"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "תסריטי _משתמש"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "עיצובי_משתמש"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "_לשונית חדשה"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_העברות"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "ת_וספי Netscape"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "לשוניות _שנסגרו"
 
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_חלון חדש"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "תיקייה _חדשה"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[כתובות]"
+
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
-msgstr "×\9eס×\9e×\9a ×\9c×\90 ×ª×§×\99×\9f."
+msgstr "×\9eס×\9e×\9a ×¤×\92×\95×\9d"
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
-msgstr "ס×\95×\92 ×¡×\99×\9e× ×\99×\95ת ×\9c×\90 ×\9e×\96×\95×\94×\94"
+msgstr "ת×\91× ×\99ת ×¡×\99×\9e× ×\99×\95ת ×\91×\9cת×\99 ×\9e×\95×\9bרת"
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "הכתיבה נכשלה."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "+"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "מעבר לתת־העמוד הבא"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "חיפוש באנטרנט....."
 
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
-msgstr "×\98×¢×\9f ×\90ת הדף הנוכחי מחדש"
+msgstr "×\98×¢×\99× ת הדף הנוכחי מחדש"
 
-#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
-msgstr "הפסק לטעון את הדף הנוכחי"
+msgstr "הפסקת טעינת הדף הנוכחי"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "עדכון הכותרת נכשל: %s\n"
 
-#: ../midori/midori-browser.c:489
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "הערך %s אינו תקף עבור %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "הגדרה לא צפויה '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "פעולה בלתי צפויה '%s'."
 
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (גלישה פרטית)"
 
-#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "תיקיית השורש"
-
-#: ../midori/midori-browser.c:784
-msgid "New folder"
-msgstr "תיקייה חדשה"
-
-#: ../midori/midori-browser.c:784
-msgid "Edit folder"
-msgstr "עריכת התיקייה"
-
-#: ../midori/midori-browser.c:786
-msgid "New bookmark"
-msgstr "סימנייה חדשה"
-
-#: ../midori/midori-browser.c:786
-msgid "Edit bookmark"
-msgstr "עריכת הסימנייה"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "כשל בהכנסת פריט היסטוריה %s\n"
 
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_כותרת:"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_כתובת:"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "סימניות"
 
-#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303
-msgid "_Folder:"
-msgstr "_תיקייה:"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:887
-msgid "Add to _Speed Dial"
-msgstr "הוספה ל_חיוג מהיר"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:900
-msgid "Show in the tool_bar"
-msgstr "הסג ב_סרגל הכלים"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:915
-msgid "Run as _web application"
-msgstr "הפעל כיישום _רשת"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:986
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "לא ניתן לשמור את הקובץ „%s“ בתיקייה זו."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "אין לך הרשאות לכתוב למיקום זה."
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:995
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "אין די מקום פנוי כדי להוריד את „%s“."
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:998
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "הקובץ זקוק ל־%s אך נותרו רק %s."
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "הוספה ל_חיוג מהיר"
 
-#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "שמירת קובץ בשם"
 
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "×\97×\9c×\95×\9f ×\97×\93ש"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "ש×\9e×\99רת ×\9eש×\90×\91×\99×\9d ×\9eש×\95×\99×\99×\9b×\99×\9d"
 
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "חלון חדש נפתח"
 
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "לשונית חדשה"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "לשונית חדשה נפתחה"
 
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "אירעה שגיאה בעת פתיחת התמונה!"
 
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "לא ניתן לפתוח את התמונה הנבחרת במציג בררת המחדל"
 
-#: ../midori/midori-browser.c:1375
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
-msgstr "×\90×\99רע×\94 ×©×\92×\99×\90×\94 ×\91עת ×\94×\95ר×\93ת ×\94ת×\9bנה!"
+msgstr "×\94תר×\97ש×\94 ×©×\92×\99×\90×\94 ×\91עת ×\94×\95ר×\93ת ×\94ת×\9e×\95נה!"
 
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "לא ניתן להוריד את התמונה הנבחרת."
 
-#: ../midori/midori-browser.c:1479
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "שמירת קובץ"
 
-#: ../midori/midori-browser.c:2346
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "רענון העמוד ללא שימוש במטמון"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "פתיחת קובץ"
 
-#: ../midori/midori-browser.c:2478
+#: ../midori/midori-browser.c:2692
 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"
@@ -524,1664 +377,1624 @@ msgid ""
 "Aggregator. Next time you click the news feed icon, it will be added "
 "automatically."
 msgstr ""
+"כדי להשתמש בכתובת מלמעלה, יש לפתוח את שירות הזנת החדשות. בדרך כלל קיים תפריט "
+"או כפתור \"הרשמה חדשה\"(\"New Subscription\", \"New News Feed\"), או דומה "
+"להם. לחילופין ניתן לגשת להעדפות של מידורי ולבחור את שירות הזנת החדשות. בפעם "
+"הבאה, בעת הקשה על צלמית \"הזנת חדשות\" (news feed) הכתובת תתווסף באופן "
+"אוטומטי."
 
-#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "הזנה חדשה"
 
-#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
-msgstr "×\94×\95סף ×\9cש×\95× ×\99ת חדשה"
+msgstr "×\94×\95ספת ×¡×\99×\9e× ×\99×\99×\94 חדשה"
 
-#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "ריק"
 
-#: ../midori/midori-browser.c:3446
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
+msgstr "ניווט סמן התמליל"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
 msgstr ""
+"לחיצה על F7 מאפשרת/אינה מאפשרת את סמן גלישת התמליל. כאשר פעיל, סמן תמליל "
+"מופיע בכל האתרים."
 
-#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732
-#, fuzzy, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "נכשל בהסרת פריט היסטוריה: %s\n"
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_החלת סמן התמליל"
 
-#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
-msgstr "פת×\97 ×\91_חלון חדש"
+msgstr "פת×\99×\97×\94 ×\91חלון חדש"
 
-#: ../midori/midori-browser.c:4190
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4191
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4192
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4195
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "ייבוא סימניות…"
 
-#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
-msgstr "יי_בוא סימניות"
+msgstr "בוא סימניות"
 
-#: ../midori/midori-browser.c:4230
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
-msgstr "יי_שום:"
+msgstr "_יישום"
 
-#: ../midori/midori-browser.c:4295
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "ייבוא מקובץ XBEL או HTML"
 
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "ייבוא מקובץ"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
-msgstr "×\99×\99×\91×\95×\90 ×\94ס×\99×\9e× ×\99×\95ת × ×\9bש×\9c"
+msgstr "×\9bש×\9c ×\91×\99×\99×\91×\95×\90 ×\94ס×\99×\9e× ×\99×\95ת"
 
-#: ../midori/midori-browser.c:4377
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "סימניות XBEL"
 
-#: ../midori/midori-browser.c:4382
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "סימניות של Netscape"
 
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4546
 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:4411
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
-msgstr "×\99×\99צ×\95×\90 ×\94ס×\99×\9e× ×\99×\95ת × ×\9bש×\9c"
+msgstr "×\9bש×\9c ×\91×\99×\99צ×\95×\90 ×\94ס×\99×\9e× ×\99×\95ת"
 
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4533
-msgid "Clear Private Data"
-msgstr "מחיקת נתונים אישיים"
-
-#: ../midori/midori-browser.c:4537
-msgid "_Clear private data"
-msgstr "מ_חיקת נתונים אישיים"
-
-#: ../midori/midori-browser.c:4550
-msgid "Clear the following data:"
-msgstr "מחיקת הנתונים הבאים:"
-
-#: ../midori/midori-browser.c:4560
-msgid "Last open _tabs"
-msgstr "הלשוניות שנפתחו ל_אחרונה"
-
-#: ../midori/midori-browser.c:4586
-msgid "Clear private data when _quitting Midori"
-msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori"
-
-#: ../midori/midori-browser.c:4781
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "דפדפן קל משקל."
 
-#: ../midori/midori-browser.c:4782
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "יש לעיין ב־about:version לקבלת פרטים על הגרסה."
 
-#: ../midori/midori-browser.c:4784
+#: ../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 ""
+"ספרייה זו הינה תוכנה חופשית. באפשרותך להפיצה ו/או לשנותה בהתאם לתנאי רשיון "
+"GNU  אשר הוצאה לאור על ידי קרן התוכנה החופשית (Free Software Foundation); "
+"בנוסף, גירסא 2.1 של הרשיון או (על פי בחירתך) כל גירסא מאוחרת יותר."
 
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Shlomi Israel <sijproject@gmail.com>\n"
 "Mark Krapivner <mark125@gmail.com>\n"
-"Yaron Shahrabani <sh.yaron@gmail.com>"
+"Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Dor https://launchpad.net/~dor-gallego\n"
+"  Mark Krapivner https://launchpad.net/~mark125\n"
+"  Uri Damsker  אורי דמסקר https://launchpad.net/~ud1955\n"
+"  Yaron https://launchpad.net/~sh-yaron\n"
+"  moragos https://launchpad.net/~moragos\n"
+"  דוביקס https://launchpad.net/~dovix2003-gmail"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "ש_כפול הלשונית הנוכחית"
 
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
-msgstr "פת×\97 חלון חדש"
+msgstr "פת×\99×\97×\94 ×\91חלון חדש"
 
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
-msgstr "פת×\97 לשונית חדשה"
+msgstr "פת×\99×\97ת לשונית חדשה"
 
-#: ../midori/midori-browser.c:5201
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "חלון גלישה פ_רטית חדש"
 
-#: ../midori/midori-browser.c:5205
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
-msgstr "פת×\97 קובץ"
+msgstr "פת×\99×\97ת קובץ"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
-msgstr "שמירת ה_עמוד בשם…"
+msgstr "_שמירת העמוד בשם..."
 
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "שמירה לקובץ"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "הוספה _לחיוג מהיר"
 
-#: ../midori/midori-browser.c:5214
-msgid "Add Shortcut to the _desktop"
-msgstr "הוספת קיצור דרך ל_שולחן העבודה"
-
-#: ../midori/midori-browser.c:5216
-msgid "Create _Launcher"
-msgstr "יצירת מש_גר"
-
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "הרשמה ל_הזנת חדשות"
 
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_סגירת הלשונית"
 
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "סגירת הלשונית הנוכחית"
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "ס_גירת החלון"
 
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "הדפסת העמוד הנוכחי"
 
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "ס_גירת כל החלונות"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_חיפוש…"
 
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
-msgstr "×\97פש ×\9e×\99×\9c×\94 ×\90×\95 ×\91×\99×\98×\95×\99 ×\91×\93×£"
+msgstr "×\97×\99פ×\95ש ×\91×\93×£ ×©×\9c ×\9e×\99×\9c×\94 ×\90×\95 ×\91×\99×\98×\95×\99"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "חיפוש ה_בא"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "חיפוש ה_קודם"
 
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "הגדרת העדפות היישום"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_סרגלי כלים"
 
-#: ../midori/midori-browser.c:5279
-msgid "Reload page without caching"
-msgstr "רענון העמוד ללא שימוש במטמון"
-
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
-msgstr "×\94תקר×\91×\95ת"
+msgstr "תקר×\99×\91"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
-msgstr "×\94תר×\97ק×\95ת"
+msgstr "תר×\97×\99ק"
 
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_קידוד"
 
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "הצגת המ_קור"
 
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "גלישת _סמן"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "הפעלה/נטרול מסך מלא"
 
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "גלילה שמ_אלה"
 
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "גלילה למ_טה"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "גלילה למ_עלה"
 
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "גלילה ימי_נה"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_קריא"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "מעבר"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "מעבר לעמוד הקודם"
 
-#: ../midori/midori-browser.c:5325
-msgid "Go forward to the next page"
-msgstr "התקדמות לעמוד הבא"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "מעבר לתת־העמוד הקודם"
 
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5333
-msgid "Go to the next sub-page"
-msgstr "מעבר לתת־העמוד הבא"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_דף הבית"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
-msgstr "×\9c×\9a ×\90×\9c דף הבית"
+msgstr "×\9e×¢×\91ר ×\9cדף הבית"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
-msgstr "פ×\99× ×\95×\99 ×\94×\90שפ×\94"
+msgstr "ר×\99ק×\95×\9f ×¡×\9c ×\94×\9e×\99×\97×\96×\95ר"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "ביטול _סגירת לשונית"
 
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "הוספת _תיקייה חדשה"
 
-#: ../midori/midori-browser.c:5354
-msgid "_Export bookmarks"
-msgstr "יי_צוא סימניות"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_נהל מנועי חיפוש"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5360
-msgid "_Clear Private Data"
-msgstr "_נקה נתונים אישיים"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_ניתוח העמוד"
 
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "לשונית _קודמת"
 
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "לשונית _הבאה"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "העברת הלשונית ל_מיקום הראשון"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "העברת הלשונית _אחורה"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "העברת הלשונית _קדימה"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "העברת הלשונית ל_מיקום אחרון"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "מיקוד לשונית _נוכחית"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "התמקדות על התצוגה ה_באה"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "יש להציג רק את ה_סמל של הלשונית הנוכחית"
 
-#: ../midori/midori-browser.c:5386
-msgid "_Duplicate Current Tab"
-msgstr "ש_כפול הלשונית הנוכחית"
-
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "סגירת ש_אר הלשוניות"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "פתח _הפעלה קודמת"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_עזרה"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "שאלות _נפוצות"
 
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_דיווח על תקלה…"
 
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_כלים"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "סרגל _תפריט"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "סרגל _ניווט"
 
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_סרגל צד"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "חלונית צד"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_סרגל סימניות"
 
-#: ../midori/midori-browser.c:5428
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_שורת מצב"
 
-#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_אוטומטי"
 
-#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "סינית (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "סינית מסורתית (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "סינית מפושטת (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "יפנית (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "קוריאנית (EUC-KR)"
 
-#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "רוסית (KOI8-R)"
 
-#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "יוניקוד (UTF-8)"
 
-#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "מותאם…"
 
-#: ../midori/midori-browser.c:5964
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "קו _מפריד"
 
-#: ../midori/midori-browser.c:5971
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_מיקום…"
 
-#: ../midori/midori-browser.c:5973
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "פתיחת מיקום מסוים"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "חיפוש ב_רשת…"
 
-#: ../midori/midori-browser.c:5997
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
-msgstr "×\94רץ ×\97×\99פ×\95ש ×\91×\90×\99נטרנט"
+msgstr "×\91צ×\95×¢ ×\97×\99פ×\95ש ×\91×\90נטרנט"
 
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
-msgstr "פת×\97 ×\9e×\97×\93ש ×\9cש×\95× ×\99ת ×\90×\95 ×\97×\9c×\95×\9f ×©× ×¡×\92ר×\95 ×§×\95×\93×\9d ×\9c×\9b×\9f"
+msgstr "פת×\99×\97×\94 ×\9e×\97×\93ש ×©×\9c ×\9cש×\95× ×\99ת/×\97×\9c×\95×\9f ×©× ×¡×\92ר×\95"
 
-#: ../midori/midori-browser.c:6041
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "הצגת הסימניות השמורות"
 
-#: ../midori/midori-browser.c:6058
-msgid "_Tools"
-msgstr "_כלים"
-
-#: ../midori/midori-browser.c:6074
-msgid "_Window"
-msgstr "_חלון"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_לשוניות"
 
-#: ../midori/midori-browser.c:6076
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
-msgstr "הצג רשימה של כל הלשוניות הפתוחות"
+msgstr "הצגת רשימת כל החלוניות הפתוחות"
 
-#: ../midori/midori-browser.c:6090
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_תפריט"
 
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "תפריט"
 
-#: ../midori/midori-browser.c:6906
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "הגדרה לא צפויה '%s'"
-
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "לא ניתן לטעון את הגדרות ההרחבה '%s':‏ %s\n"
 
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "יצוא אישור"
 
-#: ../midori/midori-locationaction.c:412
-msgid "Search with…"
-msgstr "×\97×\99פ×\95ש ×\91×\90×\9eצע×\95תâ\80¦"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "×\94×\9e×\95ס×\93 ×©×\97ת×\9d ×¢×\9c ×\90×\99ש×\95ר ×\94×\90×\91×\98×\97×\94 ×\90×\99× ×\95 ×\9e×\95×\9bר"
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "הבחירה מההיסטוריה נכשלה\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "אישור האבטחה אינו תואם את זהות האתר ממנו הוא נקרא"
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "חיפוש אחר %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "מועד הפעלת אישור האבטחה הוא עתידי"
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "פג תוקף אישור האבטחה"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "בוטלה תקפות אישור האבטחה עפ\"י הרשימה המנוהלת ע\"י GTlsConnection"
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "האלגוריתם בו אישור האבטחה משתמש נחשב כלא-בטוח"
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_ייצא את אישור האבטחה"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "חתום ע\"י הבעלים"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "פרטי אבטחה"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "ה_דבקה ומעבר"
 
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "לא מאומת"
 
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1809
 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
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "חיבור פתוח ולא מוצפן"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
-msgstr "×\99×\99ש×\95ר ×¡×¨×\92×\9c הצד לימין"
+msgstr "×\99×\99ש×\95ר ×\9c×\95×\97 הצד לימין"
 
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "סגירת הסרגל"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
-msgstr "×\99×\99ש×\95ר ×¡×¨×\92×\9c הצד לשמאל"
+msgstr "×\99×\99ש×\95ר ×\9c×\95×\97 הצד לשמאל"
 
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "הצגת חיוג מהיר"
 
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "הצגת דף הבית"
 
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "הצג רשימת לשוניות שנפתחו קודם"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "הצגת הלשוניות ללא טעינתן"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "הצגת עמוד ריק"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "הצגת מנוע חיפוש ברירת המחדל"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "הצגת דף מותאם אישית"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "יפנית (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "לשונית חדשה"
 
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "חלון חדש"
 
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "לשונית נוכחית"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "בררת מחדל"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "סמלים"
 
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "סמלים קטנים"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:192
 msgid "Text"
-msgstr "×\98קס×\98"
+msgstr "ת×\9e×\9c×\99×\9c"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
-msgstr "ס×\9e×\9c×\99×\9d ×\95×\98קס×\98"
+msgstr "ס×\9e×\9c×\99×\9d ×\95ת×\9e×\9c×\99×\9c"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
-msgstr "×\98קס×\98 לצד סמלים"
+msgstr "ת×\9e×\9c×\99×\9c לצד סמלים"
 
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "אוטומטית (GNOME או סביבה אחרת)"
 
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "שרת מתווך ל־HTTP"
 
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "אין שרת מתווך"
 
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "כרום"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "זכור את גודל החלון האחרון"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "האם לשמור את גודל החלון האחרון"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "רוחב החלון האחרון"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "סגנון סרגל הכלים"
 
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "×\94ר×\95×\97×\91 ×\94×\90×\97ר×\95×\9f ×©×\9c ×\94×\97×\9c×\95×\9f ×\94נש×\9eר"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "ת×\9e×\99×\93 ×\9c×\94שת×\9eש ×\91×\91×\97×\99ר×\95ת ×\94×\92×\95פ×\9f ×©×\9c×\99"
 
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "×\90×\95ר×\9a ×\94×\97×\9c×\95×\9f ×\94×\90×\97ר×\95×\9f"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "×\93ר×\99סת ×\92×\95פנ×\99×\9d ×©× ×\91×\97ר×\95 ×¢×\9c ×\99×\93×\99 ×\94×\90תר×\99×\9d ×\91×\90×\9eצע×\95ת ×\94×¢×\93פ×\95ת ×\94×\9eשת×\9eש"
 
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "האורך האחרון של החלון הנשמר"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "ההגדרות אינן ניתנות לטעינה:  %s\n"
 
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "המיקום האחרון של הסרגל"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "ערך הגדרה אינו תקף '%s'"
 
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "המיקום האחרון של הסרגל שנשמר"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "כשל בהבאת דף עיצוב: %s"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "העמוד האחרון של הסרגל"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "הצגת תווית בל_שונית"
 
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "×\94×¢×\9e×\95×\93 ×\94×\90×\97ר×\95×\9f ×©×\9c ×\94סר×\92×\9c ×©× ×©×\9eר"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "×\94צ×\92ת ×¡×\9e×\9c ×\94×\9c_ש×\95× ×\99ת ×\91×\9c×\91×\93"
 
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "החיפוש האחרון"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "חיפוש האינטרנט האחרון שנשמר"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "סגור _לשונית אחרת"
+msgstr[1] "סגור ל_שוניות אחרות"
 
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "×\94צ×\92 ×¡×¨×\92×\9c ×ª×¤×¨×\99×\98"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "×\91×\98×\97 ×\91×\90תר ×\96×\94"
 
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "×\94×\90×\9d ×\9c×\94ר×\90×\95ת ×\90ת ×¡×¨×\92×\9c ×\94תפר×\99×\98×\99×\9d"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "×\90×\91×\98×\97×\94 ×\9c×\90 ×\9e×\95×\9bרת"
 
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "הצג סרגל ניווט"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "האתר %s מעוניין לשמור מסד נתונים עם HTML5."
 
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "האם להציג את סרגל הניווט"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_דחייה"
 
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "הצג סרגל סימניות"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_אישור"
 
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "האם להראות את סרגל הסימניות"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "האתר %s מעוניין לדעת מהו מיקומך."
 
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "הצג סרגל"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "האם להציג את הסרגל"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "הצג שורת מצב"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "האם להציג את שורת המצב"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:519
-msgid "Toolbar Style:"
-msgstr "סגנון סרגל כלים:"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:520
-msgid "The style of the toolbar"
-msgstr "הסגנון של סרגל הכלים"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "פריטי סרגל כלים"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "הפריטים להצגה בסרגל הכלים"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "כשלון עם:  '%s'."
 
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "סר×\92×\9c ×¦×\93 ×§×\95×\9eפק×\98×\99"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "נס×\99×\95×\9f × ×\95סף"
 
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "האם להפוך את סרגל הצד לקומפקטי"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "שלח הודעה אל %s"
 
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "×\99×\99שר ×¡×¨×\92×\9c ×¦×\93 ×\9c×\99×\9e×\99×\9f"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "×\94×\95ספת _×\9e× ×\95×¢ ×\97×\99פ×\95ש...."
 
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "×\94×\90×\9d ×\9c×\99×\99שר ×\90ת ×¡×¨×\92×\9c ×\94צ×\93 ×\9c×\99×\9e×\99×\9f"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "פת×\97 _ק×\99ש×\95ר"
 
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "פת×\99×\97ת ×¡×¨×\92×\9c×\99×\9d ×\91×\97×\9c×\95× ×\95ת × ×¤×¨×\93×\99×\9d"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "פת×\97 ×§×\99ש×\95ר ×\91\9cש×\95× ×\99ת ×\97×\93ש×\94"
 
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "×\94×\90×\9d ×ª×\9e×\99×\93 ×\9cפת×\95×\97 ×\90ת ×\94סר×\92×\9c×\99×\9d ×\91×\97×\9c×\95× ×\95ת × ×¤×¨×\93×\99×\9d"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "פת×\97 ×§×\99ש×\95ר ×\91×\9cש×\95× ×\99ת ×©_×\91×\97×\96×\99ת"
 
-#: ../midori/midori-websettings.c:580
-msgid "When Midori starts:"
-msgstr "×\9b×\90שר Midori ×\9e×\95פע×\9c:"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "פת×\97 ×§×\99ש×\95ר ×\91×\9cש×\95× ×\99ת ×©_×\91רקע"
 
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "×\9e×\94 ×\9cעש×\95ת ×\9b×\90שר Midori ×\9e×\95פע×\9c"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "פת×\97 ×§×\99ש×\95ר ×\91\97×\9c×\95×\9f ×\97×\93ש"
 
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "×\93×£ ×\94×\91×\99ת:"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "×\94עתקת ×\99×¢×\93 ×\94_ק×\99ש×\95ר"
 
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "דף הבית"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "שמירה _בשם..."
 
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "×\94צ×\92 ×\97×\9c×\95×\9f ×§×¨×\99ס×\94"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "פת×\99×\97ת  _ת×\9e×\95× ×\94 ×\91×\97×\9c×\95×\9f ×\97×\93ש"
 
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "×\94צ×\92 ×\97×\9c×\95×\9f ×\9c×\90×\97ר ×©Ö¾Midori ×§×\95רס"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "פת×\99×\97ת _ת×\9e×\95× ×\94 ×\91×\9cש×\95× ×\99ת ×\97×\93ש×\94"
 
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "ש×\9e×\95ר ×§×\91צ×\99×\9d ×©×\94×\95ר×\93×\95 ×\90×\9c:"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "×\94עתקת _ת×\9e×\95× ×\94"
 
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "ק×\91צ×\99×\9d ×©×\94×\95ר×\93×\95 ×\99ש×\9eר×\95 ×\91ת×\99ק×\99×\99ה"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "ש×\9e×\99רת _ת×\9e×\95× ה"
 
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "×¢×\95ר×\9a ×\98קס×\98"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "פת×\99×\97×\94 ×\91×\9e_צ×\99×\92 ×ª×\9e×\95× ×\95ת"
 
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "×¢×\95ר×\9a ×\98קס×\98 ×\97×\99צ×\95× ×\99"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "×\94עתק _×\9bת×\95×\91ת ×\95×\99×\93×\90×\95"
 
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "×\90×\95×\92ר ×\97×\93ש×\95ת"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "×\94×\95ר×\93 _×\95×\99×\93×\90×\95"
 
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "×\90×\95×\92ר ×\97×\93ש×\95ת ×\97×\99צ×\95× ×\99"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "פת×\97 ×\90ת ×\94×\9bת×\95×\91×\95ת ×\91\9cש×\95× ×\99ת ×\97×\93ש×\94"
 
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "חיפוש בתיבת מיקום"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "חיפוש _בעזרת"
 
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "החיפוש לביצוע בתוך תיבת המיקום"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_חיפוש ברשת"
 
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "קידוד מועדף"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "×\94ק×\99×\93×\95×\93 ×\94×\9e×\95×¢×\93×£"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "×\97_ק×\99רת ×¨×\9b×\99×\91"
 
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "תמיד הצג סרגל לשוניות"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "לפתוח או להוריד קובץ מ־%s"
 
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "תמיד הצג את סרגל הלשוניות"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "שם הקובץ: %s"
 
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "לחצני סגירה בלשוניות"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "סוג הקובץ: '%s'"
 
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "האם ללשוניות יש לחצני סגירה"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "סוג הקובץ: %s ‏('%s')"
 
-#: ../midori/midori-websettings.c:709
-msgid "Open new pages in:"
-msgstr "פתיחת דפים חדשים ב:"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "גודל: %s"
 
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "איפה לפתוח דפים חדשים"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "פתח את %s"
 
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "לחיצה אמצעית פותחת בחירה"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "בדיקת עמוד - %s"
 
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "פתח את הכתובת הנבחרת באמצעות לחצן אמצעי בעכבר"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori אינו שומר מידע פרטי:"
 
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "פת×\97 ×\9cש×\95× ×\99×\95ת ×\91רקע"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "×\94×\99ס×\98×\95ר×\99×\94 ×\90×\95 ×¢×\95×\92×\99×\95ת ×¨×©×ª ×\90×\99× ×\9f × ×©×\9eר×\95ת"
 
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "×\94×\90×\9d ×\9cפת×\95×\97 ×\9cש×\95× ×\99×\95ת ×\97×\93ש×\95ת ×\91רקע"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "×\94ת×\95ספ×\99×\9d ×\90×\99× ×\9d ×¤×¢×\99×\9c×\99×\9d"
 
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "פת×\97 ×\9cש×\95× ×\99×\95ת ×\90×\97ר×\99 ×\94× ×\95×\9b×\97×\99ת"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "×\90×\99×\97ס×\95×\9f HTML5, ×\91ס×\99ס-נת×\95× ×\99×\9d ×\9eק×\95×\9e×\99 ×\95×\9e×\98×\9e×\95×\9f ×\90פ×\9c×\99קצ×\99×\95ת ×\9e×\9b×\95×\91×\99×\9d."
 
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "×\94×\90×\9d ×\9cפת×\95×\97 ×\9cש×\95× ×\99×\95ת ×\90×\97ר×\99 ×\94×\9cש×\95× ×\99ת ×\94× ×\95×\9b×\97×\99ת ×\90×\95 ×\90×\97ר×\99 ×\94×\9cש×\95× ×\99ת ×\94×\90×\97ר×\95× ×\94"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "×\9e×\99×\93×\95ר×\99 ×\9e×\95× ×¢ ×\9eעק×\91 ×\90תר×\99×\9d ×\90×\97ר ×\94×\9eשת×\9eש:"
 
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "פתח חלונות קופצים בלשוניות"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
 
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "×\94×\90×\9d ×\9cפת×\95×\97 ×\97×\9c×\95× ×\95ת ×§×\95פצ×\99×\9d ×\91×\9cש×\95× ×\99×\95ת"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "×\99×\99×\91×\95×\90 ×\9eק×\93×\99×\9d ×©×\9c × ×ª×\95× ×\99 DNS ×\90×\99× ×\95 ×\9e×\90×\95פשר."
 
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "×\98×¢×\9f ×ª×\9e×\95× ×\95ת ×\90×\95×\98×\95×\9e×\98×\99ת"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "×\94שפ×\94 ×\95×\90×\96×\95ר ×\94×\96×\9e×\9f ×\90×\99× ×\9d ×\9e×\93×\95×\95×\97×\99×\9d ×\9c×\90תר×\99×\9d ×\91×\94×\9d ×ª×\91קר."
 
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "×\98×¢×\99× ×\94 ×\95×\94צ×\92×\94 ×\90×\95×\98×\95×\9e×\98×\99ת ×©×\9c ×ª×\9e×\95× ×\95ת"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "×\90תר×\99×\9d ×\9c×\90 ×\99ק×\91×\9c×\95 ×\9e×\99×\93×¢ ×¢×\9c ×©×\99×\9e×\95ש ×\91-Flash ×\95ת×\95ספ×\99 Netscape ×\90×\97ר×\99×\9d"
 
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "×\94פע×\9cת ×¡×§×¨×\99פ×\98×\99×\9d"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr "×\9eספר×\99 ×\92רס×\94 ×\91ס×\95×\92ר×\99×\99×\9d ×\99צ×\99×\92×\95 ×\90ת ×\94×\92רס×\94 ×©×\91ש×\99×\9e×\95ש ×\91×\96×\9e×\9f ×¨×\99צ×\94."
 
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "הפעל שפות סקריפט משובצות"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "×\94פע×\9cת ×ª×\95ספ×\99 Netscape"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr "×¢×\99ק×\95×\91 ×\91×\98×¢×\99× ×\94 ×¢×§×\91 ×§×¨×\99ס×\94 ×©×\94תר×\97ש×\94 ×\9c×\90×\97ר×\95× ×\94 ×\90×\95 ×\94×\92×\93ר×\95ת ×\98×¢×\99× ×\94."
 
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "×\94פע×\9cת ×¨×\9b×\99×\91×\99 ×ª×\95ספ×\99 Netscape ×\9eש×\95×\91צ×\99×\9d"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "×\98×¢×\99נת ×\94×¢×\9e×\95×\93"
 
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "×\94פע×\9cת ×\91×\93×\99קת ×\90×\99×\95ת"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "×\93×£ ×¨×\99ק"
 
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "הפעלת בדיקת איות תוך כדי הקלדה"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "הקודם"
 
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "הפעלת תמיכה במסד נתונים עבור HTML5"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "הבא"
 
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "×\94×\90×\9d ×\9c×\94פע×\99×\9c ×ª×\9e×\99×\9b×\94 ×\91×\9eס×\93 × ×ª×\95× ×\99×\9d ×¢×\91×\95ר HTML5"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "×\94×\93פסת ×ª×\9e×\95נת ×¨×§×¢"
 
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "×\94פע×\9cת ×ª×\9e×\99×\9b×\94 ×\91×\90×\97ס×\95×\9f ×\9eק×\95×\9e×\99 ×¢×\91×\95ר HTML5"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "×\94×\90×\9d ×\9c×\94×\93פ×\99ס ×ª×\9e×\95× ×\95ת ×¨×§×¢"
 
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "×\94×\90×\9d ×\9c×\94פע×\99×\9c ×ª×\9e×\99×\9b×\94 ×\91×\90×\97ס×\95×\9f ×\9eק×\95×\9e×\99 ×¢×\91×\95ר HTML5"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "ת×\9b×\95× ×\95ת"
 
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "הפעלת מטמון יישומי הרשת"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "‏%s מתוך %s"
 
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "האם להפעיל את מטמון יישומי הרשת"
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "שעה אחת"
+msgstr[1] "%d שעות"
 
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "הבהוב החלון בלשוניות הרקע"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "דקה אחת"
+msgstr[1] "%d דקות"
 
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "הבהוב חלון הדפדפן אם נפתחה לשונית חדשה ברקע"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "שנייה אחת"
+msgstr[1] "%d שניות"
 
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "הפעלת תמיכה ב־WebGL"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "מתן האפשרות לאתרים להשתמש במנגנון העיבוד OpenGL"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "קרב טקסט ותמונות"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "האם לקרב טקסט ותמונות"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "חפש תוך כדי הקלדה"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "האם לחפש אוטומטית בתוך הטקסט בזמן הקלדה"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "גלילה קינטית"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "האם הגלילה אמורה לזוז באופן קינטי בהתאם למהירות"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "מחיקת קובצי עוגייה לאחר:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "מספר הימים המקסימלי לשמירת עוגיות"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "קבלת קובצי עוגייה מהאתרים בהם אני מבקר בלבד"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "חסימת קובצי עוגייה שנשלחים על ידי אתרי צד שלישי"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "מחיקת דפים מההיסטוריה לאחר:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "מספר הימים המקסימלי לשמירת היסטוריה"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "שרת מתווך"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "סוג שרת המתווך לשימוש"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "שרת מתווך HTTP"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "השרת המתווך המשמש עבור חיבורי HTTP"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "פתחה"
-
-#: ../midori/midori-websettings.c:979
-#, fuzzy
-msgid "The proxy server port used for HTTP connections"
-msgstr "השרת המתווך המשמש עבור חיבורי HTTP"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
 msgstr ""
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
-msgid "Identify as"
-msgstr "הזדהה בתור"
-
-#: ../midori/midori-websettings.c:1015
-msgid "What to identify as to web pages"
-msgstr "כיצד להזדהות עבור דפי אינטרנט"
-
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "מחרוזת זיהוי"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?בתים"
 
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "מחרוזת הזיהוי של היישום"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/ש׳)"
 
-#: ../midori/midori-websettings.c:1048
-#, fuzzy
-msgid "Preferred languages"
-msgstr "קידוד מועדף"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "הקובץ שהתקבל פגום."
 
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-download.vala:221
 msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr ""
-
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "נקה נתונים אישיים"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "המידע האישי שנבחר למחיקה"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "מחיקת נתונים אישיים"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "הנתונים שנבחרו למחיקה"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr ""
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1146
-msgid "Always use my font choices"
-msgstr "תמיד להשתמש בבחירות הגופן שלי"
-
-#: ../midori/midori-websettings.c:1147
-msgid "Override fonts picked by websites with user preferences"
-msgstr "דריסת גופנים שנבחרו על ידי האתרים באמצעות העדפות המשתמש"
-
-#: ../midori/midori-view.c:1353
-#, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "האתר %s מעוניין לשמור מסד נתונים עם HTML5."
-
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
-msgid "_Deny"
-msgstr "_דחייה"
-
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
-msgid "_Allow"
-msgstr "_אישור"
-
-#: ../midori/midori-view.c:1385
-#, c-format
-msgid "%s wants to know your location."
-msgstr "האתר %s מעוניין לדעת מהו מיקומך."
-
-#: ../midori/midori-view.c:1476
-#, c-format
-msgid "Error - %s"
-msgstr "שגיאה - %s"
-
-#: ../midori/midori-view.c:1477
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "העמוד '%s' לא ניתן לטעינה."
-
-#: ../midori/midori-view.c:1479
-msgid "Try again"
-msgstr "נסה שוב"
-
-#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "Send a message to %s"
-msgstr "שלח הודעה אל %s"
-
-#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738
-msgid "Inspect _Element"
-msgstr "ח_קירת רכיב"
-
-#: ../midori/midori-view.c:2471
-msgid "Open Link in New _Tab"
-msgstr "פתח קישור ב_לשונית חדשה"
-
-#: ../midori/midori-view.c:2475
-msgid "Open Link in _Foreground Tab"
-msgstr "פתח קישור בלשונית ש_בחזית"
-
-#: ../midori/midori-view.c:2476
-msgid "Open Link in _Background Tab"
-msgstr "פתח קישור בלשונית ש_ברקע"
-
-#: ../midori/midori-view.c:2479
-msgid "Open Link in New _Window"
-msgstr "פתח קישור ב_חלון חדש"
-
-#: ../midori/midori-view.c:2482
-msgid "Open Link as Web A_pplication"
-msgstr "פתיחת קישור כיישום _רשת"
-
-#: ../midori/midori-view.c:2487
-msgid "Copy Link de_stination"
-msgstr "העתקת יעד ה_קישור"
-
-#: ../midori/midori-view.c:2503
-msgid "Open _Image in New Tab"
-msgstr "פתח את ה_תמונה בלשונית חדשה"
-
-#: ../midori/midori-view.c:2506
-msgid "Copy Image _Address"
-msgstr "העתק _כתובת תמונה"
-
-#: ../midori/midori-view.c:2509
-msgid "Save I_mage"
-msgstr "שמור ת_מונה"
-
-#: ../midori/midori-view.c:2512
-msgid "Open in Image _Viewer"
-msgstr "פתיחה במ_ציג תמונות"
-
-#: ../midori/midori-view.c:2519
-msgid "Copy Video _Address"
-msgstr "העתק _כתובת וידאו"
-
-#: ../midori/midori-view.c:2522
-msgid "Save _Video"
-msgstr "שמור _וידאו"
-
-#: ../midori/midori-view.c:2522
-msgid "Download _Video"
-msgstr "הורד _וידאו"
-
-#: ../midori/midori-view.c:2548
-msgid "Search _with"
-msgstr "חיפוש _בעזרת"
-
-#: ../midori/midori-view.c:2580
-msgid "_Search the Web"
-msgstr "_חיפוש ברשת"
-
-#: ../midori/midori-view.c:2597
-msgid "Open Address in New _Tab"
-msgstr "פתח את הכתובות ב_לשונית חדשה"
-
-#: ../midori/midori-view.c:2886
-msgid "Open or download file"
-msgstr "פתח או הורד קובץ"
-
-#: ../midori/midori-view.c:2905
-#, c-format
-msgid "File Type: '%s'"
-msgstr "סוג הקובץ: '%s'"
-
-#: ../midori/midori-view.c:2907
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "סוג הקובץ: %s ‏('%s')"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "לא ניתן לשמור את הקובץ „%s“ בתיקייה זו."
 
-#: ../midori/midori-view.c:2911
-#, c-format
-msgid "File Name: %s"
-msgstr "שם הקובץ: %s"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "אין לך הרשאות לכתוב למיקום זה."
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2930
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "פת×\97 ×\90ת %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr "×\90×\99×\9f ×\93×\99 ×\9eק×\95×\9d ×¤× ×\95×\99 ×\9b×\93×\99 ×\9c×\94×\95ר×\99×\93 ×\90ת â\80\9e%sâ\80\9c."
 
-#: ../midori/midori-view.c:3575
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "×\91×\93×\99קת ×¢×\9e×\95×\93 - %s"
+msgid "The file needs %s but only %s are left."
+msgstr "×\94ק×\95×\91×¥ ×\96ק×\95ק ×\9cÖ¾%s ×\90×\9a × ×\95תר×\95 ×¨×§ %s."
 
-#: ../midori/midori-view.c:3906
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "חיוג מהיר"
 
-#: ../midori/midori-view.c:3907 ../midori/midori-view.c:4003
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "לחץ כאן כדי להוסיף קיצור דרך"
 
-#: ../midori/midori-view.c:3908
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "הזן כתובת לקיצור"
 
-#: ../midori/midori-view.c:3909
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "הזן כותרת לקיצור"
 
-#: ../midori/midori-view.c:3910
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "אתה בטוח שברצונך למחוק את קיצור הדרך?"
 
-#: ../midori/midori-view.c:4072
-#, 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
-msgid "Version numbers in brackets show the version used at runtime."
-msgstr ""
-
-#: ../midori/midori-view.c:4252
-msgid "Page loading delayed"
-msgstr ""
-
-#: ../midori/midori-view.c:4253
-msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr ""
-
-#: ../midori/midori-view.c:4254
-msgid "Load Page"
-msgstr "טעינת העמוד"
-
-#: ../midori/midori-view.c:4420
-msgid "Blank page"
-msgstr "דף ריק"
-
-#: ../midori/midori-view.c:4682
-msgid "_Duplicate Tab"
-msgstr "ש_כפול לשונית"
-
-#: ../midori/midori-view.c:4687
-msgid "Show Tab _Label"
-msgstr "הצגת תווית בל_שונית"
-
-#: ../midori/midori-view.c:4687
-msgid "Show Tab _Icon Only"
-msgstr " הצגת סמל הל_שונית בלבד"
-
-#: ../midori/midori-view.c:4693
-msgid "Close ot_her Tabs"
-msgstr "סגירת _שאר הלשוניות"
-
-#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5506
-msgid "previous"
-msgstr "הקודם"
-
-#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5525
-msgid "next"
-msgstr "הבא"
-
-#: ../midori/midori-view.c:5538
-msgid "Print background images"
-msgstr "הדפס תמונות רקע"
-
-#: ../midori/midori-view.c:5539
-msgid "Whether background images should be printed"
-msgstr "האם להדפיס תמונות רקע"
-
-#: ../midori/midori-view.c:5571
-msgid "Features"
-msgstr "תכונות"
-
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "הפעלה"
 
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "כאשר Midori מופעל:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "דף הבית:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "שימוש בעמוד ה_נוכחי"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "שימוש בדף הנוכחי כדף הבית"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "משפחת גופנים בעלת יחס"
 
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "משפחת גופנים לשימוש כברית המחדל להצגת טקסט"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "גודל גופנים לשימוש כברית המחדל להצגת טקסט"
 
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "משפחת גופנית עם רוחב קבוע"
 
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "משפחת גופנים לשימוש בהצגת טקסט בעל רוחב קבוע"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "גודל גופנים לשימוש בהצגת טקסט בעל רוחב קבוע"
 
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "גודל גון מינימלי"
 
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "משפחת גופנים המינימלי לשימוש בהצגת טקסט"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "קידוד מועדף"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "התנהגות"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "טען תמונות אוטומטית"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "הפעלת בדיקת איות"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "הפעלת סקריפטים"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "הפעלת תמיכה ב־WebGL"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "קרב טקסט ותמונות"
+
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "מתן אפשרות לסקריפטים לפתוח דפים קופצים"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "האם מותר לסקריפטים לפתוח חלונות קופצים אוטומטית"
 
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "שפות מועדפות"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "שמור קבצים שהורדו אל:"
+
 #. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "גלישה"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "סגנון סרגל כלים:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "פתיחת דפים חדשים ב:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "לחצני סגירה בלשוניות"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "פתח לשוניות אחרי הנוכחית"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "האם לפתוח לשוניות אחרי הלשונית הנוכחית או אחרי הלשונית האחרונה"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "פתח לשוניות ברקע"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "עורך טקסט"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "אוגר חדשות"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "רשת"
 
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "ש×\9d ×\9e×\90ר×\97"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "שרת ×\9eת×\95×\95×\9a"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "פתחה"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "מטמון רשת"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "הגודל המקסימלי של מטמון הדפים בכונן"
+
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "מ״ב"
 
-#: ../midori/midori-searchaction.c:902
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "הזדהה בתור"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "פרטיות"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "מחיקת קובצי עוגייה לאחר:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "מספר הימים המקסימלי לשמירת עוגיות"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "קבלת קובצי עוגייה מהאתרים בהם אני מבקר בלבד"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "חסימת קובצי עוגייה שנשלחים על ידי אתרי צד שלישי"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"עוגיות מאחסנות פריטי גישה, משחקים שמורים או פרופילים של משתמשים למטרות פרסום."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "הפעלת מטמון יישומי הרשת"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "הפעלת תמיכה באחסון מקומי עבור HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "מחיקת דפים מההיסטוריה לאחר:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "מספר הימים המקסימלי לשמירת היסטוריה"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "הרחבות"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_נהל מנועי חיפוש"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "הוסף מנוע חיפוש"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "ערוך מנוע חיפוש"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_שם:"
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_תיאור:"
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_ס×\9e×\9c:"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_×\9bת×\95×\91ת:"
 
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_אות:"
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "ניהול מנועי החיפוש"
 
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "שימוש כ_בררת מחדל"
 
-#: ../midori/sokoke.c:412
-msgid "Open with"
-msgstr "פתיחה באמצעות"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n"
 
-#: ../midori/sokoke.c:420
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "× ×\90 ×\9c×\91×\97×\95ר ×\91×\99×\99ש×\95×\9d ×\90×\95 ×\91פק×\95×\93×\94 ×\9cפת×\99×\97ת \"%s\":"
+msgid "The search engines couldn't be saved. %s"
+msgstr "×\9e× ×\95×¢×\99 ×\94×\97×\99פ×\95ש ×\9c×\90 × ×\99תנ×\99×\9d ×\9cש×\9e×\99ר×\94. %s"
 
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
-msgid "Could not run external program."
-msgstr "לא ניתן להריץ תוכנה חיצונית."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "סימניות והיסטוריה"
 
-#: ../midori/sokoke.c:1653
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "שעה אחת"
-msgstr[1] "%d שעות"
+msgid "Search for %s"
+msgstr "חיפוש אחר %s"
 
-#: ../midori/sokoke.c:1654
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "דקה אחת"
-msgstr[1] "%s דקות"
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/sokoke.c:1655
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "שנייה אחת"
-msgstr[1] "%d שניות"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "חיפוש באמצעות…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "‏%s מתוך %s"
+msgid "Search with %s"
+msgstr "חיפוש בעזרת %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
-msgid "?B"
-msgstr ""
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "פתיחה באמצעות"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr ""
+msgid "Choose an application or command to open \"%s\":"
+msgstr "נא לבחור ביישום או בפקודה לפתיחת \"%s\":"
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
-#, c-format
-msgid " - %s remaining"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "לא ניתן להריץ תוכנה חיצונית."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
 msgstr ""
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "חיפוש _פנימי:"
 
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "הבא"
 
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "התאם רישיות"
 
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "הדגש התאמות"
-
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "סגור סרגל חיפוש"
 
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "לא ניתן להוריד את הקובץ '<b>%s</b>'."
-
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "ההעברה הושלמה"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "הקובץ שהתקבל פגום."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
 msgstr ""
 
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "ניקוי הכול"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
-msgid "Some files are being downloaded"
-msgstr "ישנם קבצים הנמצאים כרגע בהליכי הורדה"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:374
-msgid "_Quit Midori"
-msgstr "י_ציאה מ־Midori"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:376
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "הקבצים המועברים יבוטלו עם היציאה מ־Midori."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "סימניות"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:257
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "הוספת פריט הסימנייה נכשלה: %s\n"
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "ערוך את הסימנייה הנבחרת"
 
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "מחק את הסימנייה הנבחרת"
 
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "הוספת תיקייה חדשה"
 
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<b>מפריד</b>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "פתיחה ב_לשונית חדשה"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "היום"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "אתמול"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "לפני שבוע"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "נכשל בהסרת פריט היסטוריה: %s\n"
+
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "האם אתה בטוח שברצונך להסיר את כל פרטי ההיסטוריה?"
 
-#: ../panels/midori-history.c:407
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "הוסף לסימניות את פריט ההיסטוריה הנבחר"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "מחק את פריט ההיסטוריה הנבחר"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 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 "העתקת כתו_בת הקישור"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2207,187 +2020,147 @@ msgstr "סיסמה"
 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:386
+msgid "None"
+msgstr "כלום"
 
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr ""
 
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "בחירת קובץ"
 
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "בחר תיקייה"
 
-#: ../katze/katze-utils.c:604
-msgid "None"
-msgstr "כלום"
-
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "שעה אחת"
 
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "יום אחד"
 
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "שבוע אחד"
 
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "חודש אחד"
 
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "שנה אחת"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "מאפיינים עבור %s"
 
-#: ../extensions/adblock.c:467
-msgid "Configure Advertisement filters"
-msgstr "הגדרת מסנני פרסומות"
-
-#: ../extensions/adblock.c:498
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
 msgstr ""
-"יש להזין את כתובת רשימת המסננים שהוגדרה מראש וללחוץ על \"הוספה\". ניתן למצוא "
-"רשימות נוספות בכתובת %s."
-
-#: ../extensions/adblock.c:846
-msgid "Edit rule"
-msgstr "עריכת הכלל"
-
-#: ../extensions/adblock.c:860
-msgid "_Rule:"
-msgstr "_כלל:"
 
-#: ../extensions/adblock.c:914
-msgid "Bl_ock image"
-msgstr "ח_סימת תמונה"
-
-#: ../extensions/adblock.c:919
-msgid "Bl_ock link"
-msgstr "חסימת _קישור"
-
-#: ../extensions/adblock.c:1620
-msgid "Advertisement blocker"
-msgstr "חוסם פרסומות"
-
-#: ../extensions/adblock.c:1621
-msgid "Block advertisements according to a filter list"
-msgstr "חסימת פרסומות בעזרת רשימת מסננים"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+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?"
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "מסתבר כי דף זה מכיל סקריפט משתמש. האם ברצונך להתקין אותו?"
 
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "הת_קנת סקריפט משתמש"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr "מסתבר כי דף זה מכיל סגנון משתמש. האם ברצונך להתקין אותו?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "הת_קנת סגנון משתמש"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "לא להתקין"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "סקריפטים מצד המשתמש"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "עיצובי משתמש"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "האם ברצונך למחוק את '%s'?"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "מחיקת סקריפט מצד המשתמש"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "מחיקת סגנון המשתמש"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "הקובץ <b>%s</b> יימחק לצמיתות."
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "פתיחה בעורך טקסט"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "פתיחת תיקיית יעד"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "הוספת תוספת חדשה"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "הסרת התוספת הנבחרת"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "תוספי המשתמש"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "לא ניתן לנתר אחר התיקייה '%s': ‏%s"
 
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "תמיכה בסקריפטים וערכות עיצוב מצד המשתמש"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "לשוניות צבעוניות"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "צבע לשוניות בצבעים שונים"
 
@@ -2396,41 +2169,41 @@ msgstr "צבע לשוניות בצבעים שונים"
 msgid "Cookie Manager"
 msgstr "מנהל עוגיות"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "מחק הכל"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 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:116
 msgid "Expand All"
 msgstr "הרחבת הכול"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "כיווץ הכול"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "שאלה"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 msgid "At the end of the session"
 msgstr "בסיום ההפעלה"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2447,15 +2220,16 @@ msgstr ""
 "<b>מאובטח</b>: %s\n"
 "<b>תפוגה</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "כן"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "לא"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2464,73 +2238,129 @@ msgstr ""
 "<b>שם מתחם</b>: %s\n"
 "<b>עוגיות</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "שם"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_הרחבת הכול"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 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"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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
+#: ../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 "העתקת הכתובות שמופעלות בלשוניות"
 
-#: ../extensions/copy-tabs.c:96
+#: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "העתקת הכתובות של כל הלשוניות ללוח הגזירים"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "עודכן לאחרונה: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:653
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "הזנות"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "הוסף הזנה חדשה"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "מחק הזנה"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_הזנות"
 
@@ -2539,180 +2369,460 @@ msgstr "_הזנות"
 msgid "Failed to find root element in feed XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "סוג ההזנה לא נתמך."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "נכשל בפתיחת הזנת ‏XML‏: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "נמצא גרסת RSS שלא נתמכת."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "ההזנה '%s' כבר קיימת"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "שגיאה בטעינת '%s'"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "סרגל ההזנות"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "קריאת הזנות Atom/RSS"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "כשל בהוספת ערכת השדה: %s\n"
 
-#: ../extensions/formhistory/formhistory.c:95
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "היסטוריית הטופס"
 
-#: ../extensions/formhistory/formhistory.c:112
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
 msgstr ""
-"נדרש שם משתמש וסיסמה\n"
-"כדי לגשת לכתובת זו:"
 
-#: ../extensions/formhistory/formhistory.c:294
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
-msgstr "_זכור סיסמה"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "לא כעת"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "לעולם לא לעמוד זה"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 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
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:668
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "ממלא היסטוריית טפסים"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "מאחסון היסטוריה של נתונים שהוכנסו בטפסים"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
-#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "בחירת ההצעות נכשלה\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "ישנן לשוניות שלא ביקרת בהן"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "רשימת ההיסטוריה"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "התנהגות סגירת הלשוניות"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "לא לעשות דבר"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "מעבר ללשונית האחרונה בה צפית"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "מעבר ללשונית החדשה ביותר"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "הבהוב החלון בלשוניות הרקע"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "הלשונית החדשה הבאה (רשימת ההיסטוריה)"
 
-#: ../extensions/history-list.vala:424
-msgid "Next new tab from history"
-msgstr "הלשונית החדשה הבאה מההיסטוריה"
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "הלשונית החדשה הבאה מההיסטוריה"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "הלשונית החדשה הקודמת (רשימת ההיסטוריה)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "הלשונית החדשה הקודמת מההיסטוריה"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "הצגת לשונית ברקע (רשימת היסטוריה)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "הצגת הלשונית הנבחרת ברקע"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "רשימת ההיסטוריה"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"יש לעבור ללשונית האחרונה שהייתה בשימוש בעת סגירה של או מעבר בין לשוניות"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
 
-#: ../extensions/history-list.vala:433
-msgid "Previous new Tab (History List)"
-msgstr "הלשונית החדשה הקודמת (רשימת ההיסטוריה)"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
 
-#: ../extensions/history-list.vala:434
-msgid "Previous new tab from history"
-msgstr "הלשונית החדשה הקודמת מההיסטוריה"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
 
-#: ../extensions/history-list.vala:443
-msgid "Display tab in background (History List)"
-msgstr "הצגת לשונית ברקע (רשימת היסטוריה)"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
 
-#: ../extensions/history-list.vala:444
-msgid "Display the current selected tab in background"
-msgstr "הצגת הלשונית הנבחרת ברקע"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
 
-#: ../extensions/history-list.vala:569
-msgid "History List"
-msgstr "רשימת ההיסטוריה"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
 
-#: ../extensions/history-list.vala:570
-msgid "Move to the last used tab when switching or closing tabs"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
 msgstr ""
-"יש לעבור ללשונית האחרונה שהייתה בשימוש בעת סגירה של או מעבר בין לשוניות"
 
-#: ../extensions/mouse-gestures.c:301
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "מחוות עכבר"
 
-#: ../extensions/mouse-gestures.c:302
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "שליטה ב־Midori בעזרת העכבר"
 
@@ -2720,59 +2830,63 @@ msgstr "שליטה ב־Midori בעזרת העכבר"
 msgid "Reload page or stop loading"
 msgstr "רענון או עצירת טעינת העמוד"
 
-#: ../extensions/shortcuts.c:176
+#: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
 msgstr "התאמת קיצורי מקלדת"
 
-#: ../extensions/shortcuts.c:283
+#: ../extensions/shortcuts.c:275
 msgid "Customize Sh_ortcuts…"
 msgstr "התאמת קי_צורים…"
 
-#: ../extensions/shortcuts.c:320
+#: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
 msgstr "קיצורים"
 
-#: ../extensions/shortcuts.c:321
+#: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
 msgstr "הצגה ועריכה של קיצורי מקלדת"
 
-#: ../extensions/status-clock.c:174
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "שעון בשורת המצב"
 
-#: ../extensions/status-clock.c:175
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "הצגת התאריך והשעה בשורת המצב"
 
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
 msgid "Images"
 msgstr "תמונות"
 
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
 msgid "Scripts"
 msgstr "סקריפטים"
 
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
 msgstr "תוספי Netscape"
 
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "הפעלת תוספי Netscape"
+
+#: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "תכונות שורת מצב"
 
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
 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:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "סרגל לשוניות"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "סרגל ל_שוניות"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "הצג לשוניות בסרגל אנכי"
 
@@ -2784,478 +2898,562 @@ msgstr "רק את הסמלים שעל הלשוניות כבררת מחדל"
 msgid "New tabs have no label by default"
 msgstr "ללשוניות חדשות אין תווית כבררת מחדל"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "התאמת סרגל הכלים"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr "בחר פריטים להצגה בסרגל הכלים. ניתן לסדר פריטים מחדש על ידי גרירתם."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "פריטים זמינים"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 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:611
+msgid "_Customize Toolbar…"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "עורך סרגלי הכלים"
 
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "ערוך בקלות את מבנה סגרל הכלים"
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "אגירת נתוני תקשורת HTTP על הכונן"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "דפדפן קל משקל"
-
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "The specified configuration folder is invalid."
-
-#~ msgid "Cookies"
-#~ msgstr "עוגיות"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "עוגיות 'Flash'"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "מ_סדי נתונים של HTML5"
-
-#~ msgid "Offline Application Cache"
-#~ msgstr "מטמון יישומים בלתי מקוונים"
-
-#~ msgid "Not available: %s"
-#~ msgstr "לא זמין: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "קבצי משאבים לא הותקנו"
-
-#~ msgid "Reset the last _session"
-#~ msgstr "שחזר ל_הפעלה האחרונה"
-
-#~ msgid "No filename specified"
-#~ msgstr "לא צויין שם קובץ"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% נטען"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "אל תשמור אף מידע אישי בזמן הגלישה"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "הוספת קיצור דרך לחיוג מהיר"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "הוספת קיצור דרך לשולחן העבודה"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "הרשמה להזנת חדשות זו"
-
-#~ msgid "Close this window"
-#~ msgstr "סגור את החלון הזה"
-
-#~ msgid "Quit the application"
-#~ msgstr "יציאה מהיישום"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "ביטול השינוי האחרון"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "בצע שוב את השינוי האחרון"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "גזור את הטקסט המסומן"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "העתק את הטקסט המסומן"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "הדבק טקסט מלוח הגזירים"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "מחק את הטקסט המסומן"
-
-#~ msgid "Select all text"
-#~ msgstr "סמן את כל הטקסט"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "חפש את המופע הבא של המילה או הביטוי"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "חפש את המופע הקודם של המילה או הביטוי"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "אפס את רמת הזום"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "הצג את קוד המקור של הדף"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "יישר סרגל צד לשמאל"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "יישר סרגל צד לימין"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "מחיקת נתונים אישיים"
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "מחק את תכולת האשפה"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "מ_חיקת נתונים אישיים"
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "פתח את הלשונית האחרונה שנסגרה"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "מחיקת הנתונים הבאים:"
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "הוסף תיקיית סימניות חדשה"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "הלשוניות שנפתחו ל_אחרונה"
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "הוסף, ערוך והסר מנועי חיפוש…"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori"
 
-#~ msgid "Clear private data…"
-#~ msgstr "נקה נתונים אישיים…"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "פרטי גישה וססמאות ש_נשמרו"
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "עבור אל הלשונית הקודמת"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "קובצי עוגיה ונתוני אתרים"
 
-#~ msgid "Focus the current tab"
-#~ msgstr "התמקד בלשונית הנוכחית"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "אייקונים של אתרים"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "סגור את הלשונית הנוכחית"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "סגור את הלשונית הנוכחית"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "סגור את הלשונית הנוכחית"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "נכשל בניקוי ההיסטוריה: %s\n"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "פתח את הלשוניות שנפתחו בהפעלה הקודמת"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "נכשל בהסרת פריטי היסטוריה ישנים: %s\n"
 
-#~ msgid "_Contents"
-#~ msgstr "_תכנים"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "הוספת פריט הסימנייה נכשלה: %s\n"
 
-#~ msgid "Show the documentation"
-#~ msgstr "הצג את התיעוד"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "הצג את השאלות הנפוצות"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "פתח את עוקב הבאגים של Midori"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr "אין אישורי על (root) זמינים. לא ניתן לאמת את אישורי ה־SSL."
 
-#~ msgid "Show information about the program"
-#~ msgstr "הצג מידע אודות התוכנה"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "ההגדרות לא ניתנות לשמירה. %s"
 
-#~ msgid "Show menubar"
-#~ msgstr "הצג את סרגל התפריט"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "האשפה לא ניתנת לשמירה. %s"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "הצג את סרגל הניווט"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
 
-#~ msgid "Show sidepanel"
-#~ msgstr "הצג סרגל צד"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "עריכת ה_העדפות"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "הצג את סרגל הסימניות"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "נטרול כל ה_הרחבות"
 
-#~ msgid "_Transferbar"
-#~ msgstr "_סרגל העברות"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "הצג חלון לאחר ש־Midori קורס"
 
-#~ msgid "Show transferbar"
-#~ msgstr "הצג את סרגל ההעברה"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "התעלמות מלשוניות חדשות"
 
-#~ msgid "Show statusbar"
-#~ msgstr "הצג את שורת המצב"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "נכשל בהרצת הצהרת מסד הנתונים: %s\n"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#~ msgid "Show Blank page"
-#~ msgstr "הצג דף ריק"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "מופע של Midori כבר רץ אך אינו מגיב.\n"
 
-#~ msgid "All cookies"
-#~ msgstr "כל העוגיות"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "לא ניתן לטעון את הסימנייה: %s\n"
 
-#~ msgid "Session cookies"
-#~ msgstr "עוגיות הפעלה"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "הצג סרגל העברות"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "האשפה לא ניתנת לטעינה: %s\n"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "האם להציג את סרגל ההעברות"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n"
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "הצג התקדמות בתיבת המיקום"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "השגיאות הבאות התרחשו:"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "האם להציג את התקדמות הטעינה בתיבת המיקום"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "הת_עלמות"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "מנועי חיפוש בהשלמת הכתובות"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "האם להציג את מנועי החיפוש בהשלמת הכתובות"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "הצג בקרת הפעלה בסרגל"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "האם להציג את בקרת פעילות בסרגל"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "הצג חיוג מהיר בלשוניות חדשות"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "הצג חיוג מהיר בלשוניות חדשות"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "Download Manager"
-#~ msgstr "מנהל הורדות"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "An external download manager"
-#~ msgstr "מנהל הורדות חיצוני"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Open external pages in:"
-#~ msgstr "פתח דפים חיצוניים ב:"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "איפה לפתוח דפים חיצוניים"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "Accept cookies"
-#~ msgstr "קבלת עוגיות"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "איזה סוג של עוגיות לקבל"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "תוקף העוגיות המקסימלי"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "Maximum history age"
-#~ msgstr "תוקף מקסימלי להיסטוריה"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "זכור את הקבצים האחרונים שירדו"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "האם לשמור את הקבצים האחרונים שירדו"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Not found - %s"
-#~ msgstr "‏%s - לא נמצא"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_שמור את יעד הקישור"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "הורד בעזרת _מנהל הורדות"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_הורד את יעד הקישור"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "Small"
-#~ msgstr "סמלים קטנים"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "Medium"
-#~ msgstr "תפריט"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "לא ניתן להציג תיעוד"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#~ msgid "General"
-#~ msgstr "כללי"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "Appearance"
-#~ msgstr "מראה"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Font settings"
-#~ msgstr "הגדרות גופן"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "הכרח 96 נקודות לאינץ'"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "מנשק"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "Navigationbar"
-#~ msgstr "סרגל ניווט"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "Applications"
-#~ msgstr "יישומים"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "יישומים חיצוניים"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid "Web Cookies"
-#~ msgstr "עוגיות רשת"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "נקה נתונים אישיים בזמן י_ציאה מ־Midori"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "days"
-#~ msgstr "ימים"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "יישומים"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "הגדרת מסנני _פרסומות…"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "רשימת היסטוריית לשוניות"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "רשימת היסטוריית לשוניות"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "מאפשר להחליף לשוניות על ידי בחירה מרשימה הממוינת על ידי שימוש אחרון"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "מחזיק עמודים"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ msgid "_Pageholder"
-#~ msgstr "_מחזיק עמודים"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "יצירת מש_גר"
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "השאר דף אחר או יותר פתוחים במקביל ללשוניות שלך"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid "View Selection Source"
-#~ msgstr "הצג את מקור הבחירה"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "הצג את קוד המקור של הבחירה"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "העברות"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "דפים שבוקרו _לאחרונה"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "ניקוי הכול"
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "פתיחה מחדש בדפים שביקרת בהם בעבר"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "נתן את הסרגל הנבחר מהחלון"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "פתח _תיקיית יעד"
 
-#~ msgid "Show panel _titles"
-#~ msgstr "הצג כותרות סרגל"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "העתקת כתו_בת הקישור"
 
-#~ msgid "Show operating _controls"
-#~ msgstr "הצג _בקרת פעילות"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "לא ניתן להוריד את הקובץ '<b>%s</b>'."
 
-#~ msgid "Options"
-#~ msgstr "אפשרויות"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "שאל עבור תיקייה יעד"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "ההעברה הושלמה"
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "האם לשאול על תיקיית היעד בזמן הורדת קבץ"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "ישנם קבצים הנמצאים כרגע בהליכי הורדה"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "האם להציג הודעה כאשר העברה מסתיימת"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "י_ציאה מ־Midori"
 
-#~ msgid "Original cookies only"
-#~ msgstr "עוגיות מקוריות בלבד"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "הקבצים המועברים יבוטלו עם היציאה מ־Midori."
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "זכור דפים שנשמרו לאחרונה"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "האם הדפים שנשמרו אחרונים ישמרו"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "זהה שרת מתווך אוטומטית"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "האם לזהות את השרת המתווך אוטומטית מסביבת העבודה"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Open _Link"
-#~ msgstr "פתח _קישור"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Open Image in New Wi_ndow"
-#~ msgstr "פתח את התמונה בח_לון חדש"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Download I_mage"
-#~ msgstr "הורד ת_מונה"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_שחזר לשונית"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_מזער לשונית"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "כווץ תמונות אוטומטית"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "הפעל כלי מפתח"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "הפעלת הרחבות מיוחדות עבור מפתחים"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Spell Checking"
-#~ msgstr "בדיקת איות"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "רשימה המופרדת בפסיקים עבור שפות לשימוש בבדיקת איות, לדוגמה \"en_US,he_IL\""
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr "העתק את תסריטי המשתמש לתיקייה %s ואת עיצובי המשתמש לתיקייה %s."
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Console"
-#~ msgstr "מסוף"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "זמן השעון שגוי"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "הזמן השעון נמצא בעבר. לא לבדוק את הזמן והתאריך הנוכחיים."
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "מנהל _עוגיות"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "קבל מראש כתובות IP של קישורים במעבר עכבר"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Not available on this platform"
-#~ msgstr "לא זמין על פלטפורמה זו"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "צביעת לשונית בצבעים שונים"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "חיפוש מהיר"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "קופץ במהירות אל מילה או ביטוי"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "חוסם פרסומות"
 
-#~ msgid "Both"
-#~ msgstr "שניהם"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "חסימת פרסומות בעזרת רשימת מסננים"
 
-#~ msgid "Load on Startup"
-#~ msgstr "טען בהפעלה"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "הגדרת מסנני פרסומות"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "זכור קלטי הטופס האחרונים"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "ח_סימת תמונה"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "האם לשמור את קלטי הטופס האחרונים"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "חסימת _קישור"
 
-#~ msgid "Cache size"
-#~ msgstr "גדול מטמון"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "עריכת הכלל"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "הגודל המותר של המטמון"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_כלל:"
diff --git a/po/hi.po b/po/hi.po
new file mode 100644 (file)
index 0000000..e504616
--- /dev/null
+++ b/po/hi.po
@@ -0,0 +1,3425 @@
+# Hindi translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-10-25 13:03+0000\n"
+"Last-Translator: Ashesh <user501254@gmail.com>\n"
+"Language-Team: Hindi <hi@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:01+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "मिडोरी"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "वेब ब्राउज़र"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "मिडोरी वेब ब्राउज़र"
+
+#: ../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:1611
+msgid "New Tab"
+msgstr "नया टैब"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "नया विंडो"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "नया गोपनीय ब्राउज़िंग विंडोज"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "गोपनीय ब्राउज़िंग"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "मिडोरी गोपनीय ब्राउज़िंग"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Ashesh https://launchpad.net/~user501254"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 4c9d2a2831dde80463de7da1047a8455bb3d6ca7..8f04c97124592fa93c27d102e9880ef695e8579c 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
 # This file is distributed under the same license as the Midori package.
 #  Ivica Kolić<ikoli@yahoo.com>, 2010.
 # Ivica Kolić <ikoli@yahoo.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-10 22:45+0000\n"
-"PO-Revision-Date: 2013-04-17 08:13+0100\n"
-"Last-Translator: Ivica Kolić <ikoli@yahoo.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-02-13 09:08+0000\n"
+"Last-Translator: zvacet <ikoli@yahoo.com>\n"
 "Language-Team: Croatian <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-02-14 05:36+0000\n"
+"X-Generator: Launchpad (build 17341)\n"
 "Language: hr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Pretraži web"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-websettings.c:228
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web preglednik"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Midori web preglednik"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Pretraži web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Novi prozor privatnog pretraživanja"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nova kartica"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Novi prozor"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Web preglednik"
+msgid "New Private Browsing Window"
+msgstr "Novi prozor privatnog pretraživanja"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori privatno pretraživanje"
 
-#: ../data/midori-private.desktop.in.h:2
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privatno pretraživanje"
+
+#: ../data/midori-private.desktop.in.h:3
 msgid "Open a new private browsing window"
 msgstr "Novi prozor privatnog pretraživanja"
 
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4410
-msgid "Private Browsing"
-msgstr " (Privatno pretraživanje)"
-
-#: ../midori/main.c:72
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Snimak spremljen u:%s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Pokreni Adresu kao web aplikaciju"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESA"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Koristi MAPU kao konfiguracijsku mapu"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "MAPA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privatno pregledavanje, promjene nisu spremljene"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr ""
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Pokaži dijagnostički dijalog"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Pokreni naznačeno ime datoteke kao javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
-msgstr ""
+msgstr "Uzmi snimku navedenog URI"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Izvrši naznačenu naredbu"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Listaj dostupne naredbe za izvršavanje pomoću -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Prikaži verziju programa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr ""
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "UZORAK"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
+msgstr "Resetiraj Midori nakon SECOND sekundi neaktivnosti"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDE"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
-msgstr ""
+msgstr "Greška: \"gdb\" nije pronađen\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Prijavite komentare,sugestije i probleme u:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Provjeri za nove verzije na:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Nepoznata greška"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Zabilješke"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Dodaj za_bilješku"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Proširenja"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Povijest"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Korisničke skripte"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Korisnički_stilovi"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nova _kartica"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Prijenosi"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape p_riključci"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Zatvorene kartice"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Novi _prozor"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nova _mapa"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adrese]"
 
@@ -228,134 +231,146 @@ msgstr "Deformirani dokument."
 msgid "Unrecognized bookmark format."
 msgstr "Neprepoznati format zabilješke."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Idi na iduću podstranicu"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "_Web pretraživanje..."
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Učitaj ponovo trenutnu stranicu"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Prestani učitavati trenutnu stranicu"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Neuspjeh u ažuriranju naslova: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Vrijednost '%s' nije valjana za %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Neočekivana postavka  '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Neočekivana radnja '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Privatno pretraživanje)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Odaberi [tekst]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Zabilješke"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Nova mapa"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Novi Direktorij"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Uredi mapu"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Uredi Direktorij"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nova zabilješka"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Uredi zabilješku"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Uredi oznaku"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Ukucajte ima za ovu zabilješku i odaberite gdje će te je držati."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Ime za ovu zabilješku, i izaberite gdje će te je držati."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Dodaj u _brzo biranje"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Upišite ime za ovu mapu, i odaberite gdje ćete je držati."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Prikaži u alatnoj_traci"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Pokaži u kartici _zabilješki"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Pokreni kao _web aplikaciju"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Dodaj u _brzo biranje"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Spremi datoteku kao"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr ""
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Otvoren je novi prozor"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Otvorena je nova kartica"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Greška pri otvaranju slike!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Ne mogu otvoriti odabranu sliku u zadanom pregledniku."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Greška pri preuzimanju slike!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Ne mogu preuzeti odabranu sliku."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Spremi datoteku"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -364,139 +379,122 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
-msgstr ""
+msgstr "Novi feed"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Dodaj novu zabilješku"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Dijeli ovu stranicu"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Prazno"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr ""
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Otvori sve u _karticama"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Otvori u novoj _kartici"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4886 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Otvori u novom _prozoru"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Uvezi zabilješke..."
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Uvezi zabilješke"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Program:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Uvezi iz XBEL ili HTML datoteke"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Uvezi iz datoteke"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Neuspjeli uvoz zabilješki"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL zabilješke"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape zabilješke"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Neuspjeli izvoz zabilješki"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Lagani web preglednik"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Vidi about:version za informacije o verziji"
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -504,366 +502,389 @@ msgid ""
 "option) any later version."
 msgstr ""
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Ivica Kolić <ikoli@yahoo.com>"
+msgstr ""
+"Ivica Kolić <ikoli@yahoo.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  AnSukkal https://launchpad.net/~ansukkal\n"
+"  Karlo Horvat https://launchpad.net/~karlo-puselj\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  freedomrun https://launchpad.net/~freedomrun\n"
+"  gogo https://launchpad.net/~trebelnik-stefina\n"
+"  nuker https://launchpad.net/~molkusinoki\n"
+"  zvacet https://launchpad.net/~ivicakolic"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Udvostruči trenutnu karticu"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Otvori u novom prozoru"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Otvori novu karticu"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Novi p_rozor privatnog pretraživanja"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Otvori datoteku"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Spremi stranicu kao..."
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Spremi u datoteku"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Dodaj u Brzo _biranje"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr ""
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Zatvori karticu"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Zatvori trenutnu karticu"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Z_atvori prozor"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Dijeli"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Ispiši trenutnu stranicu"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Zatvori s_ve prozore"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Nađi..."
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Nađi riječ ili frazu na stranici"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Nađi _slijedeće"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Nađi _prethodno"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Konfiguriraj postavke programa"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Alatne trake"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr ""
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Povećaj zoom razinu"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Smanji zoom razinu"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodiranje"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr ""
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Isključi/isključi cijeli ekran"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Kliži _lijevo"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Kliži _dolje"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Kliži _gore"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Kližu _desno"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Čitljivo"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Natrag na prethodnu stranicu"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Idi na prethodnu podstranicu"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Slijedeće ili naprijed"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Početna stranica"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Idi na svoju početnu stranicu"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Poništi _zatvori karticu"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Dodaj novu _mapu"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Izvezi zabilješke"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Uvezi zabilješke..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Upravljaj tražilicama"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Izvezi zabilješke..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Očisti privatne podatke"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Upravljaj tražilicama..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Očisti privatne podatke..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Prethodna kartica"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Slijedeća kartica"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Pomakni karticu na _prvu poziciju"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "_Premjesti karticu unazad"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Premjesti karticu naprijed"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Pomakni karticu na _zadnju poziciju"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr ""
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Pokaži samo ikonu _trenutne kartice"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Udvostruči trenutnu karticu"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Zatvori dr_uge kartice"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Otvori posljednju _sesiju"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Česta pitanja"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Prijavite problem..."
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Alati"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Traka izbornika"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigacijska traka"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Bočni_stupac"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Bočni stupac"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Traka zabilješki"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusna traka"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatski"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Tradicionalni kineski (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Pojednostavljeni kineski (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japanski  (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ruski  (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Zapadni  (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Prilagođeno..."
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Neuspjelo pokretanje povijesti: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Razdjelnik"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Lokacija..."
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Otvori određenu lokaciju"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Web pretraživanje..."
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Pokreni web pretraživanje"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Pokaži spremljene zabilješke"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Kartice"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Pokaži listu svih otvorenih kartica"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Izbornik"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Izbornik"
 
@@ -872,73 +893,73 @@ msgstr "Izbornik"
 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:886 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "izvezi certifikat"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Vrijeme aktivacije ceftifikata je još u budućnosti"
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Algoritam certifikata se smatra nesigurnim."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Izvezi certifikat"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Sigurnosne pojedinosti"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Zalijepi i n_astavi"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Nije provjereno"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Provjerena i šifrirana veza"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr ""
 
@@ -955,418 +976,430 @@ msgstr "Zatvori panel"
 msgid "Align sidepanel to the left"
 msgstr "Poravnaj bočni stupac lijevo"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Pokaži brzo biranje"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Pokaži početnu stranicu"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Pokaži zadnje otvorene kartice"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Pokaži zadnje kartice bez učitavanja"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Pokaži praznu stranicu"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Pokaži zadanu tražilicu"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Pokaži prilagođenu stranicu"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanski  (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nova kartica"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Novi prozor"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Trenutna kartica"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Zadano"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikone"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Male ikone"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikone i tekst"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekst pored ikona"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatski (GNOME ili okruženje)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP proxy poslužitelj"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Nema proxy poslužitelja"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Stil alatne trake"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Uvijek koristi moj izbor fonta"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Konfiguracija ne može biti učitana: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Neispravna konfiguracijska vrijednost '%s'"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:984
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Pokaži oznaku _kartice"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Prikaži samo _ikone kartice"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Vjeruj ovoj web stranici"
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Sigurnost nepoznata"
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s želi spremiti HTML5 bazu podataka."
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Uskrati"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Dopusti"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s želi znati vašu lokaciju."
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Greška - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' ne može biti nađen"
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Stranica '%s' ne može biti učitana"
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Stranica '%s' se ne može učitati:"
 
-#: ../midori/midori-view.c:1500 ../midori/midori-view.c:1644
-msgid "Try again"
-msgstr "Pokušaj ponovo"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-view.c:1641
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Provjerite da su vaše mrežne postavke ispravne"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Pokušajte ponovno"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Oops - %s"
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr ""
 
-#: ../midori/midori-view.c:1789 ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Pokušaj ponovo"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Pošalji poruku  %s"
 
-#: ../midori/midori-view.c:2656
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Dodaj _tražilicu..."
 
-#: ../midori/midori-view.c:2699 ../midori/midori-view.c:3003
-msgid "Inspect _Element"
-msgstr ""
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Otvori _poveznicu"
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Otvori poveznicu u novoj _kartici"
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Otvori poveznicu u _prednjoj kartici"
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Otvori poveznicu u _pozadinskoj kartici"
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Otvori poveznicu u novom _prozoru"
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr "Otvori poveznicu kao web p_rogram"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Kopiraj odredište po_veznice"
 
-#: ../midori/midori-view.c:2773
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Spremi _kao..."
 
-#: ../midori/midori-view.c:2783
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Otvori _sliku u novom _prozoru"
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Otvori _sliku u novoj kartici"
 
-#: ../midori/midori-view.c:2788
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Kopiraj sli_ku"
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Sačuvaj s_liku"
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Otvori u pregledniku _slika"
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Kopiraj video _adresu"
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
-msgstr "Spremi _video"
-
-#: ../midori/midori-view.c:2804
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Preuzmi _video"
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otvori adresu u novoj _kartici"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Traži _pomoću"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Pretraži web"
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
-msgstr "Otvori adresu u novoj _kartici"
-
-#: ../midori/midori-view.c:2926
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Otvori _okvir u novoj kartici"
 
-#: ../midori/midori-view.c:3147
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Otvori ili preuzmi datoteku sa %s"
 
-#: ../midori/midori-view.c:3161 ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../midori/midori-view.c:3170
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tip datoteke: '%s'"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tip datoteke: %s ('%s')"
 
-#: ../midori/midori-view.c:3210
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Veličina: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3223 ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Otvori %s"
 
-#: ../midori/midori-view.c:3771
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:4335
-#, c-format
-msgid "No documentation installed"
-msgstr "Dokumentacija nije instalirana"
-
-#: ../midori/midori-view.c:4411
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori ne pohranjuje osobne podatke:"
 
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Ni povijest ni kolačići nisu spremljeni."
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Proširenja su onemogućena."
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midovi sprečava web stranice da prate korisnika:"
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Jezik i vremenska zona se ne otkrivaju web stranicama."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3906
 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:4460
+#: ../midori/midori-view.c:3949
 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:4509
-msgid "Page loading delayed"
-msgstr "Odgođeno učitavanje stranice"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Učitavanje stranice odgođeno:"
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Učitaj stranicu"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Prazna stranica"
 
-#: ../midori/midori-view.c:4890
-msgid "_Duplicate Tab"
-msgstr "_Udvostruči karticu"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Label"
-msgstr "Pokaži oznaku _kartice"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Icon Only"
-msgstr "Prikaži samo _ikone kartice"
-
-#: ../midori/midori-view.c:4902
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5596
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "prethodno"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5615
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "slijedeće"
 
-#: ../midori/midori-view.c:5629
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Ispis pozadinskih slika"
 
-#: ../midori/midori-view.c:5630
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr ""
 
-#: ../midori/midori-view.c:5660
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Obilježja"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1374,7 +1407,7 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sati"
 msgstr[2] "%d sata"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1382,7 +1415,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minute"
 msgstr[2] "%d minuta"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1391,156 +1424,152 @@ msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "- %s preostalo"
+msgstr " - %s preostalo"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Preuzeta datoteka je pogrešna."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 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:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Nemate dozvole za pisanje na ovoj lokaciji."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Datoteci je potrebno %s ali samo %s je preostalo."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Brzo biranje"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klik za dodavanje prečaca"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Unesi adresu prečaca"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Unesi naslov prečaca"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "jeste li sigurni da želite izbrisati ovaj prečac?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Pokretanje"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Kad se Midori pokrene:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Početna stranica:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Koristi _trenutnu stranicu"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Koristi trenutnu stranicu kao početnu stranicu"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Zadana obitelj fonta"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Zadana obitelj fonta koje se koristi za prikaz teksta"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Zadana veličina fonta za prikaz teksta"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Najmanja veličina fonta"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Najmanja veličina fonta korištena za prikaz teksta"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Željeno kodiranje"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Ponašanje"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Učitaj slike automatski"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Omogući provjeru pravopisa"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Omogući skripte"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
-msgstr "Omogući WebGL podršku "
-
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Omogući Netscape priključke"
+msgstr "Omogući WebGL podršku"
 
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
@@ -1554,126 +1583,134 @@ msgstr ""
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Željeni jezici"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Spremi preuzimanja u"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Pretraživanje"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Stil alatne trake:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Otvori nove stranice u:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Ponašanje nove kartice:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Zatvori dugmad na karticama"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Uvijek pokaži Traku kartica"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Otvori kartice do trenutne"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "Otvoriti nove kartice do trenutne kartice ili nakon posljednje"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Otvori kartice u pozadini"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Uređivač teksta"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr ""
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Mreža"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxy poslužitelj"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Ime računala"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URL"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Podržani proxy tipovi:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
-msgstr ""
+msgstr "Internetska predmemorija"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr ""
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Predstavi se kao"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Obriši stare kolačiće nakon:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Maksimalni broj dana za spremanje kolačića"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Prihvati kolačiće samo sa stranica koje ste posjetili"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blokiraj kolačiće koje su poslale web stranice treće strane"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1681,123 +1718,122 @@ msgstr ""
 "Kolačići pohranjuju podatke o prijavi, spremljenim igrama, ili profile "
 "korisnika za promičbene svrhe."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr ""
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Omogući podršku za HTML5 lokalnu pohranu"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr ""
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Obriši stranice iz povijesti nakon:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Maksimalni broj dana za spremanje povijesti"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Upravljaj tražilicama"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Dodaj tražilicu"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Uredi tražilicu"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
-msgstr ""
+msgstr "_Token:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Upravljaj tražilicama"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Koristi kao _zadano"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Tražilice ne nogu biti učitane: %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Tražilice ne mogu biti spremljene. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Povijest"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Zabilješke i povijest"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Neuspjelo pokretanje povijesti: %s"
+msgid "Search for %s"
+msgstr "Traži %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Neuspjeli odabir iz povijesti: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Traži %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Traži pomoću..."
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Traži pomoću %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Otvori pomoću"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Izaberite program ili naredbu za otvaranje \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Ne mogu pokrenuti vanjski program"
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Neispravan URI"
 
@@ -1822,46 +1858,105 @@ msgstr ""
 msgid "Close Findbar"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Neuspjeh u dodavanju stavki zabilješki: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d zabilješka"
+msgstr[1] "%d zabilješke"
+msgstr[2] "%d zabilješki"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d pšodmapa"
+msgstr[1] "%d podmape"
+msgstr[2] "%d podmapa"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Prazna mapa"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Mapa sadrži %s i njednu zabilješku"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Mapa sadrži %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Mapa sadrži %s i %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Neuspjeh u dopuni zabilješki : %s\n"
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s i %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Uredi odabrane zabilješke"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Izbriši odabrane zabilješke"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Dodaj novu mapu"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Razdjelnik</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otvori u novoj _kartici"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Pretraži zabilješke"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Povijest"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Danas"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Jučer"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1869,33 +1964,33 @@ msgstr[0] "% d dan prije"
 msgstr[1] "% d dana prije"
 msgstr[2] "% d dana prije"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Prije tjedan dana"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Zabilježi odabranu stavku povijesti"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Izbriši odabranu stavku povijesti"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Obriši cijelu povijest"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Pretraži povijest"
 
@@ -1923,111 +2018,63 @@ msgstr "Lozinka"
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Imenovana ikona '%s ne može biti učitana"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Nijedan"
 
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr ""
-
-#: ../katze/katze-utils.c:385
-msgid "None"
-msgstr "Nijedan"
-
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Svojstvo '%s' nije valjano za %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Izaberi datoteku"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Izaberi mapu"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 sat"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dan"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 tjedan"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mjesec"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 godina"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Osobitosti za %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr ""
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr ""
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Konfiguriraj filtere oglašavanja"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Uredi pravilo"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Pravilo:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_okiraj sliku"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_okiraj poveznicu"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr ""
-
-#: ../extensions/adblock.c:1926
-msgid "Block advertisements according to a filter list"
-msgstr "Blokiraj oglašavanj sukladno sa listom filtera"
-
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Izgleda da ova stranica sadrži korisničku skriptu.Želite li je instalirati?"
 
@@ -2049,16 +2096,16 @@ msgstr "_Instaliraj korisnički stil"
 msgid "Don't install"
 msgstr "Nemoj instalirati"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Korisničke skripte"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Korisnički stilovi"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Greška"
 
@@ -2080,40 +2127,40 @@ msgstr "Izbriši korisnički stil"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Datoteka <b>%s</b>će biti trajno uklonjena"
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Otvori u uređivaču teksta"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Otvori odredišni direktorij"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Dodaj novu dodatak"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Ukloni odabrani dodatak"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Korisnički dodaci"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr ""
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Podrška za korisničke skripte i stilove"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Obojane kartice"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr ""
 
@@ -2122,11 +2169,11 @@ msgstr ""
 msgid "Cookie Manager"
 msgstr "Upravitelj kolačićima"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Izbriši sve"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2134,31 +2181,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:116
 msgid "Expand All"
 msgstr "Proširi sve"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Skupi sve"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Želite li izbrisati sve kolačiće?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pitanje"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Na kraju sesije"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2176,15 +2223,15 @@ msgstr ""
 "<b>Ističe</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Da"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ne"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2193,20 +2240,20 @@ msgstr ""
 "<b>Domena</b>: %s\n"
 "<b>Kolačići</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Ime"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Proširi sve"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Skupi sve"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Traži kolačiće po imenu ili domeni"
 
@@ -2226,26 +2273,39 @@ msgstr "Kopiraj adresu kartica"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr ""
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Odgođeno učitavanje"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Odgoda u sekundama do učitavanja stranice:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
-msgstr "Odgodi učitavanje stranice dok stvarno ne počenete koristiti karticu."
+msgstr ""
+"Odgodi učitavanje stranice dok stvarno ne počenete koristiti karticu."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dvostruki klik za više informacija"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
 
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Došlo je do greške pri pokušaju preuzimanja datoteke pomoću slijedećeg "
-"priključka:\n"
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2285,25 +2345,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Zadnje ažuriranje: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr ""
 
@@ -2315,55 +2375,55 @@ msgstr ""
 #: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
-msgstr ""
+msgstr "Nepodržani format kanala."
 
 #: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
-msgstr ""
+msgstr "Pronađena je nepodržana RSS verzija."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
-msgstr ""
+msgstr "Kanal '%s' već postoji."
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
-msgstr ""
+msgstr "Greška pri učitavanju kanala '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
-msgstr ""
+msgstr "Ploča kanala"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr ""
 
 #: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
-msgstr ""
+msgstr "Neuspjelo dodavanje vrijednosti forme: : %s\n"
 
 #: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
-msgstr ""
+msgstr "Formiraj povijest"
 
 #: ../extensions/formhistory/formhistory.c:117
 msgid ""
@@ -2373,121 +2433,395 @@ msgstr ""
 "Korisničko ime i lozinka su potrebni\n"
 "za otvaranje ove lokacije"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Zapamtiti lozinku na ovoj stranici?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nikada za ovu stranicu"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Neuspjelo otvaranje baze podataka: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr ""
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Neuspjeli odabir prijedloga\n"
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Nema neposjećenih kartica"
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Lista povijesti"
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Ponašanje zatvaranja kartica"
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ne čini ništa"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Prebaci na zadnju gledanu karticu"
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Prebaci na najnoviju stranicu"
 
-#: ../extensions/history-list.vala:316
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr ""
 
-#: ../extensions/history-list.vala:448
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Slijedeća nova kartica (lista povijesti)"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Slijedeća nova kartica iz povijesti"
 
-#: ../extensions/history-list.vala:458
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Prethodna nova kartica (lista povijesti)"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Prethodna nova kartica iz povijesti"
 
-#: ../extensions/history-list.vala:468
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
-msgstr ""
+msgstr "Prikaži karticu u pozadini (lista povijesti)"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Prikaži trenutno odabranu karticu u pozadini"
 
-#: ../extensions/history-list.vala:596
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Lista povijesti"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Prihvati"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Prihvati za sesiju"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokiraj"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Želite li stvarno obrisati sve JavaScript dozvole?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Obriši sve JavaScript dozvole?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domena"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Pravila"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Izbriši _sve"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Zabrani %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Dozvoli %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "prozor preglednika"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Prikaz"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Neodređen"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Dopušteno"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Odbijeno"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Razlog"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Ne mogu napraviti konfiguracijsku mapu za proširenje: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Ne mogu napraviti konfiguracijsku mapu za proširenje."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Ne mogu otvoriti bazu podataka proširenja."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Putanja baze podataka"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Dozvoli sve stranice"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Samo druga razina"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Kretnje mišem"
@@ -2516,11 +2850,11 @@ msgstr "Kratice"
 msgid "View and edit keyboard shortcuts"
 msgstr "Pogledaj i uredi kratice tipkovnice"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Sat statusne trake"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Prikaži datum i vrijeme u statusnoj traci"
 
@@ -2536,6 +2870,10 @@ msgstr "Skripte"
 msgid "Netscape plugins"
 msgstr "Netscape priključci"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Omogući Netscape priključke"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Obilježja statusne trake"
@@ -2544,15 +2882,15 @@ msgstr "Obilježja statusne trake"
 msgid "Easily toggle features on web pages on and off"
 msgstr ""
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Kartica ploče"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "K_artica ploče"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Pokaži kartice u okomitoj ploči"
 
@@ -2562,79 +2900,70 @@ msgstr "Kao zadano samo ikone na karticama"
 
 #: ../extensions/tabs-minimized.c:77
 msgid "New tabs have no label by default"
-msgstr ""
+msgstr "Nove kartive nemaju oznaku po zadonom"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Prilagodi alatnu traku"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Dostupne stavke"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Prikazane stavke"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Prilagodi alatnu traku"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Uređivač alatne trake"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Jednostavno uređivanje izgleda alatnih traka"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr ""
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr ""
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Očisti privatne podatke"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Očisti privatne podatke"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Očisti slijedeće podatke:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Zadnje otvorene _kartice"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Očisti privatne podatke kad _isključuješ Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Spremljene prijave i _lozinke"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Kolačići i podaci web stranice"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Website ikone"
 
@@ -2642,187 +2971,129 @@ msgstr "Website ikone"
 msgid "Open tabs"
 msgstr "Otvori kartice"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
-msgstr ""
+msgstr "Još otvorenih kartica..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Neuspjelo uklanjanje povijesti: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "neuspjeli uvoz iz stare baze podataka"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Ne mogu napraviti tablicu zabilješki: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Neuspjeh u dodavanju stavki zabilješki: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Ne mogu uvesti iz stare baze podataka: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Neuspjelo ažuriranje zabilješki: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Zabilješke ne mogu biti spremljene. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Neuspjelo uklanjanje stavke zabilješke:%s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
-msgstr ""
+msgstr "Glavni cerfikat je nedostupan. SSl cerfikati se ne mogu provjeriti."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Konfiguracija ne može biti spremljena. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sesija ne može biti učitana: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sesija ne može biti spremljena. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Smeće ne može biti spremljeno. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 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/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Izmjeni _osobitosti"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Onemogući sva _proširenja"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Pokaži dijalog nakon što se Midori sruši"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Odbaci stare kartice"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Pokaži zadnji dijalog _rušenja"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr ""
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Zabilješke ne mogu biti učitane: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sesija ne može biti učitana: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Smeće ne može biti učitano: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Povijest ne može biti učitana: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Došlo je do slijedeće greške:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignoriraj"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Prihvati "
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Prihvati za sesiju"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Ne mogu otvoriti bazu podataka proširenja: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Želite li zaista izbrisati sve dozvole kolačića?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Obriši sve dozvole kolačića?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2830,20 +3101,20 @@ msgstr ""
 "Ova će radnja izbrisati sve dozvole kolačića.Ponovno ćete biti upitani za "
 "dozvole za svaku posjećenu stranicu."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Upravitelj dozvolama kolačića"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr ""
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Konfiguriraj dozvolu kolačića"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2852,22 +3123,12 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domena"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Izbriši _sve"
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
@@ -2880,146 +3141,134 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Razlog"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Ne mogu napraviti konfiguracijsku mapu za proširenje: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Ne mogu napraviti konfiguracijsku mapu za proširenje."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Ne mogu otvoriti bazu podataka proširenja."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Web stranica %s želi pohraniti %d kolačiće."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Web stranica %s želi pohraniti kolačić."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "P_rihvati"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Prihvati za ovu _sesiju"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Od_bij"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Putanja"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr ""
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Upravitelj sigurnosti kolačića"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr ""
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Putanja baze podataka"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Pokretač je napravljrn"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr ""
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Greška pri stvaranju pokretača"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "_Programi"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr ""
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Novi _profil"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Upravitelj sigurnosti kolačića"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Stvara novi, nezavisni profil i pokretač"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Novi _program"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
 msgstr ""
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "_Programi"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Greška pri pokretanju"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Napravi _pokretač"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Upravitelj web programima"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr ""
 
@@ -3027,610 +3276,190 @@ msgstr ""
 msgid "Transfers"
 msgstr "Prijenosi"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Očisti sve"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Otvori odredišni _direktorij"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Kopiraj lokaciju po_veznice"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Datoteka '<b>%s</b>' je preuzeta."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' i %d ostale datoteke su preuzete."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Prijenos završen"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Neke datoteke su preuzete"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Isključi Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Prijenosi će biti odgođeni ako se Midori isključi"
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Upravitelj prijenosa"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Pogledaj preuzete datoteke"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Srednji klik otvara odabir"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Učitaj adresu iz odabira pomoću srednjeg klika"
-
-#~ msgid "Custom..."
-#~ msgstr "Prilagođeno..."
-
-#~ msgid "Writing failed."
-#~ msgstr "Neuspjelo pisanje."
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Kako se predstaviti na web stranicama"
-
-#~ msgid "_Window"
-#~ msgstr "_Prozor"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Dodaj prečac na _radnu površinu"
-
-#~ msgid "FILENAME"
-#~ msgstr "DATOTEKA"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Zapamti zadnu veličinu prozora"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Da li spremiti zadnju veličinu prozora"
-
-#~ msgid "Last window width"
-#~ msgstr "Zadnja širina prozora"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Zadnja sačuvana širina prozora"
-
-#~ msgid "Last window height"
-#~ msgstr "zadnja visina prozora"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Zadnja sačuvana visina prozora"
-
-#~ msgid "Last panel position"
-#~ msgstr "Zadnja pozicija ploče"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Zadnja spremljena pozicija ploče"
-
-#~ msgid "Last panel page"
-#~ msgstr "Zadnja stranica ploče"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Zadnja spremljena stranica ploče"
-
-#~ msgid "Last Web search"
-#~ msgstr "Zadnje Web pretraživanje"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Zadnje sačuvano Web pretraživanje"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Pokaži traku izbornika"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Da li pokazati izbornik"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Pokaži navigacijsku traku"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Da li pokazati navigacijsku traku"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Pokaži traku zabilješki"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Da li pokazati traku zabilješki"
-
-#~ msgid "Show Panel"
-#~ msgstr "Pokaži ploču"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Da li pokazati ploču"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Pokaži statusnu traku"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Da li pokazati statusnu traku"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Stavke alatne trake"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Stavke za prikazivanje u alatnoj traci"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Zbijeni bočni stupac"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Da li bočni stupac učiniti zbijenim"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Poravnaj bočni stupac desno"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Da li poravnati bočni stupac lijevo"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Otvori ploče u zasebnim prozorima"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Da li uvijek otvarati ploče u odvojenim prozorima"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Što učiniti kad se Midori pokrene"
-
-#~ msgid "The homepage"
-#~ msgstr "početna stranica"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Mapa preuzetih datoteka je spremljena u"
-
-#~ msgid "An external text editor"
-#~ msgstr "Vanjski uređivač teksta"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Željeno kodiranje znakova"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Uvijek pokaži traku kartica"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Gdje otvoriti nove stranice"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Da li otvoriti nove kartice u pozadini"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Učitaj i prikaži slike automatski"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Omogući provjeru pravopisa dok pišem"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Omogući podršku za HTML5 bazu podataka"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Da li omogućiti podršku za HTML bazu podataka"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Da li omogućiti podršku za HTML5 lokalnu pohranu"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Da li zumirati tekst i slike"
-
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Tip proxy poslužitelja za uporabu"
-
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP Proxy poslužitelj"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Proxy poslužitelj korišten za HTTP spajanja"
-
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "Proxy poslužitelj korišten za HTTP spajanja"
-
-#~ msgid "Clear private data"
-#~ msgstr "Očisti privatne podatke"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Privatni podaci odabrani za brisanje"
-
-#~ msgid "Clear data"
-#~ msgstr "Očisti podatke"
-
-#~ msgid "The data selected for deletion"
-#~ msgstr "Podaci odabrani za brisanje"
-
-#~ 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 "Lightweight web browser"
-#~ msgstr "Lagani web preglednik"
-
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Određena konfiguracijaka mapa nije valjana"
-
-#~ msgid "Cookies"
-#~ msgstr "Kolačići"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'Flash' kolačići"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "Omogući _podršku za HTML5 bazu podataka"
-
-#~ msgid "Not available: %s"
-#~ msgstr "Nije dostupno: %s"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Ne spremaj privatne podatke dok pregledavaš"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Dodaj prečac u brzo biranje"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Dodaj prečac na radnu površinu"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Napravi pokretač"
-
-#~ msgid "Close this window"
-#~ msgstr "Zatvori ovaj prozor"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Zatvori sve otvorene prozore"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Poništi zadnju izmjenu"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Vrati zadnju izmjenu"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Izreži označeni tekst"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Kopiraj označeni tekst"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Izbriši odabrani tekst"
-
-#~ msgid "Select all text"
-#~ msgstr "Označi sav tekst"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Nađi slijedeće pojavljivanje riječi ili fraze"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Nađi prethodno pojavljivanje riječi ili fraze"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Vrati zoom razinu"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Prikaži izvorni kod stranice"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Kliži ulijevo"
-
-#~ msgid "Scroll down"
-#~ msgstr "Kliži dolje"
-
-#~ msgid "Scroll up"
-#~ msgstr "Kliži gore"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Kliži nadesno"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Izbriši sadržaj smeća"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Otvori zadnju zatvorenu karticu"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Dodaj novu mapu zabilješki"
-
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Dodaj,uredi i ukloni tražilice..."
-
-#~ msgid "Clear private data..."
-#~ msgstr "Očisti privatne podatke..."
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Prebaci na prethodnu stranicu"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Prebaci na slijedeću stranicu"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Premjesti karticu iza prethodne kartice"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Premjesti karticu ispred sljedeće kartice"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Pokaži samo ikonu u trenutnoj karticu"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Udvostruči trenutnu karticu"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Zatvori sve kartice osim trenutne"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Otvori kartice spremljene u posljednjoj sesiji"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Pokaži često postavljana pitanja"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Prikaži informacije o programu"
-
-#~ msgid "Show menubar"
-#~ msgstr "Pokaži traku izbornika"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Pokaži navigacijsku traku"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Pokaži bočni stupac"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Pokaži traku zabilješki"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Pokaži statusnu traku"
-
-#~ msgid "No filename specified"
-#~ msgstr "Nije navedeno ime datoteke"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Postavi broj stupaca i redova"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Unesi broj stupaca i redova"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Neispravni unos za veličinu brzog biranja"
-
-#~ msgid "Small"
-#~ msgstr "Male"
-
-#~ msgid "Medium"
-#~ msgstr "Srednje"
-
-#~ msgid "Big"
-#~ msgstr "Velike"
-
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Konfiguriraj _filtere oglašavanja..."
-
-#~ msgid "Not found - %s"
-#~ msgstr "NIje pronađeno -  %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokument ne može biti prikazan"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Prebacivanje kartica pomoću Ctrl+Tab poredanih po zadnjoj upotrebi"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Obriši stare kolačiće nakon jednog sata"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Obriši stare kolačiće nakon jednog tjedna"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Obriši stare kolačiće nakon jedne godine"
-
-#~ msgid "All cookies"
-#~ msgstr "Svi kolačići"
-
-#~ msgid "Session cookies"
-#~ msgstr "Kolačići sesije"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Pokaži traku prijenosa"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Da li pokazati traku prijenosa"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Pokaži brzo biranje u novim karticama"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Pokaži brzo biranje u novootvorenim karticama"
-
-#~ msgid "Download Manager"
-#~ msgstr "Upravitelj preuzimanja"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Otvori vanjske stranice u:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Gdje otvoriti izvanjski otvorene stranice"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Koju vrstu kolačića prihvatiti"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Zapamti zadnje preuzete datoteke"
-
-#~ msgid "Appearance"
-#~ msgstr "Izgled"
-
-#~ msgid "Quit the application"
-#~ msgstr "Isključi program"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Preuzimanje pomoću upravitelja _preuzimanjima"
-
-#~ msgid "General"
-#~ msgstr "Osnovno"
-
-#~ msgid "Font settings"
-#~ msgstr "Postavke fonta"
-
-#~ msgid "Interface"
-#~ msgstr "Sučelje"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Navigacijska traka"
-
-#~ msgid "External applications"
-#~ msgstr "Vanjski programi"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Web kolačići"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Očisti kolačiće kad _isključuješ Midori"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s od %s, %s/s"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Otvori ciljanu mapu za odabrani dodatak"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Slijedeća kartica (lista povijesti)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Prethodna kartica (lista povijesti)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Prethodna kartica iz povijesti"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr ""
-#~ "Držite jednu ili više stranica otvorenima paralelno sa vašim karticama"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% učitano"
-
-#~ msgid "_Contents"
-#~ msgstr "_Sadržaji"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Show the documentation"
-#~ msgstr "Pokaži dokumentaciju"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Show transferbar"
-#~ msgstr "Pokaži traku prijenosa"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Pitaj za odredišni direktorij"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Da li pitati za odredišni direktorij kada preuzimam datoteku"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Da li pokazati obavijest kada je prijenos dovršen"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Spremi odredište poveznice"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Preuzmi odredište poveznice"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Download I_mage"
-#~ msgstr "Preuzmi S_liku"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Nespjelo uklanjanje traženja povijesti: %s\n"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimiziraj _trenutnu karticu"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimiziraj trenutnu karticu"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Bilješke"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Provjera pravopisa"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nova bilješka"
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Pravopisni rječnici"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Zarezom odijeljena lista jezika koja će se koristiti za provjeru "
-#~ "pravopisa,npr. \"en_GB,de_DE\""
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova bilješka"
 
-#~ msgid "Copy _All"
-#~ msgstr "Kopiraj _sve"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Copy All"
-#~ msgstr "Kopiraj sve"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Preimenuj bilješku"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Upravitelj kolačićima"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "External Applications"
-#~ msgstr "Vanjski programi"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Ukloni bilješku"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Nedavno posjećene stranice"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Ponovo otvori stranice koje ste posjetili ranije"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Original cookies only"
-#~ msgstr "Samo izvorne kolačiće"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Zapamti zadnju posjećenu stranicu"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokiraj oglašavanj sukladno sa listom filtera"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Obnovi karticu"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfiguriraj filtere oglašavanja"
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Vrijeme sata je u prošlosti.Provjerite trenutni dan i vrijeme."
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okiraj sliku"
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Kopiraj  %s u mapu %s."
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okiraj poveznicu"
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Postavi broj prečaca"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Uredi pravilo"
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Unesi broj prečaca"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Pravilo:"
index e0927c94b7895b4139de9ddd0f138b13ef851aed..f4c93a9d0e039805afefd3b5a19721330e1d2bc0 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
 # Hungarian translation of midori
 # Copyright 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the midori package.
-# 
+#
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2010, 2012.
 # Imre Benedek <nucleo at indamail dot hu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: midori master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 00:57+0000\n"
-"PO-Revision-Date: 2012-11-20 00:59+0100\n"
-"Last-Translator: Imre Benedek <nucleo at indamail dot hu>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:40+0000\n"
+"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
 "Language-Team: Magyar <gnome-hu-list at gnome dot org>\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-Launchpad-Export-Date: 2014-11-27 05:46+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "A világháló böngészése"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:222
-#: ../midori/midori-view.c:3849 ../midori/sokoke.c:561
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Webböngésző"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Midori webböngésző"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "A világháló böngészése"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Új privát böngészési ablak megnyitása"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1287
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Új lap"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1284
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Új ablak"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Webböngésző"
+msgid "New Private Browsing Window"
+msgstr "Új privát böngészési ablak"
 
 #: ../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:4169
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privát böngészés"
 
-#: ../midori/main.c:63
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Új privát böngészési ablak megnyitása"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Pillanatkép mentve ide: %s\n"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "A CÍM futtatása webalkalmazásként"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "CÍM"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "A MAPPA használata konfigurációs mappaként"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "MAPPA"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privát böngészés, nem lesznek mentve változtatások"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 "Hordozható mód, a futtatáshoz szükséges minden fájl egy helyen tárolódik"
 
-#: ../midori/main.c:100
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Egyszerű GTK+ ablak WebKit-tel, a GtkLauncher-hez hasonló"
 
-#: ../midori/main.c:102
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Diagnosztikai ablak megjelenítése"
 
-#: ../midori/main.c:104
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
+"Futtatás a gdb-ben és a visszakövetési információk mentése összeomláskor"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "A megadott fájl futtatása javascriptként"
 
-#: ../midori/main.c:108
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Pillanatkép készítése a megadott URI-ről"
 
-#: ../midori/main.c:110
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "A megadott parancs futtatása"
 
-#: ../midori/main.c:112
+#: ../midori/main.c:101
 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:114
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "A program verziójának megjelenítése"
 
-#: ../midori/main.c:116
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Címek"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 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:118
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "MINTA"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 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:122
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "MÁSODPERC"
 
-#: ../midori/main.c:155
-#, c-format
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Hiba: \"gdb\" nem található\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Új verziókért lásd:"
 
-#: ../midori/main.c:339
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Ismeretlen hiba történt"
 
-#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:540
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Váratlan művelet: „%s”."
-
-#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6041
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Könyvjelzők"
 
-#: ../midori/midori-app.c:1351
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Köny_vjelző hozzáadása"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "Kit_erjesztések"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Előzmények"
 
-#: ../midori/midori-app.c:1354
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Felhasználói parancsfájlok"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Felhasználói _stílusok"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Új _lap"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "Á_tvitelek"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "_Netscape bővítmények"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Bezárt lapok"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5180
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Új _ablak"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Új _mappa"
 
-#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419
-#: ../midori/midori-app.c:1422
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Címek]"
 
-#: ../midori/midori-array.c:524
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "A fájl nem található."
 
-#: ../midori/midori-array.c:549 ../midori/midori-array.c:588
-#: ../midori/midori-array.c:612 ../midori/midori-array.c:622
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Rosszul formált dokumentum."
 
-#: ../midori/midori-array.c:631
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Ismeretlen könyvjelzőformátum."
 
-#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Ugrás a következő oldalra"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5324
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ugrás a következő aloldalra"
 
-#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5265
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Keresés a weben…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Az aktuális oldal újratöltése"
 
-#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Az aktuális oldal betöltésének leállítása"
 
-#: ../midori/midori-browser.c:525
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "A cím frissítése meghiúsult: %s\n"
 
-#: ../midori/midori-browser.c:616
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "A(z) „%s” érték érvénytelen ehhez: %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Váratlan beállítás: „%s”"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Váratlan művelet: „%s”."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (privát böngészés)"
 
-#: ../midori/midori-browser.c:726 ../midori/midori-browser.c:768
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Könyvjelzők"
 
-#: ../midori/midori-browser.c:822
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Új mappa"
 
-#: ../midori/midori-browser.c:822
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Mappa szerkesztése"
 
-#: ../midori/midori-browser.c:824
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Új könyvjelző"
 
-#: ../midori/midori-browser.c:824
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Könyvjelző szerkesztése"
 
-#: ../midori/midori-browser.c:858
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Adjon nevet a könyvjelzőnek, és válassza ki hol tárolódjon."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+"Adjon nevet a könyvjelzőnek, és válassza ki, hogy hol szeretné tárolni."
 
-#: ../midori/midori-browser.c:914
-msgid "Add to _Speed Dial"
-msgstr "Felvétel a _gyorstárcsázásba"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Adjon nevet a mappának, és válassza ki, hogy hol szeretné tárolni."
 
-#: ../midori/midori-browser.c:920
-msgid "Show in the tool_bar"
-msgstr "M_egjelenítés az eszköztáron"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Megjelenítés a _könyvjelzősávon"
 
-#: ../midori/midori-browser.c:928
-msgid "Run as _web application"
-msgstr "_Futtatás webalkalmazásként"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Felvétel a _gyorstárcsázásba"
 
-#: ../midori/midori-browser.c:1044 ../midori/midori-browser.c:4423
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Fájl mentése másként"
 
-#: ../midori/midori-browser.c:1054
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Társított e_rőforrások mentése"
 
-#: ../midori/midori-browser.c:1284
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Új ablak nyílt meg"
 
-#: ../midori/midori-browser.c:1287
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Új lap nyílt meg"
 
-#: ../midori/midori-browser.c:1305
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Hiba a kép megnyitásakor"
 
-#: ../midori/midori-browser.c:1306
+#: ../midori/midori-browser.c:1630
 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."
+msgstr ""
+"Nem nyitható meg a kiválasztott kép az alapértelmezett megjelenítőben."
 
-#: ../midori/midori-browser.c:1312
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Hiba a kép letöltésekor"
 
-#: ../midori/midori-browser.c:1313
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "A kijelölt kép nem tölthető le."
 
-#: ../midori/midori-browser.c:1372
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Fájl mentése"
 
-#: ../midori/midori-browser.c:2344
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Oldal újratöltése gyorsítótárazás nélkül"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: ../midori/midori-browser.c:2472
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -358,24 +388,24 @@ msgstr ""
 "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:2478 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Új hírforrás"
 
-#: ../midori/midori-browser.c:2510 ../midori/midori-browser.c:5340
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Új könyvjelző hozzáadása"
 
-#: ../midori/midori-browser.c:3036 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Üres"
 
-#: ../midori/midori-browser.c:3418 ../midori/midori-browser.c:3419
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Kurzoros szövegnavigáció átváltása"
 
-#: ../midori/midori-browser.c:3421
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -383,110 +413,100 @@ msgstr ""
 "Az F7 megnyomása ki/bekapcsolja a kurzoros böngészést. Ha ez aktív, szöveges "
 "kurzor jelenik meg minden weboldalon."
 
-#: ../midori/midori-browser.c:3424
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_Kurzoros böngészés bekapcsolása"
 
-#: ../midori/midori-browser.c:3840 ../midori/midori-browser.c:5788
-#, 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:4155 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Összes _megnyitása lapokon"
 
-#: ../midori/midori-browser.c:4162 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513
-msgid "Open in New _Tab"
-msgstr "Megnyi_tás új lapon"
-
-#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2765
-#: ../midori/midori-view.c:4647 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Megnyitás új _ablakban"
 
-#: ../midori/midori-browser.c:4254
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4256
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4257
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4258
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4259
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4260
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Könyvjelzők importálása…"
 
-#: ../midori/midori-browser.c:4281 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Könyvjelzők importálása"
 
-#: ../midori/midori-browser.c:4292
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Alkalmazás:"
 
-#: ../midori/midori-browser.c:4357
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importálás XBEL vagy HTML fájlból"
 
-#: ../midori/midori-browser.c:4385
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importálás fájlból"
 
-#: ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "A könyvjelzők importálása sikertelen"
 
-#: ../midori/midori-browser.c:4428
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL-könyvjelzők"
 
-#: ../midori/midori-browser.c:4433
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape könyvjelzők"
 
-#: ../midori/midori-browser.c:4447
+#: ../midori/midori-browser.c:4546
 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:4462
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "A könyvjelzők exportálása sikertelen"
 
-#: ../midori/midori-browser.c:4678
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Könnyűsúlyú webböngésző."
 
-#: ../midori/midori-browser.c:4679
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Verzióinformációkért lásd az about:version oldalt."
 
-#: ../midori/midori-browser.c:4681
+#: ../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 "
@@ -497,418 +517,435 @@ msgstr ""
 "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:4716
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Benedek Imre <nucleo at indamail dot hu>\n"
-"Kelemen Gábor <kelemeng at gnome dot hu>"
+"Kelemen Gábor <kelemeng at gnome dot hu>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Balazs Varga https://launchpad.net/~thebalu1\n"
+"  Chipong Luo https://launchpad.net/~chipong-l\n"
+"  Christian Dywan https://launchpad.net/~kalikiana\n"
+"  Cody Garver https://launchpad.net/~codygarver\n"
+"  Dienes Tamás https://launchpad.net/~mith88\n"
+"  Gabor Kelemen https://launchpad.net/~kelemeng\n"
+"  Gergely Szarka https://launchpad.net/~gszarka\n"
+"  Gyönki Bendegúz https://launchpad.net/~gyonkibendeguz\n"
+"  Kisbenedek Márton https://launchpad.net/~kmarton815\n"
+"  Laszlo Espadas https://launchpad.net/~kardi-web\n"
+"  Radics Ottó https://launchpad.net/~saboteur777\n"
+"  Rafael Ferreira https://launchpad.net/~rafael-f-f1\n"
+"  Richard Paj https://launchpad.net/~pajrichard\n"
+"  moonwatcher https://launchpad.net/~moonwatcher2k1\n"
+"  Úr Balázs https://launchpad.net/~urbalazs"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Jelenlegi lap _kettőzése"
 
-#: ../midori/midori-browser.c:5178
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../midori/midori-browser.c:5181
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Új ablak megnyitása"
 
-#: ../midori/midori-browser.c:5184
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Új lap megnyitása"
 
-#: ../midori/midori-browser.c:5186
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Új _privát böngészési ablak megnyitása"
 
-#: ../midori/midori-browser.c:5190
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Fájl megnyitása"
 
-#: ../midori/midori-browser.c:5192
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Oldal _mentése másként…"
 
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Mentés fájlba"
 
-#: ../midori/midori-browser.c:5195
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Hozzáadás _gyorstárcsázáshoz"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5199
-msgid "Create _Launcher"
-msgstr "_Parancsikon létrehozása"
-
-#: ../midori/midori-browser.c:5202
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "_Feliratkozás hírforrásra"
 
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Lap _bezárása"
 
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "A jelenlegi lap bezárása"
 
-#: ../midori/midori-browser.c:5211
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Ablak bezárása"
 
-#: ../midori/midori-browser.c:5215
-msgid "_Share"
-msgstr "_Megosztás"
-
-#: ../midori/midori-browser.c:5216
-msgid "Share this page"
-msgstr "Az oldal megosztása"
-
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "A jelenlegi oldal nyomtatása"
 
-#: ../midori/midori-browser.c:5223
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Minden _ablak bezárása"
 
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Keresés…"
 
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Szó vagy kifejezés keresése az oldalon"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "_Következő találat"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "_Előző találat"
 
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Az alkalmazás beállításainak megadása"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Eszköztárak"
 
-#: ../midori/midori-browser.c:5267
-msgid "Reload page without caching"
-msgstr "Oldal újratöltése gyorsítótárazás nélkül"
-
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Nagyítási szint növelése"
 
-#: ../midori/midori-browser.c:5280
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Nagyítási szint csökkentése"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kódolás"
 
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "_Forrás megjelenítése"
 
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "_Kurzoros böngészés"
 
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Teljes képernyős nézet be- illetve kikapcsolása"
 
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Görgetés _balra"
 
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Görgetés l_e"
 
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Görgetés _fel"
 
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Görgetés j_obbra"
 
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Olvasható"
 
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ugrás az előző oldalra"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ugrás az előző aloldalra"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Kez_dőlap"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ugrás a kezdőlapra"
 
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Kuka ürítése"
 
-#: ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Lapbezárás _visszavonása"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Új mappa _hozzáadása"
 
-#: ../midori/midori-browser.c:5348
-msgid "_Export bookmarks"
-msgstr "Könyvjelzők e_xportálása"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Könyvjelzők importálása…"
 
-#: ../midori/midori-browser.c:5351 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Keresőszolgáltatások kezelése"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Könyvjelzők exportálása…"
 
-#: ../midori/midori-browser.c:5354
-msgid "_Clear Private Data"
-msgstr "_Privát adatok törlése"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Kereső_motorok kezelése…"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Személyes adatok törlése…"
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Oldal vizsgálata"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Előző lap"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Következő lap"
 
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Lap _első pozícióba mozgatása"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Lap mozgatása _hátra"
 
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Lap mozgatása _előre"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Lap _utolsó pozícióba mozgatása"
 
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "_Aktuális lap előtérbe"
 
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "_Következő nézet előtérbe"
 
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Csak _a jelenlegi lap ikonjának megjelenítése"
 
-#: ../midori/midori-browser.c:5384
-msgid "_Duplicate Current Tab"
-msgstr "Jelenlegi lap _kettőzése"
-
-#: ../midori/midori-browser.c:5387
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Többi lap bezárása"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "_Utolsó munkamenet megnyitása"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Gyakori kérdések"
 
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Hiba jelentése…"
 
-#: ../midori/midori-browser.c:5403 ../midori/midori-browser.c:6060
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Eszközök"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menüsáv"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigációs sáv"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Oldalsáv"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Oldalsáv"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Könyvjelzősáv"
 
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Á_llapotsor"
 
-#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:221
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatikus"
 
-#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:145
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Kínai ‒ hagyományos (BIG5)"
 
-#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:146
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Kínai ‒ egyszerűsített (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japán (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:148
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:149
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Orosz (KOI8-R)"
 
-#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:150
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Nyugati (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Egyéni…"
 
-#: ../midori/midori-browser.c:5966
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Az előzmények inicializálása meghiúsult: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Elválasztó"
 
-#: ../midori/midori-browser.c:5973
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "He_ly…"
 
-#: ../midori/midori-browser.c:5975
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Adott hely megnyitása"
 
-#: ../midori/midori-browser.c:5997
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Webkeresés…"
 
-#: ../midori/midori-browser.c:5999
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
-msgstr "Webkeresés futtatása "
+msgstr "Webkeresés futtatása"
 
-#: ../midori/midori-browser.c:6026
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása"
 
-#: ../midori/midori-browser.c:6043
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "A mentett könyvjelzők megjelenítése"
 
-#: ../midori/midori-browser.c:6076
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Lapok"
 
-#: ../midori/midori-browser.c:6078
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Az összes megnyitott lap listájának megjelenítése"
 
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menü"
 
-#: ../midori/midori-browser.c:6094
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menü"
 
-#: ../midori/midori-browser.c:6863
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Váratlan beállítás: „%s”"
-
 #: ../midori/midori-extension.c:341
 #, 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:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Tanúsítvány exportálása"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Az aláíró hitelesítésszolgáltató ismeretlen."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 "A tanúsítvány nem egyezik az oldal várt azonosítójával, ahonnan származik."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "A tanúsítvány aktiválási ideje még jövőbeli."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "A tanúsítvány lejárt"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -916,40 +953,40 @@ msgstr ""
 "A tanúsítvány visszavonásra került a GTlsConnection tanúsítvány-visszavonási "
 "listájának megfelelően."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "A tanúsítvány algoritmusa megbízhatatlan."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Valamilyen más hiba történt a tanúsítvány érvényesítésekor."
 
-#: ../midori/midori-locationaction.c:1420
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "Tanúsítvány _exportálása"
 
-#: ../midori/midori-locationaction.c:1435
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Önaláírt"
 
-#: ../midori/midori-locationaction.c:1459
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Biztonsági részletek"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1542
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Beillesztés és _folytatás"
 
-#: ../midori/midori-locationaction.c:1774
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Nem ellenőrzött"
 
-#: ../midori/midori-locationaction.c:1782
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Ellenőrzött és titkosított kapcsolat"
 
-#: ../midori/midori-locationaction.c:1789
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Nyílt, titkosítás nélküli kapcsolat"
 
@@ -966,435 +1003,453 @@ msgstr "Panel bezárása"
 msgid "Align sidepanel to the left"
 msgstr "Az oldalsáv balra igazítása"
 
-#: ../midori/midori-websettings.c:108 ../midori/midori-websettings.c:129
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Gyorstárcsázó megjelenítése"
 
-#: ../midori/midori-websettings.c:109 ../midori/midori-websettings.c:127
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Kezdőlap megjelenítése"
 
-#: ../midori/midori-websettings.c:110 ../midori/midori-frontend.c:344
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "A legutóbbi lapok megjelenítése"
 
-#: ../midori/midori-websettings.c:111 ../midori/midori-frontend.c:343
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "A legutóbbi lapok megjelenítése betöltés nélkül"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Üres oldal megjelenítése"
 
-#: ../midori/midori-websettings.c:128
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Alapértelmezett keresőszolgáltatás megjelenítése"
 
-#: ../midori/midori-websettings.c:130
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Egyéni oldal megjelenítése"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japán (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:152 ../midori/midori-websettings.c:228
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "Egyéni…"
-
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Új lap"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Új ablak"
 
-#: ../midori/midori-websettings.c:169
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Aktuális lap"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikonok"
 
-#: ../midori/midori-websettings.c:186
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Kis ikonok"
 
-#: ../midori/midori-websettings.c:187
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../midori/midori-websettings.c:188
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikonok és szöveg"
 
-#: ../midori/midori-websettings.c:189
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Szöveg az ikonok mellett"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatikus (GNOME vagy környezet)"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP proxykiszolgáló"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Nincs proxykiszolgáló"
 
-#: ../midori/midori-websettings.c:223
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Az eszköztár stílusa"
 
-#: ../midori/midori-websettings.c:504
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Mindig a saját betűkészletek használata"
 
-#: ../midori/midori-websettings.c:505
+#: ../midori/midori-websettings.c:492
 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-websettings.c:1369 ../midori/midori-websettings.c:1375
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, 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/midori-websettings.c:1424
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "A(z) „%s” érték érvénytelen ehhez: %s"
-
-#: ../midori/midori-websettings.c:1429 ../midori/midori-websettings.c:1540
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Érvénytelen beállításérték: „%s”"
 
-#: ../midori/midori-tab.vala:118
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "A stíluslap beillesztése meghiúsult: %s"
 
-#: ../midori/midori-view.c:767 ../midori/midori-view.c:895
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Lap_címke megjelenítése"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Csak l_apikon megjelenítése"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Másik lap bezárása"
+msgstr[1] "_Többi lap bezárása"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Ez a weboldal megbízható"
 
-#: ../midori/midori-view.c:893
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Ismeretlen biztonság"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s HTML5 adatbázist szeretne menteni."
 
-#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Megtagadás"
 
-#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Engedélyezés"
 
-#: ../midori/midori-view.c:1226
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s tudni szeretné az Ön tartózkodási helyét."
 
-#: ../midori/midori-view.c:1357
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "„%s” nem található"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "A(z) „%s” oldal nem tölthető be:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Ellenőrizze, hogy jól írta-e be a címet"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Győződjön meg arról, hogy van-e ethernet kábel csatlakoztatva vagy a vezeték "
+"nélküli kártya aktiválva van-e"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Ellenőrizze, hogy a hálózati beállítások helyesek-e"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Próbálja újra"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "Hiba - %s"
+msgid "Oops - %s"
+msgstr "Upsz - %s"
 
-#: ../midori/midori-view.c:1358
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "A(z) „%s” oldal nem tölthető be."
+msgid "Something went wrong with '%s'."
+msgstr "Valami probléma van a következővel: „%s”."
 
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Próbálja újra"
 
-#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2706
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Üzenet küldése a következőnek: %s"
 
-#: ../midori/midori-view.c:2494
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Keresőszolgáltatás h_ozzáadása…"
 
-#: ../midori/midori-view.c:2537 ../midori/midori-view.c:2841
-msgid "Inspect _Element"
-msgstr "Elem _vizsgálata"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "_Hivatkozás megnyitása"
 
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Hivatkozás megnyitása új _lapon"
 
-#: ../midori/midori-view.c:2593
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon"
 
-#: ../midori/midori-view.c:2594
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "_Hivatkozás megnyitása a háttérben lévő lapon"
 
-#: ../midori/midori-view.c:2597
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Hivatkozás megnyitása új _ablakban"
 
-#: ../midori/midori-view.c:2600
-msgid "Open Link as Web A_pplication"
-msgstr "Hivatkozás megnyitása _webes alkalmazásként"
-
-#: ../midori/midori-view.c:2605
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Hivatkozás _címének másolása"
 
-#: ../midori/midori-view.c:2611
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Mentés másként…"
 
-#: ../midori/midori-view.c:2620
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "_Kép megnyitása új ablakban"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Ké_p megnyitása új lapon"
 
-#: ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Kép _másolása"
 
-#: ../midori/midori-view.c:2626
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Kép me_ntése"
 
-#: ../midori/midori-view.c:2629
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Megnyitás a _képmegjelenítőben"
 
-#: ../midori/midori-view.c:2636
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Videó _címének másolása"
 
-#: ../midori/midori-view.c:2639
-msgid "Save _Video"
-msgstr "Videó me_ntése"
-
-#: ../midori/midori-view.c:2639
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "_Videó letöltése"
 
-#: ../midori/midori-view.c:2665
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Cím meg_nyitása új lapon"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "_Keresés ezzel"
 
-#: ../midori/midori-view.c:2694
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "Keresés a _weben"
 
-#: ../midori/midori-view.c:2714
-msgid "Open Address in New _Tab"
-msgstr "Cím meg_nyitása új lapon"
-
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "_Keret megnyitása új lapon"
 
-#: ../midori/midori-view.c:2978
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Elem _vizsgálata"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Fájl megnyitása vagy letöltése innen: %s"
 
-#: ../midori/midori-view.c:2991
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Fájlnév: %s"
 
-#: ../midori/midori-view.c:2996
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Fájltípus: „%s”"
 
-#: ../midori/midori-view.c:2998
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Fájltípus: %s („%s”)"
 
-#: ../midori/midori-view.c:3035
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Méret: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3046
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s megnyitása"
 
-#: ../midori/midori-view.c:3574
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Oldal vizsgálata - %s"
 
-#: ../midori/midori-view.c:4094
-#, c-format
-msgid "No documentation installed"
-msgstr "Nincs telepítve dokumentáció"
-
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "A Midori nem tárol személyes adatokat:"
 
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:3899
 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:4172
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Kiterjesztések letiltva."
 
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:3901
 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:4174
+#: ../midori/midori-view.c:3902
 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:4175
+#: ../midori/midori-view.c:3903
 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:4176
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "A DNS-előtöltés letiltva."
 
-#: ../midori/midori-view.c:4177
+#: ../midori/midori-view.c:3905
 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:4178
+#: ../midori/midori-view.c:3906
 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:4218
+#: ../midori/midori-view.c:3949
 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:4268
-msgid "Page loading delayed"
-msgstr "Oldalbetöltés késleltetve"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Oldalbetöltés késleltetve:"
 
-#: ../midori/midori-view.c:4269
+#: ../midori/midori-view.c:4000
 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."
 
-#: ../midori/midori-view.c:4270
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Oldal betöltése"
 
-#: ../midori/midori-view.c:4437
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Üres oldal"
 
-#: ../midori/midori-view.c:4651
-msgid "_Duplicate Tab"
-msgstr "_Lap kettőzése"
-
-#: ../midori/midori-view.c:4656
-msgid "Show Tab _Label"
-msgstr "Lap_címke megjelenítése"
-
-#: ../midori/midori-view.c:4656
-msgid "Show Tab _Icon Only"
-msgstr "Csak l_apikon megjelenítése"
-
-#: ../midori/midori-view.c:4663
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "_Másik lap bezárása"
-msgstr[1] "_Többi lap bezárása"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5352
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "előző"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5371
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "következő"
 
-#: ../midori/midori-view.c:5384
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Háttérképek nyomtatása"
 
-#: ../midori/midori-view.c:5385
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "A háttérképeket ki kell-e nyomtatni"
 
-#: ../midori/midori-view.c:5410
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Szolgáltatások"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1402,27 +1457,27 @@ msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " – %s van hátra"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "A letöltött fájl hibás."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1430,162 +1485,154 @@ 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."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Nincs jogosultsága erre a helyre írni."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, 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-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Gyorstárcsázó"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Kattintson gyorsindító hozzáadásához"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Adja meg a gyorsindító címét"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Adja meg a gyorsindító címét"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Biztosan törölni akarja ezt a gyorsindítót?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Indítás"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "A Midori indulásakor:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Kezdőlap:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "_Jelenlegi oldal használata"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Jelenlegi oldal használata kezdőlapként"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proporcionális betűkészletcsalád"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 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:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Rögzített szélességű betűkészletcsalád"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 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:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimális betűméret"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "A szöveg megjelenítésére használt minimális betűméret"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Előnyben részesített kódolás"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Viselkedés"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Képek automatikus betöltése"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Helyesírás-ellenőrzés engedélyezése"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Parancsfájlok engedélyezése"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "WebGL-támogatás engedélyezése"
 
-#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape bővítmények engedélyezése"
-
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Szöveg és képek nagyítása"
 
-#: ../midori/midori-preferences.c:397
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "A parancsfájlok megnyithatnak felugró ablakokat"
 
-#: ../midori/midori-preferences.c:398
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "A parancsfájlok megnyithatnak-e automatikusan felugró ablakokat"
 
-#: ../midori/midori-preferences.c:401
-msgid "Middle click opens Selection"
-msgstr "A középső kattintás megnyitja a kijelölést"
-
-#: ../midori/midori-preferences.c:402
-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-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Alapértelmezett nagyítási szint"
 
-#: ../midori/midori-preferences.c:406
-msgid "Flash window on background tabs"
-msgstr "Ablak megvillantása háttérben lévő lapok nyitásakor"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Az újonnan megnyitott lapok kezdeti nagyítási tényezője"
 
-#: ../midori/midori-preferences.c:411
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Előnyben részesített nyelvek"
 
-#: ../midori/midori-preferences.c:415
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1594,112 +1641,116 @@ msgstr ""
 "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-preferences.c:417
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Letöltött fájlok mentése ide:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Böngészés"
 
-#: ../midori/midori-preferences.c:428
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Eszköztár stílusa:"
 
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Új oldalak megnyitása:"
 
-#: ../midori/midori-preferences.c:437
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Új lap viselkedése:"
 
-#: ../midori/midori-preferences.c:442
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Bezárás gombok a lapokon"
 
-#: ../midori/midori-preferences.c:446
-msgid "Always Show Tabbar"
-msgstr "Mindig jelenjen meg a lapsáv"
-
-#: ../midori/midori-preferences.c:450
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Lapok megnyitása az aktuális mellett"
 
-#: ../midori/midori-preferences.c:451
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:454
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Lapok megnyitása a háttérben"
 
-#: ../midori/midori-preferences.c:458
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Szövegszerkesztő"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Hírforrásolvasó"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:470
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxykiszolgáló"
 
-#: ../midori/midori-preferences.c:477
-msgid "Hostname"
-msgstr "Gépnév"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:485
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Támogatott proxytípusok:"
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:497 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Webes gyorsítótár"
 
-#: ../midori/midori-preferences.c:498 ../midori/midori-preferences.c:501
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Gyorsítótárazott oldalak legnagyobb mérete a lemezen"
 
-#: ../midori/midori-preferences.c:503
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:510
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Azonosítás mint"
 
-#: ../midori/midori-preferences.c:525
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Adatvédelem"
 
-#: ../midori/midori-preferences.c:527
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Régi sütik törlése ennyi után:"
 
-#: ../midori/midori-preferences.c:529 ../midori/midori-preferences.c:532
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Sütik tárolása legfeljebb ennyi napig"
 
-#: ../midori/midori-preferences.c:536
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Sütik elfogadása csak az Ön által meglátogatott webhelyekről"
 
-#: ../midori/midori-preferences.c:537
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Külső weboldalak sütijeinek blokkolása"
 
-#: ../midori/midori-preferences.c:542
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1707,36 +1758,40 @@ 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:549
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Webalkalmazások kapcsolat nélküli gyorsítótárának engedélyezése"
 
-#: ../midori/midori-preferences.c:552
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 helyi tárolás támogatásának engedélyezése"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:556
+#: ../midori/midori-preferences.c:613
 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-preferences.c:558
+#: ../midori/midori-preferences.c:615
 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-preferences.c:561
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Oldalak törlése az előzményekből ennyi után:"
 
-#: ../midori/midori-preferences.c:563 ../midori/midori-preferences.c:566
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Előzmények tárolása legfeljebb ennyi napig"
 
-#: ../midori/midori-preferences.c:603 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Keresőszolgáltatások kezelése"
+
 #: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Keresőszolgáltatás hozzáadása"
@@ -1753,76 +1808,72 @@ msgstr "_Név:"
 msgid "_Description:"
 msgstr "_Leírás:"
 
-#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Webcím:"
 
-#: ../midori/midori-searchaction.c:1122
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Jelsor:"
 
-#: ../midori/midori-searchaction.c:1412
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Keresőszolgáltatások kezelése"
 
-#: ../midori/midori-searchaction.c:1512
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "_Alapértelmezett"
 
-#: ../midori/midori-searchaction.c:1623
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "A keresőmotorok nem tölthetők be. %s\n"
 
-#: ../midori/midori-searchaction.c:1678
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "A keresőmotorok nem menthetők. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Előzmények"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Könyvjelzők és előzmények"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Az előzmények inicializálása meghiúsult: %s"
+msgid "Search for %s"
+msgstr "%s keresése"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Az előzményekből választás meghiúsult: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s keresése"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Keresés ezzel…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Keresés ezzel: %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Megnyitás ezzel"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, 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:368 ../midori/sokoke.c:388
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "A külső program nem futtatható."
 
-#: ../midori/sokoke.c:561
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Érvénytelen URI"
 
@@ -1847,119 +1898,139 @@ msgstr "Kis- és nagybetű"
 msgid "Close Findbar"
 msgstr "Keresősáv bezárása"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "A(z) „<b>%s</b>” fájl letöltve."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d könyvjelző"
+msgstr[1] "%d könyvjelző"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Átvitel kész"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d almappa"
+msgstr[1] "%d almappa"
 
-#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Minden mező törlése"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Üres mapa"
 
-#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Néhány fájl letöltése folyamatban"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "A mappa tartalma %s és nincs könyvjelző"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "_Kilépés a Midoriból"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "A mappa tartalma %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "A mappa tartalma %s és %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "A könyvjelzőelem hozzáadása meghiúsult: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "A könyvjelző erre mutat: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s és nincs könyvjelző"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "A könyvjelző frissítése meghiúsult: %s\n"
+msgid "%s and %s"
+msgstr "%s és %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "A kijelölt könyvjelző szerkesztése"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "A kijelölt könyvjelző törlése"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Új mappa hozzáadása"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Elválasztó</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Megnyi_tás új lapon"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Keresés a könyvjelzőkben"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Előzmények"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Ma"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Tegnap"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Egy hete"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Az előzményelem eltávolítása meghiúsult: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 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:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "A kijelölt előzményelem könyvjelzőzése"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "A kijelölt előzményelem törlése"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Minden előzmény törlése"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Keresési előzmények"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Átvitelek"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "_Célmappa megnyitása"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Link _helyének másolása"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Hitelesítés szükséges"
@@ -1984,114 +2055,65 @@ msgstr "Jelszó"
 msgid "_Remember password"
 msgstr "Jelszó _megjegyzése"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "A(z) „%s” nevű ikon nem tölthető be"
-
-#: ../katze/katze-throbber.c:960
-#, 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:1040
-msgid "Animation frames are broken"
-msgstr "Az animációs képkockák sérültek"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Nincs"
 
-#: ../katze/katze-utils.c:422
+#: ../katze/katze-utils.c:529
 #, 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:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Válasszon fájlt"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Válasszon mappát"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "Nincs"
-
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 óra"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 nap"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 hét"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 hónap"
 
-#: ../katze/katze-utils.c:692
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 év"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s tulajdonságai"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 ellenőrzőösszeg:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 ellenőrzőösszeg:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Reklámszűrők beállítása"
-
-#: ../extensions/adblock.c:512
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához "
-"adáshoz nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Szabály szerkesztése"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "S_zabály:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Kép _blokkolása"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "_Hivatkozás blokkolása"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Reklámblokkoló"
-
-#: ../extensions/adblock.c:1926
-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:222
-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?"
+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:223
 msgid "_Install user script"
@@ -2110,71 +2132,71 @@ msgstr "Felhasználói _stílus telepítése"
 msgid "Don't install"
 msgstr "Ne telepítse"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Felhasználói parancsfájlok"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Felhasználói stílusok"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Hiba"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Biztos, hogy törölni akarja a következőt: „%s”?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Felhasználói parancsfájl törlése"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Felhasználói stílus törlése"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "A(z) „<b>%s</b>” fájl véglegesen törlésre kerül."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Megnyitás szövegszerkesztőben"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Célmappa megnyitása"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Új bővítmény hozzáadása"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Kijelölt bővítmény eltávolítása"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Felhasználói bővítmények"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "„%s” mappa nem figyelhető meg: %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Felhasználói parancsfájlok és stílusok támogatása"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Színes lapok"
 
-#: ../extensions/colorful-tabs.c:204
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Eltérő szín adása minden lapnak"
 
@@ -2183,11 +2205,11 @@ msgstr "Eltérő szín adása minden lapnak"
 msgid "Cookie Manager"
 msgstr "Sütikezelő"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Összes törlése"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2195,31 +2217,31 @@ 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:116
 msgid "Expand All"
 msgstr "Összes kibontása"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Összes összecsukása"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Kérdés"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "A munkamenet végén"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2237,15 +2259,15 @@ msgstr ""
 "<b>Lejár</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Igen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nem"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2254,20 +2276,20 @@ msgstr ""
 "<b>Tartomány</b>: %s\n"
 "<b>Sütik</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:503
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Név"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Összes _kibontása"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Összes össze_csukása"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Sütik keresése név vagy tartomány szerint"
 
@@ -2287,25 +2309,38 @@ msgstr "Lapok címeinek másolása"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Az összes lap címeinek vágólapra másolása"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Késleltetett betöltés"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Késleltetés másodpercekben az oldal betöltéséig:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Oldalbetöltés késleltetése a lapra váltásig."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Hiba történt, amikor a következő bővítmény megpróbálta letölteni a fájlt:\n"
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2336,34 +2371,35 @@ msgstr "Fájlok letöltése ezzel: „%s” vagy egyéni paranccsal"
 msgid "External Download Manager - CommandLine"
 msgstr "Külső letöltéskezelő - parancssori"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Nem találhatók a szükséges Atom „entry” bejegyzések az XML adatokban."
+msgstr ""
+"Nem találhatók a szükséges Atom „entry” bejegyzések az XML adatokban."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Utolsó frissítés: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Hírforrások"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Új hírforrás hozzáadása"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Hírforrás törlése"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Hírforrások"
 
@@ -2372,47 +2408,47 @@ msgstr "_Hírforrások"
 msgid "Failed to find root element in feed XML data."
 msgstr "Nem található gyökérelem a hírforrás XML adataiban."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Nem támogatott hírforrásformátum."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Az XML hírforrás feldolgozása meghiúsult: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Nem található a „channel” elem az RSS XML adatokban."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Nem támogatott RSS verzió."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Nem találhatók a szükséges RSS „item” elemek az XML adatokban."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Nem találhatók a szükséges RSS „channel” elemek az XML adatokban."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "A(z) „%s” hírforrás már létezik"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Hiba a(z) „%s” hírforrás betöltésekor"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Hírforráspanel"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom/ RSS hírforrások olvasása"
 
@@ -2433,124 +2469,404 @@ msgstr ""
 "Mesterjelszó szükséges a\n"
 "jelszóadatbázis megnyitásához"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "A program megjegyezze a jelszót ezen az oldalon?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Most nem"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Soha ezen az oldalon"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Űrlapelőzmény-állapot átváltása"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Az adatbázis nem nyitható meg: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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)"
+"Az űrlapelőzmények aktiválása laponként, csak gyorsbillentyűvel "
+"(Ctrl+Shift+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Űrlap-előzmények kitöltése"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "A bevitt űrlapadatok előzményeit tárolja"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "A javaslatok kiválasztása meghiúsult\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Nincsenek nem látogatott lapok"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Előzménylista"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Lapbezárás viselkedése"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ne tegyen semmit"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Váltás az utoljára megjelenített lapra"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Váltás a legújabb lapra"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Ablak megvillantása háttérben lévő lapok nyitásakor"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Következő új lap (előzménylista)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 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:508
 msgid "Previous new Tab (History List)"
 msgstr "Előző új lap (előzménylista)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Előző új lap az előzményekből"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Lap megjelenítése a háttérben (előzménylista)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 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:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Előzménylista"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Az utoljára használt lapra lépés lapok váltásakor vagy bezárásakor"
 
-#: ../extensions/mouse-gestures.c:297
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL hiba: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Elfogadás"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Elfogadás erre a munkamenetre"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokkolás"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Tartomány"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Irányelv"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Ö_sszes törlése"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Meghatározatlan"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Ok"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "A kiterjesztés adatbázisa nem nyitható meg."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "A kiterjesztés adatbázis-struktúrája nem hozható létre."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Kiterjesztés példány"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "A Midori kiterjesztés példány ehhez a kiterjesztéshez"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Alkalmazás példány"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Ehhez a kiterjesztéshez tartozó Midori alkalmazás példány"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Adatbázis példány"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Ezen kiterjesztés által használt mutató az sqlite adatbázis példányra"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Adatbázis útvonala"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Ezen kiterjesztés által használt útvonal az sqlite adatbázis példányhoz"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Egérgesztusok"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "A Midori irányítása az egér mozgatásával"
 
@@ -2563,7 +2879,7 @@ msgid "Customize Keyboard shortcuts"
 msgstr "Gyorsbillentyűk személyre szabása"
 
 #: ../extensions/shortcuts.c:275
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts"
 msgstr "_Gyorsbillentyűk személyre szabása…"
 
 #: ../extensions/shortcuts.c:312
@@ -2574,11 +2890,11 @@ msgstr "Gyorsbillentyűk"
 msgid "View and edit keyboard shortcuts"
 msgstr "Gyorsbillentyűk megjelenítése és szerkesztése"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Állapotsor-óra"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Dátum és idő megjelenítése az állapotsorban"
 
@@ -2594,6 +2910,10 @@ msgstr "Parancsfájlok"
 msgid "Netscape plugins"
 msgstr "Netscape bővítmények"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape bővítmények engedélyezése"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Állapotsor-összetevők"
@@ -2602,15 +2922,15 @@ msgstr "Állapotsor-összetevők"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Weboldalak összetevőinek egyszerű be- és kikapcsolása"
 
-#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Lappanel"
 
-#: ../extensions/tab-panel.c:656
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "_Lappanel"
 
-#: ../extensions/tab-panel.c:674
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Lapok megjelenítése függőleges panelen"
 
@@ -2622,11 +2942,11 @@ msgstr "Csak ikonok a lapokon alapértelmezésben"
 msgid "New tabs have no label by default"
 msgstr "Az új lapokon alapértelmezésben nincs felirat"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Eszköztár testreszabása"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2634,66 +2954,58 @@ msgstr ""
 "Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd "
 "módszerrel átrendezhetők."
 
-#: ../extensions/toolbar-editor.c:427
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Elérhető elemek"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Megjelenített elemek"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Eszköztár személyre szabása…"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Eszköztárszerkesztő"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Az eszköztár elrendezésének egyszerű szerkesztése"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP kommunikáció gyorsítótárazása a lemezen"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "A sütik betöltése meghiúsult\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Privát adatok törlése"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Privát adatok törlése"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "A következő adatok törlése:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "_Legutóbb nyitott lapok"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Privát adatok törlése a Mi_doriból kilépéskor"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:302
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Mentett felhasználónevek és _jelszavak"
 
-#: ../midori/midori-privatedata.c:304
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Sütik és weboldaladatok"
 
-#: ../midori/midori-privatedata.c:311
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Weboldalikonok"
 
@@ -2701,201 +3013,152 @@ msgstr "Weboldalikonok"
 msgid "Open tabs"
 msgstr "Lapok megnyitása"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Több nyitott lap…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Az előzmények törlése meghiúsult: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, 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/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "a régi adatbázis CSATOLÁSA meghiúsult"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "a régi adatbázisból történő importálás meghiúsult"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "a tranzakció visszavonása sikertelen"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "sikertelen LEVÁLASZTÁS"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Nem sikerült létrehozni a könyvjelzőtáblát: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "A könyvjelzőelem hozzáadása meghiúsult: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Nem sikerült importálni a régi adatbázisból: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Nem sikerült a könyvjelző frissítése: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "A könyvjelzők nem menthetők. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Nem sikerült a könyvjelző eltávolítása: %s\n"
 
-#: ../midori/midori-session.c:192
+#: ../midori/midori-session.c:217
 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/midori-session.c:361
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "A beállítások nem menthetők. %s"
 
-#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "A munkamenet nem tölthető be: %s\n"
-
-#: ../midori/midori-session.c:412
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "A munkamenet nem menthető. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "A Kuka nem menthető. %s"
 
-#: ../midori/midori-frontend.c:314
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 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."
+"A Midori összeomlott a legutóbbi megnyitáskor. Itt jelentheti a problémát: "
+"%s."
 
-#: ../midori/midori-frontend.c:324
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Beállítások _módosítása"
 
-#: ../midori/midori-frontend.c:328
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Minden _kiterjesztés letiltása"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Párbeszédablak megjelenítése a Midori összeomlása után"
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Régi lapok eldobása"
 
-#: ../midori/midori-frontend.c:406
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "A legutóbbi összeomlási _napló megjelenítése"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Futtatás a _hibakeresőben"
+
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:439
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "A könyvjelzők nem tölthetők be: %s\n"
 
-#: ../midori/midori-frontend.c:470
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "A munkamenet nem tölthető be: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "A Kuka nem tölthető be: %s\n"
 
-#: ../midori/midori-frontend.c:478
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Az előzmények nem tölthetők be: %s\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "A következő hibák történtek:"
 
-#: ../midori/midori-frontend.c:494
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Kihagyás"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:235
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:279
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:584
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL hiba: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:984
-msgid "Accept"
-msgstr "Elfogadás"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:985
-msgid "Accept for session"
-msgstr "Elfogadás erre a munkamenetre"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:986
-msgid "Block"
-msgstr "Blokkolás"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:145
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "A kiterjesztés adatbázisa nem nyitható meg: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:187
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Biztos, hogy az összes sütiengedélyt törölni szeretné?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Az összes sütiengedély törlése?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr "Ez a művelet az összes sütiengedélyt törölni fogja."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Sütiengedély-kezelő"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "A jelenlegi sütiengedély-kezelő példánya"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Sütiengedély konfigurálása"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2904,155 +3167,84 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:489
-msgid "Domain"
-msgstr "Tartomány"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712
-msgid "Policy"
-msgstr "Irányelv"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-msgid "Delete _all"
-msgstr "Ö_sszes törlése"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749
-msgid "A_sk for policy if unknown for a domain"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:83
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
-msgstr "Végzetes hiba történt, mely megakadályozza a sütiengedély-kezelőt a folytatásban. Letiltása javasolt."
+msgstr ""
+"Végzetes hiba történt, mely megakadályozza a sütiengedély-kezelőt a "
+"folytatásban. Letiltása javasolt."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:87
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
 msgstr "Hiba a sütiengedély-kezelő kiterjesztésben"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:92
-msgid "Reason"
-msgstr "Ok"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:125
-msgid "Could not get path to configuration of extension: path is NULL"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:127
-msgid "Could not get path to configuration of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:133
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:135
-msgid "Could not create configuration folder for extension."
-msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:150
-msgid "Could not open database of extension."
-msgstr "A kiterjesztés adatbázisa nem nyitható meg."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:183
-msgid "Could not set up database structure of extension."
-msgstr "A kiterjesztés adatbázis-struktúrája nem hozható létre."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:430
-msgid "Confirm storing cookie"
-msgstr "Süti tárolás jóváhagyása"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:461
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "A(z) %s weboldal %d sütit szeretne tárolni."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:463
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "A(z) %s weboldal egy sütit szeretne tárolni."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:467
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Több weboldal összesen %d sütit szeretne tárolni."
 
-#. Create expander for details
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:479
-msgid "_Details"
-msgstr "_Részletek"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:496
-msgid "Path"
-msgstr "Útvonal"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:510
-msgid "Value"
-msgstr "Érték"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:521
-msgid "Expire date"
-msgstr "Lejárat dátuma"
-
-#. Create buttons for dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:545
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Elfogadás"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:548
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Elfogadás erre a _munkamenetre"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:550
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Meg_tagadás"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:881
-msgid "Extension instance"
-msgstr "Kiterjesztés példány"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:882
-msgid "The Midori extension instance for this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:888
-msgid "Application instance"
-msgstr "Alkalmazás példány"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Megtagadás _erre az alkalomra"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:889
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:895
-msgid "Database instance"
-msgstr "Adatbázis példány"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Útvonal"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:896
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Érték"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:901
-msgid "Ask for unknown policy"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Lejárat dátuma"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:902
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:983
-msgid "Undetermined"
-msgstr "Meghatározatlan"
-
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
 msgstr "Sütibiztonság-kezelő"
@@ -3061,631 +3253,260 @@ msgstr "Sütibiztonság-kezelő"
 msgid "Manage cookie permission per site"
 msgstr "Sütijogosultság kezelése oldalanként"
 
-#~ msgid "Writing failed."
-#~ msgstr "Az írás meghiúsult."
-
-#~ msgid "_Window"
-#~ msgstr "_Ablak"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Miként mutatkozzon be a weboldalaknak"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Kinetikus görgetés"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "A görgetés kinetikusan mozogjon-e a sebességnek megfelelően"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Parancsikon hozzáadása az _asztalhoz"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Konzolos figyelmeztetések átirányítása a megadott FÁJLNÉVBE"
-
-#~ msgid "FILENAME"
-#~ msgstr "FÁJLNÉV"
-
-#~ msgid "_Bookmark"
-#~ msgstr "_Könyvjelző"
-
-#~ msgid "_Console"
-#~ msgstr "_Konzol"
-
-#~ msgid "Toplevel folder"
-#~ msgstr "Felső szintű mappa"
-
-#~ msgid "_Title:"
-#~ msgstr "_Cím:"
-
-#~ msgid "_Folder:"
-#~ msgstr "_Mappa:"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Utolsó ablakméret megjegyzése"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Az utolsó ablakméret megjegyzendő-e"
-
-#~ msgid "Last window width"
-#~ msgstr "Utolsó ablakszélesség"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Az utoljára mentett ablakszélesség"
-
-#~ msgid "Last window height"
-#~ msgstr "Utolsó ablakmagasság"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Az utoljára mentett ablakmagasság"
-
-#~ msgid "Last panel position"
-#~ msgstr "Utolsó panelpozíció"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Az utoljára mentett panelpozíció"
-
-#~ msgid "Last panel page"
-#~ msgstr "Utolsó paneloldal"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Az utoljára mentett paneloldal"
-
-#~ msgid "Last Web search"
-#~ msgstr "Utolsó webkeresés"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Az utoljára mentett webkeresés"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Menüsáv megjelenítése"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "A menüsáv megjelenítendő-e"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Navigációs sáv megjelenítése"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "A navigációs sáv megjelenítendő-e"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Könyvjelzősáv megjelenítése"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "A könyvjelzősáv megjelenítendő-e"
-
-#~ msgid "Show Panel"
-#~ msgstr "Panel megjelenítése"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "A panel megjelenítendő-e"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Állapotsor megjelenítése"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Az állapotsor megjelenítendő-e"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Eszköztárelemek"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Az eszköztáron megjelenítendő elemek"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Tömör oldalsáv"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Az oldalsáv tömören jelenjen-e meg"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Az oldalsáv jobbra igazítása"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Az oldalsáv jobbra legyen-e igazítva"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Panelek megnyitása külön ablakokban"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "A panelek mindig külön ablakokban nyíljanak-e meg"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Mi történjen a Midori indulásakor"
-
-#~ msgid "The homepage"
-#~ msgstr "A kezdőlap"
-
-#~ msgid "Show crash dialog"
-#~ msgstr "Összeomlási ablak megjelenítése"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "A letöltött fájlok ebbe a mappába kerülnek mentésre"
-
-#~ msgid "An external text editor"
-#~ msgstr "Külső szövegszerkesztő"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "Külső hírforrásolvasó"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Keresés a címsávban"
-
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "A címsávban végrehajtandó keresés"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Az előnyben részesített karakterkódolás"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Mindig jelenjen meg a lapsáv"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "A lapokon legyenek-e bezárás gombok"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Hol nyíljanak meg az új oldalak"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Az új lapok a háttérben nyíljanak-e meg"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Felugró ablakok megnyitása lapokon"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "A felugró ablakok lapokon nyíljanak-e meg"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "A képek automatikus letöltése és megnyitása"
-
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Beágyazott programnyelvek engedélyezése"
-
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Beágyazott Netscape bővítményobjektumok engedélyezése"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Helyesírás-ellenőrzés engedélyezése gépeléskor"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "HTML5 adatbázis-támogatás engedélyezése"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "A HTML5 adatbázis-támogatás engedélyezve legyen-e"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "A HTML5 helyi tárolás támogatása engedélyezve legyen-e"
-
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr ""
-#~ "A webalkalmazások kapcsolat nélküli gyorsítótára engedélyezve legyen-e"
-
-#~ 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"
-
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "A weboldalak használhatnak OpenGL renderelést"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "A szöveg és képek nagyítandók-e"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Beágyazott keresés gépeléskor"
-
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "Gépeléskor az automatikus beágyazott keresés használandó-e"
-
-#~ msgid "The type of proxy server to use"
-#~ msgstr "A használandó proxykiszolgáló típusa"
-
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP proxykiszolgáló"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "A HTTP kapcsolatokhoz használt proxykiszolgáló"
-
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "A HTTP kapcsolatokhoz használt proxykiszolgálóport"
-
-#~ msgid "Identification string"
-#~ msgstr "Azonosító karakterlánc"
-
-#~ msgid "The application identification string"
-#~ msgstr "Az alkalmazást azonosító karakterlánc"
-
-#~ msgid "Clear private data"
-#~ msgstr "Privát adatok törlése"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "A törlésre kiválasztott privát adatok"
-
-#~ msgid "Clear data"
-#~ msgstr "Adatok törlése"
-
-#~ msgid "The data selected for deletion"
-#~ msgstr "A törlésre kiválasztott adatok"
-
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "_Többi lap bezárása"
-
-#~ msgid "_Icon:"
-#~ msgstr "_Ikon:"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Találatok kiemelése"
-
-#~ msgid "Filter:"
-#~ msgstr "Szűrő:"
-
-#~ 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"
-
-#~ msgid "_Customize…"
-#~ msgstr "_Testreszabás…"
-
-#~ 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 "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 "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"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Nem sikerült letölteni az alkalmazásikont itt: %s: %s"
 
-#~ 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"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Megjelenjen-e értesítés átvitel befejeződésekor"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Download Manager"
-#~ msgstr "Letöltéskezelő"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Gyorsindító létrehozva"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Külső oldalak megnyitása:"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+"Most már lehetséges <b>%s</b> futtatása a gyorsindítóból vagy a menüből"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Hiba a gyorsindító létrehozásakor"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Milyen típusú sütiket fogadjon el"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Alkalmazások"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Sütik maximális kora"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Új _profil"
 
-#~ msgid "Maximum history age"
-#~ msgstr "Előzmények maximális kora"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Új, önálló profilt és egy gyorsindítót hoz létre"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Utoljára letöltött fájlok megjegyzése"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Új _alkalmazás"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Az utoljára letöltött fájlok megjegyzendők-e"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Egy új alkalmazást hoz létre egy megadott oldalhoz"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Nem található - %s"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Hiba az indításkor"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "Hivatkozás címének me_ntése"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "_Parancsikon létrehozása"
 
-#~ msgid "_Download Link destination"
-#~ msgstr "Hivatkozás címének l_etöltése"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Webalkalmazás kezelő"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "_Letöltés a letöltéskezelővel"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Alkalmazásként telepített weboldalak kezelése"
 
-#~ msgid "Download I_mage"
-#~ msgstr "_Kép letöltése"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Átvitelek"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Oszlopok és sorok számának beállítása"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Minden mező törlése"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Adja meg az oszlopok és sorok számát:"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "A gyorstárcsázó megadott mérete érvénytelen"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "_Célmappa megnyitása"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Bélyegkép mérete:"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Link _helyének másolása"
 
-#~ msgid "Small"
-#~ msgstr "Kicsi"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "A(z) „<b>%s</b>” fájl letöltve."
 
-#~ msgid "Medium"
-#~ msgstr "Közepes"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "„<b>%s</b>” és %d egyéb fájl került letöltésre."
 
-#~ msgid "Big"
-#~ msgstr "Nagy"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Átvitel kész"
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "A dokumentum nem jeleníthető meg"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Néhány fájl letöltése folyamatban"
 
-#~ msgid "General"
-#~ msgstr "Általános"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Kilépés a Midoriból"
 
-#~ msgid "Appearance"
-#~ msgstr "Megjelenés"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból."
 
-#~ msgid "Font settings"
-#~ msgstr "Betűkészlet-beállítások"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Átvitelkezelő"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Letöltött fájlok megtekintése"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "96 DPI kényszerítése"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "96 DPI képpontsűrűség kényszerítése"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Felület"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Navigationbar"
-#~ msgstr "Navigációs sáv"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "Külső alkalmazások"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Web Cookies"
-#~ msgstr "Webes sütik"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Sütik törlése a Midoriból kilépéskor"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Régi sütik törlése 1 óra után"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Régi sütik törlése 1 hét után"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Régi sütik törlése 1 év után"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "days"
-#~ msgstr "nap"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "_Reklámszűrők beállítása…"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Kijelölt bővítmény célmappájának megnyitása"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Not available: %s"
-#~ msgstr "Nem érhető el: %s"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Az erőforrásfájlok nincsenek telepítve"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Következő lap (előzménylista)"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Előző lap (előzménylista)"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Előző lap az előzményekből"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Lapváltás Ctrl+Tab-bal, az utolsó használat szerinti sorrendben"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "Oldaltároló"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Oldaltároló"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklámblokkoló"
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Oldalak nyitva tartása a lapokkal párhuzamosan"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Reklámok blokkolása szűrőlista alapján"
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Kiválasztott panel leválasztása az ablakról"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Reklámszűrők beállítása"
 
-#~ msgid "Hide operating controls"
-#~ msgstr "Vezérlők elrejtése"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Kép _blokkolása"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Helyesírás-ellenőrzés"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Hivatkozás blokkolása"
 
-#~ 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”"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Szabály szerkesztése"
 
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "A keresési előzmények törlése meghiúsult: %s\n"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "S_zabály:"
diff --git a/po/ia.po b/po/ia.po
new file mode 100644 (file)
index 0000000..a4108ab
--- /dev/null
+++ b/po/ia.po
@@ -0,0 +1,3433 @@
+# Interlingua translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-04-10 06:56+0000\n"
+"Last-Translator: Tea Coba <verdaludejo@outlook.com>\n"
+"Language-Team: Interlingua <ia@li.org>\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-Launchpad-Export-Date: 2015-04-11 05:10+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navigator Web"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Le Navigator Web Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Naviga le Web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorator"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nove scheda"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nove fenestra"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nove fenestra private"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Navigation private de Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Navigation private"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Aperir un nove fenestra private"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "DIRECTION"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Usar DOSSIER como dossier de configuration"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "DOSSIER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Navigation private, nulle cambios es salvate"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Modo portabile, tote le files runtime es immagazinate in un loco"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Monstrar un fenestra de dialogo diagnostic"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Executar le commando specificate"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Monstrar le version del programma"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Directiones"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PATRONO"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Reinitiar Midori depost de SECUNDOS secundos de inactivitate"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECUNDOS"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Per favor reporta commentarios, suggestiones e errores a:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Verificar pro versiones nove in:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Un error incognite occurreva"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Favoritos"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Adder _marcapaginas"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Extensiones"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historia"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Scripts de usator"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Stilos de usator"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Nove_Scheda"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Transferentias"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "E_xtensiones de Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nove _Fenestra"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_Dossier nove"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Directiones]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "File non trovate"
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Documento mal formate."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Formato de signa-libro incognite."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Ir al pagina sequente"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Ir al sub-pagina sequente"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Cercar in le web"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Recargar le pagina actual"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Stoppar le carga del pagina"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "mancate ajornamento del titulo: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Le valor «%s» non es valide pro %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Preparation impreviste '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Action impreviste '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Navigation Private)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Mancate insertion de nove elemento de historia: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Seliger [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Marcatores"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Nove Dossier"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Modificar le dossier"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nove Marcator"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Modificar le marcator"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Scribe un nomine pro iste marcator e selige ubi conservar lo"
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Scribe un nomine pro iste dossier e selige ubi conservar lo"
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Conservar file como"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Un nova fenestra ha essite aperite"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Un nove scheda aperiva"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Error de apertura del imagine!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+"On non pote aperir le imagine seligite in un fenestra base prefixate."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Falta de discargamento del imagine!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Conservar file"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "recargar le pagina sin caching"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Aperir file"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Adder un nove marcator"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Vacue"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "commutar le navigation del cursor del texto"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Aperir in un nove _fenestra"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Importar marcatores..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Application:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Marcatores de Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Fallite exportation del signa-libros"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Un navigator legier."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Vide about:version pro le information del version"
+
+#: ../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 ""
+"Iste libreria es un software libere; tu pote redistribuer lo o modificar lo "
+"sub le terminos del GNU Lesser General Public License como publicate per le "
+"Free Software Foundation; sia le version 2.1 del Licentia, o (a vostre "
+"option) qualcunque version subsequente."
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Emilio Sepulveda https://launchpad.net/~emisep-deactivatedaccount\n"
+"  Ivan Camilo Quintero Santacruz https://launchpad.net/~ivanca2291\n"
+"  Tea Coba https://launchpad.net/~verdaludejo\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_File"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Aperir un nove fenestra"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Aperir un nove scheda"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Nove F_enestra private"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Aperir un file"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Conservar pagina como..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Salveguardar a un file"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Clauder le scheda currente"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "_Clauder fenestra"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Imprimer le pagina actual"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Clauder _tote le fenestras"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Modificar"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Cercar..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Cercar un parola o phrase in le pagina"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Buscar _sequente"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Configurar le preferentias del application"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Vider"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Legibile"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Vader"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Ir retro al pagina previe"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Ir al sub-pagina previe"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Ir al sequente sub-pagina o al pagina sequente in le historia"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Pagina initial"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Il al pagina initial"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Vacuar corbe"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Adder un nove dossier"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Adjuta"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automatic"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinese Simplificate (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japonese (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Russo (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Occidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "personal…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Fallite initialisation del historia: %s"
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Cercar in le Web"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Schedas"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Menu"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Menu"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Le certificate ha expirate"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Exportar certificate"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Non verificate"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Monstrar pagina initial"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Monstrar Pagina Vacue"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Nove scheda"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Nove fenestra"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Predefinite"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Icones"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Icones parve"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Texto"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Icones e texto"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatic (GNOME o entorno)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Aperir %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori non conserva datos personal"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "sequente"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Initio"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Pagina initial"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Comportamento"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Habilita corrector orthographic"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Conservar files discargate como:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Navigation"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Aperir nove paginas in:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Nove comportamento de scheda:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Rete"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Porto"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Intimitate"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Extensiones"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Nomine:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Direction:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Aperir con"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI non valide"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Sequente"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Dossier vacue"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s e %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Adder un nove dossier"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Aperir in un Nove _Scheda"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historia"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Hodie"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Heri"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Historia de cerca"
+
+#: ../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 "Nomine de usator"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Contrasigno"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Memorar contrasigno"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Seliger file"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Seliger dossier"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 hora"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 die"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Non instalar"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Scripts de usator"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Error"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Gestion de cookies"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Deler toto"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Si"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Non"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Nomine"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Copiar le directiones del schedas"
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Discargar files con Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Discargar files con SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Commando:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Syndicationes"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Adder un nove syndication"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Deler syndication"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Syndicationes"
+
+#: ../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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Leger syndicationes Atom / RSS"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Non ora"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Acceptar"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blocar"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurar NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Politica"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Fenestra del navigator"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Miscite"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Negate"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Accessos directe"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Imagines"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Scripts"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Extentiones de Netscape"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activar le extentiones de 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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Icones de sito web"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Aperir schedas"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorar"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Le sito web %s vole conservar %d cookies."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Iste sito web %s vole conservar un cookie."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Cammino"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Valor"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applicationes"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nove _App"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Crea un nove app pro un sito specific"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Gestionar sitos web como applicationes"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transferentias"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Netta omne"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Le file '<b>%s</b>' esseva discargate."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' e %d altere files esseva discargate."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Gestion de transferentias"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Vider files discargate"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notas"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nove Nota"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nove nota"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Renominar nota"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiar selection como un nota"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Modificar regula"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regula:"
index 7dc703a4cc41c3f823f6cc49c0a1fa961cecae50..1300b129abf7446129d03c5c6a99118ead01d764 100644 (file)
--- a/po/id.po
+++ b/po/id.po
 # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the midori package.
 # Andhika Padmawan <andhika.padmawan@gmail.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-15 00:45+0000\n"
-"PO-Revision-Date: 2011-03-12 16:27+0700\n"
-"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-10 09:02+0000\n"
+"Last-Translator: Reynaldi Riva <boyfe98@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\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"
+"X-Launchpad-Export-Date: 2014-12-11 05:44+0000\n"
+"X-Generator: Launchpad (build 17283)\n"
+"Language: id\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Ramban Web"
-
-#: ../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:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Peramban Web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Peramban Web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Ramban Web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Jendela Peramban Privat Baru"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Tab Baru"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Jendela Baru"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Peramban Web"
+msgid "New Private Browsing Window"
+msgstr "Jendela Peramban Privat Baru"
 
 #: ../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
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Meramban Privat"
 
-#: ../midori/main.c:91 ../midori/main.c:97
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Konfigurasi tak dapat dimuat: %s\n"
-
-#: ../midori/main.c:145
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Nilai '%s' hanya sah untuk %s"
-
-#: ../midori/main.c:150 ../midori/main.c:254
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Nilai konfigurasi '%s' tidak sah"
-
-#: ../midori/main.c:365
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Mesin pencari tak dapat dimuat. %s\n"
-
-#: ../midori/main.c:419
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Gagal membersihkan riwayat: %s\n"
-
-#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
-#, 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
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Gagal menghapus item riwayat lama: %s\n"
-
-#: ../midori/main.c:535
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Konfigurasi tak dapat disimpan. %s"
-
-#: ../midori/main.c:561
-#, 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
-#, 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
-msgid "Extensions"
-msgstr "Ekstensi"
-
-#: ../midori/main.c:685
-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:767
-#, 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: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:1103
-msgid "Modify _preferences"
-msgstr "Ubah _pengaturan"
-
-#: ../midori/main.c:1107
-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
-msgid "Discard old tabs"
-msgstr "Abaikan tab lama"
-
-#: ../midori/main.c:1122 ../midori/midori-websettings.c:108
-msgid "Show last tabs without loading"
-msgstr "Tampilkan tab terakhir tanpa memuat"
-
-#: ../midori/main.c:1123 ../midori/midori-websettings.c:107
-msgid "Show last open tabs"
-msgstr "Tampilkan tab yang terakhir terbuka"
-
-#: ../midori/main.c:1370 ../midori/main.c:2382
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sesi tak dapat dimuat: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Buka jendela meramban privat baru"
 
-#: ../midori/main.c:1508
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Cuplikan layar disimpan ke: %s\n"
 
-#: ../midori/main.c:1837
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Jalankan ALAMAT sebagai sebuah aplikasi web"
 
-#: ../midori/main.c:1837
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ALAMAT"
 
-#: ../midori/main.c:1840
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Gunakan FOLDER sebagai folder konfigurasi"
 
-#: ../midori/main.c:1840
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1843
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Meramban privat, tak ada perubahan yang disimpan"
 
-#: ../midori/main.c:1846
+#: ../midori/main.c:86
 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
+#: ../midori/main.c:89
 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:91
 msgid "Show a diagnostic dialog"
 msgstr "Tampilkan dialog diagnosis"
 
-#: ../midori/main.c:1853
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Jalankan dalam gdb dan simpan backtrace saat crash"
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Jalankan nama berkas yang ditentukan sebagai javascript"
 
-#: ../midori/main.c:1855
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Ambil cuplikan layar dari URI yang ditentukan"
 
-#: ../midori/main.c:1857
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Eksekusi perintah yang ditentukan"
 
-#: ../midori/main.c:1859
+#: ../midori/main.c:101
 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:103
 msgid "Display program version"
 msgstr "Tampilkan versi program"
 
-#: ../midori/main.c:1863
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Alamat"
 
-#: ../midori/main.c:1865
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blok URI berdasarkan POLA ekspresi reguler"
 
-#: ../midori/main.c:1865
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "POLA"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1869
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Atur ulang Midori setelah DETIK detik tidak aktif"
 
-#: ../midori/main.c:1869
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "DETIK"
 
-#: ../midori/main.c:1872
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Mengalihkan peringatan konsol ke NAMABERKAS yang ditentukan"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Kesalahan: \"gdb\" tidak ditemukan\n"
 
-#: ../midori/main.c:1872
-msgid "FILENAME"
-msgstr "NAMABERKAS"
-
-#: ../midori/main.c:1961
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Silakan laporkan komentar, saran dan kutu ke:"
 
-#: ../midori/main.c:1963
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Cek versi baru di:"
 
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2102
-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"
-
-#. 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
-msgid "Web Cache"
-msgstr "Tembolok Web"
-
-#: ../midori/main.c:2111
-msgid "Website icons"
-msgstr "Ikon situs web"
-
-#: ../midori/main.c:2215
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Galat tak diketahui terjadi"
 
-#: ../midori/main.c:2330
-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
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Penanda tak dapat dimuat: %s\n"
-
-#: ../midori/main.c:2397
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Kotak sampah tak dapat dimuat: %s\n"
-
-#: ../midori/main.c:2410
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Riwayat tak dapat dimuat: %s\n"
-
-#: ../midori/main.c:2425
-msgid "The following errors occured:"
-msgstr "Galat berikut terjadi:"
-
-#: ../midori/main.c:2441
-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
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "B_ookmark"
 
-#: ../midori/midori-app.c:1373
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Tambah P_enanda"
 
-#: ../midori/midori-app.c:1374
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Ekstensi"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Riwayat"
 
-#: ../midori/midori-app.c:1376
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Skrip pengguna"
 
-#: ../midori/midori-app.c:1377
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Ga_ya pengguna"
 
-#: ../midori/midori-app.c:1378
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Tab _Baru"
 
-#: ../midori/midori-app.c:1379
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transfer"
 
-#: ../midori/midori-app.c:1380
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "P_lugin Netscape"
 
-#: ../midori/midori-app.c:1381
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Tab Tertutup"
 
-#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Jendela _Baru"
 
-#: ../midori/midori-app.c:1383
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "_Folder Baru"
 
-#: ../midori/midori-app.c:1437
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Alamat]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Berkas tak ditemukan."
 
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Dokumen salah bentuk."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Format penanda tak dikenal."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Penulisan gagal."
-
-#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 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:326
+msgid "Web Search…"
+msgstr "Pencarian Web…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Muat ulang halaman ini"
 
-#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stop memuat halaman ini"
 
-#: ../midori/midori-browser.c:519
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Gagal memutakhirkan judul: %s\n"
 
-#: ../midori/midori-browser.c:614
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Nilai '%s' tidak sah untuk %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Pengaturan tak diharapkan '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Aksi tak diharapkan '%s'."
+
+#: ../midori/midori-browser.c:723
 #, 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
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Gagal memasukkan item riwayat baru: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Pilih [teks]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Penanda"
 
-#: ../midori/midori-browser.c:826
-msgid "New folder"
-msgstr "Folder baru"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Folder Baru"
 
-#: ../midori/midori-browser.c:826
-msgid "Edit folder"
-msgstr "Sunting folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Ubah Folder"
 
-#: ../midori/midori-browser.c:828
-msgid "New bookmark"
-msgstr "Penanda baru"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Penanda Baru"
 
-#: ../midori/midori-browser.c:828
-msgid "Edit bookmark"
-msgstr "Sunting penanda"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Ubah 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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Tulis nama penanda, dan pilih tempat meletakanya"
 
-#: ../midori/midori-browser.c:923
-msgid "Add to _Speed Dial"
-msgstr "Tambah ke Panggil _Cepat"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Tulis nama penanda, dan pilih tempat meletakanya"
 
-#: ../midori/midori-browser.c:929
-msgid "Show in the tool_bar"
-msgstr "Tampilkan di _batang alat"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "tampilkan di _Bilah Penanda"
 
-#: ../midori/midori-browser.c:937
-msgid "Run as _web application"
-msgstr "Jalankan sebagai aplikasi _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Tambah ke Panggil _Cepat"
 
-#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Simpan berkas sebagai"
 
-#: ../midori/midori-browser.c:1065
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Simpan sumbe_r terkait"
 
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Sebuah jendela baru telah dibuka"
 
-#: ../midori/midori-browser.c:1326
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Sebuah tab baru telah dibuka"
 
-#: ../midori/midori-browser.c:1343
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Galat membuka gambar!"
 
-#: ../midori/midori-browser.c:1344
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Tak dapat membuka gambar terpilih di penampil standar."
 
-#: ../midori/midori-browser.c:1350
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Gagal mengunduh gambar!"
 
-#: ../midori/midori-browser.c:1351
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Tak dapat mengunduh gambar terpilih."
 
-#: ../midori/midori-browser.c:1408
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Simpan berkas"
 
-#: ../midori/midori-browser.c:2335
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Muat ulang halaman tanpa menyimpan tembolok"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Buka berkas"
 
-#: ../midori/midori-browser.c:2467
+#: ../midori/midori-browser.c:2692
 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,24 +383,24 @@ msgstr ""
 "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:2698 ../extensions/feed-panel/main.c:350
 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:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Tambah penanda baru"
 
-#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Kosong"
 
-#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Ubah navigasi kursor teks"
 
-#: ../midori/midori-browser.c:3509
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -586,130 +408,99 @@ msgstr ""
 "Menekan tombol F7 akan mengalihkan mode Ramban Caret. Bila aktif, kursor "
 "teks akan muncul di semua situs web."
 
-#: ../midori/midori-browser.c:3512
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Aktifkan Mode Ramban Ca_ret"
 
-#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
-#, 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:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Buka di _Jendela Baru"
 
-#: ../midori/midori-browser.c:4329
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4331
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4332
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4334
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4335
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4356
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Impor penanda…"
 
-#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Impor penanda"
 
-#: ../midori/midori-browser.c:4370
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplikasi:"
 
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Impor dari berkas XBEL atau HTML"
 
-#: ../midori/midori-browser.c:4463
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Impor dari berkas"
 
-#: ../midori/midori-browser.c:4475
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Gagal mengimpor penanda"
 
-#: ../midori/midori-browser.c:4509
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Penanda XBEL"
 
-#: ../midori/midori-browser.c:4514
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Penanda Netscape"
 
-#: ../midori/midori-browser.c:4528
+#: ../midori/midori-browser.c:4546
 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:4558
 msgid "Failed to export bookmarks"
 msgstr "Gagal mengekspor penanda"
 
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4665
-msgid "Clear Private Data"
-msgstr "Hapus Data Pribadi"
-
-#: ../midori/midori-browser.c:4669
-msgid "_Clear private data"
-msgstr "_Hapus data pribadi"
-
-#: ../midori/midori-browser.c:4684
-msgid "Clear the following data:"
-msgstr "Hapus data berikut:"
-
-#: ../midori/midori-browser.c:4694
-msgid "Last open _tabs"
-msgstr "Tab terakhir dibuka"
-
-#: ../midori/midori-browser.c:4720
-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
+#: ../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 "
@@ -721,924 +512,947 @@ msgstr ""
 "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:4780
 msgid "translator-credits"
-msgstr "Andhika Padmawan <andhika.padmawan@gmail.com>"
+msgstr ""
+"Andhika Padmawan <andhika.padmawan@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Alfie Ilhamsyah https://launchpad.net/~reikanou-issen\n"
+"  Dani Pratomo https://launchpad.net/~daneepee\n"
+"  Reynaldi Riva https://launchpad.net/~boyfe98\n"
+"  Reza Faiz A Rahman https://launchpad.net/~rezafaiza\n"
+"  Risman Rangga Pratama https://launchpad.net/~imanrp\n"
+"  Rizal Muttaqin https://launchpad.net/~sundaralinux\n"
+"  Viko Adi Rahmawan https://launchpad.net/~vikoadi\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Yudha Yudhistira https://launchpad.net/~yudhayudhistira94\n"
+"  padmawan https://launchpad.net/~andhika-padmawan"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplikasi Tab Saat Ini"
 
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Buka di jendela baru"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Buka di tab baru"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Jendela Meramban P_rivat Baru"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Buka berkas"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Simpan Halaman Sebagai…"
 
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Simpan ke berkas"
 
-#: ../midori/midori-browser.c:5402
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Tambah ke Panggil _cepat"
 
-#: ../midori/midori-browser.c:5406
-msgid "Add Shortcut to the _desktop"
-msgstr "Tambah jalan pintas ke _desktop"
-
-#: ../midori/midori-browser.c:5408
-msgid "Create _Launcher"
-msgstr "Buat _Peluncur"
-
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Berlangganan ke umpan _berita"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Tutup Tab"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Tutup tab saat ini"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "T_utup Jendela"
 
-#: ../midori/midori-browser.c:5425
-msgid "_Share"
-msgstr "Ba_gikan"
-
-#: ../midori/midori-browser.c:5430
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Cetak halaman saat ini"
 
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "T_utup semua Jendela"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../midori/midori-browser.c:5459
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Cari…"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "Cari _Berikutnya"
 
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Cari _Sebelumnya"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Konfigurasi pilihan aplikasi"
 
-#: ../midori/midori-browser.c:5471
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Tampilan"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Batang Alat"
 
-#: ../midori/midori-browser.c:5477
-msgid "Reload page without caching"
-msgstr "Muat ulang halaman tanpa menyimpan tembolok"
-
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Naikkan level pembesaran"
 
-#: ../midori/midori-browser.c:5490
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Turunkan level pembesaran"
 
-#: ../midori/midori-browser.c:5494
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Penyandian"
 
-#: ../midori/midori-browser.c:5496
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Tampilkan S_umber"
 
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Meramban Ca_ret"
 
-#: ../midori/midori-browser.c:5503
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Aktifkan tampilan layar penuh"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Gulung _Kiri"
 
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Gulung _Bawah"
 
-#: ../midori/midori-browser.c:5511
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Gulung _Atas"
 
-#: ../midori/midori-browser.c:5514
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "_Gulung Kanan"
 
-#: ../midori/midori-browser.c:5517
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Dapat  Dibaca"
 
-#: ../midori/midori-browser.c:5520
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ke"
 
-#: ../midori/midori-browser.c:5523
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Mundur ke halaman sebelumnya"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Maju ke sub-halaman sebelumnya"
 
-#: ../midori/midori-browser.c:5539
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Beranda"
 
-#: ../midori/midori-browser.c:5540
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ke laman anda"
 
-#: ../midori/midori-browser.c:5542
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Kosongkan Tempat Sampah"
 
-#: ../midori/midori-browser.c:5545
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Tak _Jadi Tutup Tab"
 
-#: ../midori/midori-browser.c:5552
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Tambah sebuah _folder baru"
 
-#: ../midori/midori-browser.c:5558
-msgid "_Export bookmarks"
-msgstr "_Ekspor penanda"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
-msgid "_Manage Search Engines"
-msgstr "_Atur Mesin Pencari"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5564
-msgid "_Clear Private Data"
-msgstr "_Hapus Data Pribadi"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:5567
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspeksi Halaman"
 
-#: ../midori/midori-browser.c:5571
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Tab Sebelumnya"
 
-#: ../midori/midori-browser.c:5574
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Tab _Berikutnya"
 
-#: ../midori/midori-browser.c:5576
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Pindah tab ke posisi _pertama"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "_Geser Tab ke Belakang"
 
-#: ../midori/midori-browser.c:5578
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Geser Tab ke Depan"
 
-#: ../midori/midori-browser.c:5581
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Pindah Tab ke posisi _terakhir"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Fokus _Tab Saat Ini"
 
-#: ../midori/midori-browser.c:5584
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Tampilan Fokus _Berikutnya"
 
-#: ../midori/midori-browser.c:5587
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Hanya tampilkan Ikon dari Tab _Terkini"
 
-#: ../midori/midori-browser.c:5590
-msgid "_Duplicate Current Tab"
-msgstr "_Duplikasi Tab Saat Ini"
-
-#: ../midori/midori-browser.c:5593
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Tutup Tab Lainnya"
 
-#: ../midori/midori-browser.c:5596
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Buka _sesi terakhir"
 
-#: ../midori/midori-browser.c:5599
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../midori/midori-browser.c:5601
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Pertanyaan Sering Ditanyakan"
 
-#: ../midori/midori-browser.c:5604
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Laporkan Masalah…"
 
-#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Alat"
 
-#: ../midori/midori-browser.c:5616
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Batang menu"
 
-#: ../midori/midori-browser.c:5620
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Batang _navigasi"
 
-#: ../midori/midori-browser.c:5624
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Panel _sisi"
 
-#: ../midori/midori-browser.c:5625
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panel sisi"
 
-#: ../midori/midori-browser.c:5628
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Batang _penanda"
 
-#: ../midori/midori-browser.c:5632
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Batang stat_us"
 
-#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Otomatis"
 
-#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Mandarin Tradisional (BIG5)"
 
-#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Mandarin Sederhana (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5651
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Jepang (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rusia (KOI8-R)"
 
-#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Barat (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5666
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Suai…"
 
-#: ../midori/midori-browser.c:6176
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Pemisah"
 
-#: ../midori/midori-browser.c:6183
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Lokasi…"
 
-#: ../midori/midori-browser.c:6185
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Buka lokasi khusus"
 
-#: ../midori/midori-browser.c:6207
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Penelusuran _Web…"
 
-#: ../midori/midori-browser.c:6209
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Jalankan penelusuran web"
 
-#: ../midori/midori-browser.c:6236
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Tampilkan penanda tersimpan"
 
-#: ../midori/midori-browser.c:6286
-msgid "_Window"
-msgstr "_Jendela"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tab"
 
-#: ../midori/midori-browser.c:6288
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Tampilkan senarai semua tab yang terbuka"
 
-#: ../midori/midori-browser.c:6302
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6304
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
-#: ../midori/midori-browser.c:7134
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Pengaturan tak diharapkan '%s'"
-
-#: ../midori/midori-extension.c:330
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Gagal memilih dari riwayat\n"
-
-#: ../midori/midori-locationaction.c:632
-#, c-format
-msgid "Search for %s"
-msgstr "Mencari %s"
-
-#: ../midori/midori-locationaction.c:1227
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Ekspor sertifikat"
 
-#: ../midori/midori-locationaction.c:1259
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Otoritas penanda validitas sertifikat; tidak dikenal."
 
-#: ../midori/midori-locationaction.c:1261
+#: ../midori/midori-locationaction.c:1358
 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
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Waktu aktivasi sertifikat masih dalam masa tunggu."
 
-#: ../midori/midori-locationaction.c:1265
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Masa berlaku sertifikat telah kadaluarsa"
 
-#: ../midori/midori-locationaction.c:1267
+#: ../midori/midori-locationaction.c:1364
 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
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Algoritma sertifikat dinilai tidak aman."
 
-#: ../midori/midori-locationaction.c:1271
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Beberapa galat terjadi saat memvallidasi sertifikat."
 
-#: ../midori/midori-locationaction.c:1318
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Ekspor sertifikat"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Tandatangan mandiri"
 
-#: ../midori/midori-locationaction.c:1367
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Rincian keamanan"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1650
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Tempel dan l_anjutkan"
 
-#: ../midori/midori-locationaction.c:1974
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Tidak diverifikasi"
 
-#: ../midori/midori-locationaction.c:1982
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Koneksi terverifikasi dan terenkripsi"
 
-#: ../midori/midori-locationaction.c:1989
+#: ../midori/midori-locationaction.c:1814
 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:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 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:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Tutup panel"
 
-#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Ratakan panel sisi ke kiri"
 
-#: ../midori/midori-websettings.c:105
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Tampilkan Panggil cepat"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Tampilkan Beranda"
 
-#: ../midori/midori-websettings.c:125
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Tampilkan tab yang terakhir terbuka"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Tampilkan tab terakhir tanpa memuat"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Tampilkan Halaman Kosong"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Tampilkan mesin pencari bawaan"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 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:172
 msgid "New tab"
 msgstr "Tab baru"
 
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Jendela baru"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Tab saat ini"
 
-#: ../midori/midori-websettings.c:162
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Standar"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikon"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Ikon kecil"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Teks"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikon dan teks"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Teks di samping ikon"
 
-#: ../midori/midori-websettings.c:182
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Otomatis (GNOME atau lingkungan)"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Server proxy HTTP"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Tak ada server proxy"
 
-#: ../midori/midori-websettings.c:201
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:278
-msgid "Toolbar Style:"
-msgstr "Gaya Batang Alat:"
-
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Gaya dari batang alat"
 
-#: ../midori/midori-websettings.c:288
-msgid "When Midori starts:"
-msgstr "Jika Midori dijalankan:"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Selalu gunakan fonta pilihan saya"
 
-#: ../midori/midori-websettings.c:298
-msgid "Preferred Encoding"
-msgstr "Penyandian Kesukaan"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Timpa fonta yang dipilih oleh situs web dengan pengaturan pengguna"
 
-#: ../midori/midori-websettings.c:325
-msgid "Open new pages in:"
-msgstr "Buka halaman baru di:"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Konfigurasi tak dapat dimuat: %s\n"
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:388
-msgid "Identify as"
-msgstr "Identifikasi sebagai"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Nilai konfigurasi '%s' tidak sah"
 
-#: ../midori/midori-websettings.c:389
-msgid "What to identify as to web pages"
-msgstr "Apa yang diidentifikasi sebagai halaman web"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:422
-msgid "Preferred languages"
-msgstr "Penyandian kesukaan"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Tampilkan _Label Tab"
 
-#: ../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-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Hanya Tampilkan _Ikon Tab"
 
-#: ../midori/midori-websettings.c:472
-msgid "Always use my font choices"
-msgstr "Selalu gunakan fonta pilihan saya"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Tutup Tab Lainnya"
 
-#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Masukkan dalam daftar situs terpercaya"
 
-#: ../midori/midori-view.c:1149
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Tingkat keamanan tidak diketahui"
 
-#: ../midori/midori-view.c:1447
+#: ../midori/midori-view.c:1025
 #, 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:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Tolak"
 
-#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Izinkan"
 
-#: ../midori/midori-view.c:1480
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s ingin mengetahui lokasi anda."
 
-#: ../midori/midori-view.c:1576
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "Pastikan kabel ethernet tertancap atau wireless card aktif"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Pastikan pengaturan jaringan sudah benar"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Coba Lagi"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "Galat - %s"
+msgid "Oops - %s"
+msgstr "Aduh - %s"
 
-#: ../midori/midori-view.c:1577
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Halaman bernama '%s' tak dapat dimuat"
+msgid "Something went wrong with '%s'."
+msgstr "Kesalahan terjadi pada '%s'"
 
-#: ../midori/midori-view.c:1579
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Coba lagi"
 
-#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Kirim sebuah pesan ke %s"
 
-#: ../midori/midori-view.c:2673
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Tambah me_sin pencari..."
 
-#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
-msgid "Inspect _Element"
-msgstr "Inspeksi _Elemen"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Buka _Link"
 
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Buka Taut di _Tab Baru"
 
-#: ../midori/midori-view.c:2773
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Buka Tautan di _Tab Depan"
 
-#: ../midori/midori-view.c:2774
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Buka Tautan di _Tab Belakang"
 
-#: ../midori/midori-view.c:2777
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Buka Tautan di _Jendela Baru"
 
-#: ../midori/midori-view.c:2780
-msgid "Open Link as Web A_pplication"
-msgstr "Buka Tautan Sebagai A_plikasi Web"
-
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Salin Tu_juan Tautan"
 
-#: ../midori/midori-view.c:2801
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Simp_an Sebagai..."
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Buka Gambar d_i Jendela Baru"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Buka Gambar di _Tab Baru"
 
-#: ../midori/midori-view.c:2804
-msgid "Copy Image _Address"
-msgstr "Salin _Alamat Gambar"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "S_alin gambar"
 
-#: ../midori/midori-view.c:2807
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Simpan Ga_mbar"
 
-#: ../midori/midori-view.c:2810
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Buka di _Penampil Gambar"
 
-#: ../midori/midori-view.c:2817
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Salin _Alamat Video"
 
-#: ../midori/midori-view.c:2820
-msgid "Save _Video"
-msgstr "Simpan _Video"
-
-#: ../midori/midori-view.c:2820
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Unduh _Video"
 
-#: ../midori/midori-view.c:2846
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Buka Alamat di _Tab Baru"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Cari _dengan"
 
-#: ../midori/midori-view.c:2878
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Cari web"
 
-#: ../midori/midori-view.c:2895
-msgid "Open Address in New _Tab"
-msgstr "Buka Alamat di _Tab Baru"
-
-#: ../midori/midori-view.c:2948
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Buka _Bingkai di Tab Baru"
 
-#: ../midori/midori-view.c:3203
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspeksi _Elemen"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Buka atau unduh berkas dari %s"
 
-#: ../midori/midori-view.c:3216
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nama Berkas: %s"
 
-#: ../midori/midori-view.c:3221
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipe Berkas: '%s'"
 
-#: ../midori/midori-view.c:3223
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipe Berkas: %s ('%s')"
 
-#: ../midori/midori-view.c:3260
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Ukuran: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3271
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Buka %s"
 
-#: ../midori/midori-view.c:3882
+#: ../midori/midori-view.c:3313
 #, 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:4356
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori tidak menyimpan data pribadi apapun:"
 
-#: ../midori/midori-view.c:4357
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Tak ada riwayat atau kuki web yang disimpan."
 
-#: ../midori/midori-view.c:4358
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Ekstensi dinonaktifkan."
 
-#: ../midori/midori-view.c:4359
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "Penyimpanan HTML5, basis data lokal dan tembolok aplikasi dinonaktifkan."
 
-#: ../midori/midori-view.c:4360
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori mencegah situs web melacak pengguna:"
 
-#: ../midori/midori-view.c:4361
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Perujuk URL dicopot dari nama host."
 
-#: ../midori/midori-view.c:4362
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Praambil DNS dinonaktifkan."
 
-#: ../midori/midori-view.c:4363
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Bahasa dan zona waktu tidak diberikan ke situs web."
 
-#: ../midori/midori-view.c:4364
+#: ../midori/midori-view.c:3906
 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:4450
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "Nomor versi dalam kurung menunjukkan versi yang digunakan dalam runtime."
 
-#: ../midori/midori-view.c:4499
-msgid "Page loading delayed"
-msgstr "Memuat halaman ditunda"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-view.c:4500
+#: ../midori/midori-view.c:4000
 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:4002
 msgid "Load Page"
 msgstr "Memuat Halaman"
 
-#: ../midori/midori-view.c:4668
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Halaman kosong"
 
-#: ../midori/midori-view.c:4932
-msgid "_Duplicate Tab"
-msgstr "_Duplikasi Tab"
-
-#: ../midori/midori-view.c:4937
-msgid "Show Tab _Label"
-msgstr "Tampilkan _Label Tab"
-
-#: ../midori/midori-view.c:4937
-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
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "sebelumnya"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5720
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "berikutnya"
 
-#: ../midori/midori-view.c:5733
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Cetak gambar latar belakang"
 
-#: ../midori/midori-view.c:5734
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Apakah gambar latar belakang harus dicetak"
 
-#: ../midori/midori-view.c:5766
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Fitur"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:48
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s dari %s"
 
-#: ../midori/midori-download.vala:64
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: ../midori/midori-download.vala:65
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d menit"
 
-#: ../midori/midori-download.vala:66
+#: ../midori/midori-download.vala:77
 #, 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
+#: ../midori/midori-download.vala:92
 #, 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
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:94
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:188
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Berkas yang diunduh galat."
 
-#: ../midori/midori-download.vala:189
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1646,154 +1460,159 @@ msgstr ""
 "Checksum yang disediakan oleh tautan tidak cocok. Hal ini mungkin berarti "
 "berkas tidak lengkap atau dimodifikasi setelahnya."
 
-#: ../midori/midori-download.vala:300
+#: ../midori/midori-download.vala:366
 #, 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
+#: ../midori/midori-download.vala:368
 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
+#: ../midori/midori-download.vala:371
 #, 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
+#: ../midori/midori-download.vala:373
 #, 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
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Panggil cepat"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klik untuk menambah jalan pintas"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Masukkan alamat jalan pintas"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Masukkan judul jalan pintas"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Mulai"
 
-#: ../midori/midori-preferences.c:305
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Saat Midori dijalankan:"
+
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Beranda:"
 
-#: ../midori/midori-preferences.c:313
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Gunakan _halaman saat ini"
 
-#: ../midori/midori-preferences.c:317
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Gunakan halaman saat ini sebagai beranda"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Fonta"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Keluarga Fonta Proporsional"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Keluarga Fonta Sesuai Lebar"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Ukuran Fonta Minimum"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Ukuran fonta minimum yang digunakan untuk menampilkan teks"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Penyandian Kesukaan"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Perilaku"
 
-#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Muat gambar secara otomatis"
 
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Aktifkan Pemeriksa Ejaan"
 
-#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../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 "Enable WebGL support"
+msgstr "Aktifkan dukungan WebGL"
+
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Pembesaran Teks dan Gambar"
 
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Izinkan skrip untuk membuka popup"
 
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:412
 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:414
+msgid "Default Zoom Level"
+msgstr ""
 
-#: ../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:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-preferences.c:414
-msgid "Enable WebGL support"
-msgstr "Aktifkan dukungan WebGL"
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Urutan pemakaian bahasa"
 
-#: ../midori/midori-preferences.c:419
-msgid "Flash window on background tabs"
-msgstr "Kedipkan jendela yang membuka tab di latar belakang"
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
 msgid "Save downloaded files to:"
@@ -1804,184 +1623,336 @@ msgstr "Simpan berkas yang diunduh ke:"
 msgid "Browsing"
 msgstr "Meramban"
 
-#: ../midori/midori-preferences.c:451
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Gaya Batang Alat:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Buka halaman baru di:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
 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
+#: ../midori/midori-preferences.c:486
 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"
+#: ../midori/midori-preferences.c:487
+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
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Buka Tab di Latar Belakang"
 
-#: ../midori/midori-preferences.c:467
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Penyunting Teks"
 
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregator Berita"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:479
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Jaringan"
 
-#: ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: ../midori/midori-preferences.c:486
-msgid "Hostname"
-msgstr "Nama Host"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:494
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Pangkalan"
 
-#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Tembolok Web"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:957
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identifikasi sebagai"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privasi"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Hapus kuki lama setelah:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Jumlah maksimum hari untuk menyimpan kuki"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Hanya terima kuki dari situs yang anda kunjungi"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Blok kuki yang dikirim dari situs web pihak ketiga"
+
+#: ../midori/midori-preferences.c:599
+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/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Aktifkan tembolok aplikasi web luring"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Aktifkan dukungan penyimpanan lokal HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Hapus halaman dari riwayat setelah:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Pengaya"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Atur Mesin Pencari"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Tambah mesin pencari"
 
-#: ../midori/midori-searchaction.c:957
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Sunting mesin pencari"
 
-#: ../midori/midori-searchaction.c:985
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: ../midori/midori-searchaction.c:1000
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Keterangan:"
 
-#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Alamat"
 
-#: ../midori/midori-searchaction.c:1032
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Token:"
 
-#: ../midori/midori-searchaction.c:1330
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Atur Mesin Pencari"
 
-#: ../midori/midori-searchaction.c:1432
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Gunakan sebagai stan_dar"
 
-#: ../midori/sokoke.c:353
-msgid "Open with"
-msgstr "Buka dengan"
-
-#: ../midori/sokoke.c:361
+#: ../midori/midori-searchaction.c:1619
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":"
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Mesin pencari tak dapat dimuat. %s\n"
 
-#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
-msgid "Could not run external program."
-msgstr "Tak dapat menjalankan program eksternal."
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Mesin pencari tak dapat disimpan. %s"
 
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:265
-msgid "_Inline Find:"
-msgstr "_Cari Dalam Baris:"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../toolbars/midori-findbar.c:287
-msgid "Previous"
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Mencari %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Cari dengan…"
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Cari %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Buka dengan"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Tak dapat menjalankan program eksternal."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI Tidak Sah"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Cari Dalam Baris:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../toolbars/midori-findbar.c:293
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Berikutnya"
 
-#: ../toolbars/midori-findbar.c:297
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Cocokkan Huruf"
 
-#: ../toolbars/midori-findbar.c:306
-msgid "Highlight Matches"
-msgstr "Sorot Kecocokan"
-
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Tutup batang cari"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Berkas '<b>%s</b>' telah diunduh."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d penanda"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Transfer selesai"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Bersihkan Semua"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "folder kosong"
 
-#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
-msgid "Some files are being downloaded"
-msgstr "Beberapa berkas sedang diunduh"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "folder berisi %s dan tak ada penanda"
 
-#: ../toolbars/midori-transferbar.c:278
-msgid "_Quit Midori"
-msgstr "_Keluar Midori"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "folder berisi %s"
 
-#: ../toolbars/midori-transferbar.c:280
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Transfer akan dibatalkan jika Midori keluar."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "folder berisi %s dan %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Gagal menambah item penanda: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Penanda mengarah ke:%s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s dan tak ada penanda"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Gagal memutakhirkan penanda : %s\n"
+msgid "%s and %s"
+msgstr "%s dan %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Sunting penanda terpilih"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Hapus penanda terpilih"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Tambah folder baru"
 
-#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Pemisah</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Buka di _Tab Baru"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1027
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Cari dalam Penanda"
 
@@ -1989,62 +1960,50 @@ msgstr "Cari dalam Penanda"
 msgid "History"
 msgstr "Riwayat"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Hari Ini"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Kemarin"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Seminggu yang lalu"
 
-#: ../panels/midori-history.c:232
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Gagal menghapus item riwayat: %s\n"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:312
 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:358
 msgid "Bookmark the selected history item"
 msgstr "Bookmark item riwayat terpilih"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Hapus item riwayat terpilih"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Bersihkan seluruh riwayat"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:997
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Cari dalam Riwayat"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Transfer"
-
-#: ../panels/midori-transfers.c:435
-msgid "Open Destination _Folder"
-msgstr "Buka _Folder Tujuan"
-
-#: ../panels/midori-transfers.c:438
-msgid "Copy Link Loc_ation"
-msgstr "Salin Tautan Lok_asi"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Otentikasi Diperlukan"
@@ -2069,112 +2028,63 @@ msgstr "Sandi"
 msgid "_Remember password"
 msgstr "_Ingat sandi"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Ikon bernama '%s' tak dapat dimuat"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Stok ikon '%s' tak dapat dimuat"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Bingkai animasi rusak"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Tak ada"
 
-#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
+#: ../katze/katze-utils.c:529
 #, 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:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Pilih berkas"
 
-#: ../katze/katze-utils.c:504
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Pilih folder"
 
-#: ../katze/katze-utils.c:602
-msgid "None"
-msgstr "Tak ada"
-
-#: ../katze/katze-utils.c:717
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 jam"
 
-#: ../katze/katze-utils.c:718
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 hari"
 
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 minggu"
 
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 bulan"
 
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 tahun"
 
-#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Pengaturan untuk %s"
 
-#: ../katze/midori-uri.vala:173
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:180
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:495
-msgid "Configure Advertisement filters"
-msgstr "Atur filter Iklan"
-
-#: ../extensions/adblock.c:528
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Masukkan alamat dari senarai filter yang telah dikonfigurasikan sebelumnya "
-"dalam entri teks dan klik \"Tambah\" untuk menambahkannya ke senarai. Anda "
-"dapat menemukan lebih banyak senarai di %s."
-
-#: ../extensions/adblock.c:944
-msgid "Edit rule"
-msgstr "Sunting aturan"
-
-#: ../extensions/adblock.c:958
-msgid "_Rule:"
-msgstr "_Aturan:"
-
-#: ../extensions/adblock.c:1012
-msgid "Bl_ock image"
-msgstr "Bl_ok gambar"
-
-#: ../extensions/adblock.c:1017
-msgid "Bl_ock link"
-msgstr "Bl_ok tautan"
-
-#: ../extensions/adblock.c:1915
-msgid "Advertisement blocker"
-msgstr "Pemblokir Iklan"
-
-#: ../extensions/adblock.c:1916
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+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?"
@@ -2197,71 +2107,71 @@ msgstr "_Instal gaya pengguna"
 msgid "Don't install"
 msgstr "Jangan instal"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Skrip pengguna"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Gaya pengguna"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Galat"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Anda ingin menghapus '%s'?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Hapys skrip pengguna"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Hapus gaya pengguna"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Berkas '<b>%s</b>' akan secara permanen dihapus."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Buka di Penyunting Teks"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Buka Folder Tujuan"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Tambah pengaya baru"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Hapus pengaya terpilih"
 
-#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Pengaya pengguna"
 
-#: ../extensions/addons.c:1817
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Tak dapat memonitor folder '%s': %s"
 
-#: ../extensions/addons.c:1906
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Dukungan untuk skrip pengguna dan gaya pengguna"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Tab Penuh Warna"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Warnai tiap tab dengan jelas"
 
@@ -2270,11 +2180,11 @@ msgstr "Warnai tiap tab dengan jelas"
 msgid "Cookie Manager"
 msgstr "Manajer Kuki"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Hapus Semua"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2282,31 +2192,31 @@ 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:116
 msgid "Expand All"
 msgstr "Perluas Semua"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Perkecil Semua"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Pertanyaan"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 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:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2323,15 +2233,16 @@ msgstr ""
 "<b>Keamanan</b>: %s\n"
 "<b>Kadaluwarsa</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ya"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Tidak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2340,19 +2251,20 @@ msgstr ""
 "<b>Ranah</b>: %s\n"
 "<b>Kuki</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1017
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nama"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1069
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Perluas Semua"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "P_erkecil Semua"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Cari Kuki berdasarkan Nama atau Domain"
 
@@ -2360,46 +2272,110 @@ msgstr "Cari Kuki berdasarkan Nama atau Domain"
 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"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Jangan muat halaman sebelum tab digunakan."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Gagal untuk mencari elemen Atom \"lema\" yang diperlukan di data XML."
+msgstr ""
+"Gagal untuk mencari elemen Atom \"lema\" yang diperlukan di data XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Gagal untuk mencari elemen Atom \"umpan\" yang diperlukan di data XML."
+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:367
 #, 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:620
 msgid "Feeds"
 msgstr "Umpan"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Tambah umpan baru"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Hapus umpan"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Umpan"
 
@@ -2408,60 +2384,60 @@ msgstr "_Umpan"
 msgid "Failed to find root element in feed XML data."
 msgstr "Gagal mencari elemen root di umpan data XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Format umpan tak didukung."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Gagal menguraikan umpan XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Gagal mencari elemen \"kanal\" di data XML RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Versi RSS tak didukung telah ditemukan."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Gagal mencari elemen \"item\" RSS yang diperlukan di data XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Gagal mencari elemen \"kanal\" RSS yang diperlukan di data XML."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Umpan '%s' telah ada"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Gagal memuat umpan '%s'"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel Umpan"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Baca umpan Atom/ RSS"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "Gagal menambah nilai bentuk: %s\n"
 
-#: ../extensions/formhistory/formhistory.c:95
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "Riwayat bentuk"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
@@ -2469,1011 +2445,1036 @@ msgstr ""
 "Sebuah nama pengguna dan sebuah sandi diperlukan\n"
 "untuk membuka lokasi ini:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Ingat sandi di halaman ini?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Ingat"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Jangan sekarang"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Tidak pernah untuk halaman ini"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Ubah status formulir riwayat"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Ubah status aktif formulir riwayat untuk tab ini."
 
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Gagal mengeksekusi pernyataan basis data: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:629
+#: ../extensions/formhistory/formhistory.c:598
 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
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Formulir pengisi riwayat"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 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/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Gagal memilih saran\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Tidak ada tab yang belum dikunjungi"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Senarai-Riwayat"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Perilaku menutup tab"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Jangan lakukan apapun"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Pindah ke tab terakhir yang ditampilkan"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Pindah ke tab terbaru"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Kedipkan jendela yang membuka tab di latar belakang"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Tab baru Berikutnya (Senarai Riwayat)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Tab baru berikutnya dari riwayat"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Tab baru Sebelumnya (Senarai Riwayat)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Tab baru sebelumnya dari riwayat"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Tampilkan tab di latar belakang (Senarai Riwayat)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 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:648
 msgid "History List"
 msgstr "Senarai Riwayat"
 
-#: ../extensions/history-list.vala:567
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Pindah ke tab terakhir digunakan ketika berpindah atau menutup tab"
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
-msgstr "Gerak Tetikus"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
 
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
-msgstr "Kendalikan Midori dengan menggerakkan tetikus"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Setuju"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "Muat ulang halamat atau stop memuat"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokir"
 
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
-msgstr "Sesuaikan jalan pintas Papan Ketik"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
 
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Sesuaikan J_alan Pintas…"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
 
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
-msgstr "Jalan Pintas"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "Tampilkan dan sunting jalan pintas papan ketik"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
-msgstr "Jam Batang Status"
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
-msgstr "Tampilkan tanggal dan waktu di batang status"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:152
-msgid "Images"
-msgstr "Gambar"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:162
-msgid "Scripts"
-msgstr "Skrip"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:174
-msgid "Netscape plugins"
-msgstr "Plugin Netscape"
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:259
-msgid "Statusbar Features"
-msgstr "Fitur Batang Status"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:260
-msgid "Easily toggle features on web pages on and off"
-msgstr "Matikan atau hidupkan dengan mudah fitur-fitur di halaman web"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
 
-#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
-msgid "Tab Panel"
-msgstr "Panel Tab"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
 
-#: ../extensions/tab-panel.c:659
-msgid "T_ab Panel"
-msgstr "Panel T_ab"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
 
-#: ../extensions/tab-panel.c:677
-msgid "Show tabs in a vertical panel"
-msgstr "Tampilkan tab di sebuah panel vertikal"
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "Hanya Ikon di Tab sebagai standar"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "Tab baru tidak mempunyai label sebagai standar"
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:395
-msgid "Customize Toolbar"
-msgstr "Sesuaikan Batang Alat"
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:411
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
 msgstr ""
-"Pilih item yang akan ditampilkan di batang alat. Item dapat diubah urutannya "
-"dengan seret dan taruh."
 
-#: ../extensions/toolbar-editor.c:427
-msgid "Available Items"
-msgstr "Item Tersedia"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:448
-msgid "Displayed Items"
-msgstr "Item Ditampilkan"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:588
-msgid "_Customize Toolbar…"
-msgstr "Sesuaikan _Batang Alat…"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:617
-msgid "Toolbar Editor"
-msgstr "Penyunting Batang Alat"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:618
-msgid "Easily edit the toolbar layout"
-msgstr "Sunting tata letak batang alat dengan mudah"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Tembolok komunikasi HTTP di cakram"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
 
-#~ msgid "_Bookmark"
-#~ msgstr "B_ookmark"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
 
-#~ msgid "_Console"
-#~ msgstr "_Konsol"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
 
-#~ msgid "Remember last window size"
-#~ msgstr "Ingat ukuran jendela terakhir"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
 
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
 
-#~ msgid "Last window width"
-#~ msgstr "Lebar jendela terakhir"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
 
-#~ msgid "The last saved window width"
-#~ msgstr "Lebar jendela terakhir tersimpan"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
 
-#~ msgid "Last window height"
-#~ msgstr "Tinggi jendela terakhir"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
 
-#~ msgid "The last saved window height"
-#~ msgstr "Tinggi jendela terakhir tersimpan"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
 
-#~ msgid "Last panel position"
-#~ msgstr "Posisi panel terakhir"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
 
-#~ msgid "The last saved panel position"
-#~ msgstr "Posisi panel terakhir tersimpan"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
 
-#~ msgid "Last panel page"
-#~ msgstr "Halaman panel terakhir"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
 
-#~ msgid "The last saved panel page"
-#~ msgstr "Halaman panel terakhir tersimpan"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
 
-#~ msgid "Last Web search"
-#~ msgstr "Penelusuran Web terakhir"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
 
-#~ msgid "The last saved Web search"
-#~ msgstr "Penelusuran Web terakhir tersimpan"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
 
-#~ msgid "Show Menubar"
-#~ msgstr "Tampilkan Batang Menu"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
 
-#~ 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"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
 
-#~ msgid "Scroll to the right"
-#~ msgstr "Gulung ke kanan"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Hapus isi tempat sampah"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Buka tab yang terakhir ditutup"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Tambah sebuah folder penanda baru"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Tambah, sunting dan hapus mesin pencari…"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
 
-#~ msgid "Clear private data…"
-#~ msgstr "Hapus data pribadi…"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Inspeksi detail halaman dan akses alat pengembang…"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Pindah ke tab sebelumnya"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
 
-#~ msgid "Switch to the next tab"
-#~ msgstr "Pindah ke tab berikutnya"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Pindah tab ke belakang tab sebelumnya"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Pindah tab ke depan tab berikutnya"
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Gerak Tetikus"
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Fokus tab saat ini"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Kendalikan Midori dengan menggerakkan tetikus"
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "Daur fokus di antara tampilan"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Muat ulang halamat atau stop memuat"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Hanya tampilkan ikon dari tab saat ini"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Sesuaikan jalan pintas Papan Ketik"
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplikasi tab saat ini"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Tutup semua tab kecuali tab saat ini"
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Jalan Pintas"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Buka tab yang tersimpan di sesi terakhir"
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Tampilkan dan sunting jalan pintas papan ketik"
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Tampilkan Pertanyaan Acapkali Diajukan"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Jam Batang Status"
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Buka pelacak kutu Midori"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Tampilkan tanggal dan waktu di batang status"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Tampilkan informasi tentang program"
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Gambar"
 
-#~ msgid "Show menubar"
-#~ msgstr "Tampilkan batang menu"
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skrip"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Tampilkan batang navigasi"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Plugin Netscape"
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Tampilkan panel sisi"
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Aktifkan plugin Netscape"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Tampilkan batang penanda"
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Fitur Batang Status"
 
-#~ msgid "Show statusbar"
-#~ msgstr "Tampilkan batang status"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Matikan atau hidupkan dengan mudah fitur-fitur di halaman web"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Atur jumlah kolom dan baris"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Panel Tab"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Masukkan jumlah kolom dan baris:"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Panel T_ab"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Masukan tidak valid untuk ukuran panggil cepat"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Tampilkan tab di sebuah panel vertikal"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Ukuran miniatur:"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Hanya Ikon di Tab sebagai standar"
 
-#~ msgid "Small"
-#~ msgstr "Kecil"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Tab baru tidak mempunyai label sebagai standar"
 
-#~ msgid "Medium"
-#~ msgstr "Sedang"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Sesuaikan Batang Alat"
 
-#~ msgid "Big"
-#~ msgstr "Besar"
+#: ../extensions/toolbar-editor.c:417
+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."
 
-#~ msgid "Not available: %s"
-#~ msgstr "Tidak tersedia: %s"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Item Tersedia"
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Berkas sumber daya tak terinstal"
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Item Ditampilkan"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "Atur ulang _sesi terakhir"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "Sesuaikan _Batang Alat…"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Tak ditemukan - %s"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Penyunting Batang Alat"
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokumen tak dapat ditampilkan"
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Sunting tata letak batang alat dengan mudah"
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Paksa 96 titik per inci"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Hapus Data Pribadi"
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Paksa kerapatan titik video 96 DPI"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Hapus data pribadi"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Atur filter _Iklan…"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Hapus data berikut:"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Ganti tab menggunakan Ctrl+Tab yang diurutkan berdasarkan penggunaan "
-#~ "terakhir"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Tab terakhir dibuka"
 
-#~ msgid "Quit the application"
-#~ msgstr "Keluar aplikasi"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Hapus data pribadi ketika _keluar Midori"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Gagal mengeksekusi pernyataan basis data\n"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Log masuk dan _sandi tersimpan"
 
-#~ msgid "Show Blank page"
-#~ msgstr "Tampilkan halaman Kosong"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Data Kuki dan Situs Web"
 
-#~ msgid "All cookies"
-#~ msgstr "Semua kuki"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikon situs web"
 
-#~ msgid "Session cookies"
-#~ msgstr "Kuki sesi"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Buka tab"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Tampilkan Batang Transfer"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Buka tab lain…"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Apakah ingin menampilkan batang transfer"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Gagal membersihkan riwayat: %s\n"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Mesin pencari di penyelesai lokasi"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Gagal menghapus item riwayat lama: %s\n"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Apakah akan menampilkan mesin pencari di penyelesai lokasi"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Gagal menambah item penanda: %s\n"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Tampilkan kendali operasi dari panel"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Gagal memperbarui penanda: %s\n"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Apakah ingin menampilkan kendali operasi dari panel"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Tampilkan panggil cepat di tab baru"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Tak ada sertifikat root yang tersedia. Sertifikat SSL tak dapat diverifikasi."
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Tampilkan panggil cepat di tab yang baru dibuka"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Konfigurasi tak dapat disimpan. %s"
 
-#~ msgid "Download Manager"
-#~ msgstr "Manajer Unduh"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Kotak sampah tak dapat disimpan. %s"
 
-#~ msgid "An external download manager"
-#~ msgstr "Manajer unduh eksternal"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Buka halaman eksternal di:"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Ubah _pengaturan"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Nonaktifkan semua _ekstensi"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Terima kuki"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Tampilkan sebuah dialog setelah Midori macet"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Tipe kuki apa yang diterima"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Abaikan tab lama"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Usia kuki maksimum"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#~ msgid "Maximum history age"
-#~ msgstr "Usia riwayat maksimum"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Ingat berkas terakhir diunduh"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Apakah berkas terakhir diunduh akan disimpan"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Penanda tak dapat dimuat: %s\n"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Unduh Dengan _Manajer Unduh"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sesi tak dapat dimuat: %s\n"
 
-#~ msgid "General"
-#~ msgstr "Umum"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Kotak sampah tak dapat dimuat: %s\n"
 
-#~ msgid "Appearance"
-#~ msgstr "Tampilan"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Riwayat tak dapat dimuat: %s\n"
 
-#~ msgid "Font settings"
-#~ msgstr "Pengaturan fonta"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Galat berikut terjadi:"
 
-#~ msgid "Interface"
-#~ msgstr "Antarmuka"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Abaikan"
 
-#~ msgid "Navigationbar"
-#~ msgstr "Batang navigasi"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid "Applications"
-#~ msgstr "Aplikasi"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "Aplikasi Eksternal"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Web Cookies"
-#~ msgstr "Kuki Web"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Hapus kuki ketika keluar Midori"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Hapus kuki lama setelah 1 jam"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Hapus kuki lama setelah 1 minggu"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Hapus kuki lama setelah 1 bulan"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Hapus kuki lama setelah 1 tahun"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s dari %s, %s/s"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Buka folder target untuk pengaya terpilih"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Tab Berikutnya (Senarai Riwayat)"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Tab Sebelumnya (Senarai Riwayat)"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Tab sebelumnya dari riwayat"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "Pageholder"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Pageholder"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Simpan satu atau beberapa halaman terbuka sebagai paralel tab anda"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "_Contents"
-#~ msgstr "_Isi"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#~ msgid "Show the documentation"
-#~ msgstr "Tampilkan dokumentasi"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% termuat"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "View Selection Source"
-#~ msgstr "Tampilkan Pemilihan Sumber"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Tampilkan kode program dari pemilihan"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#~ msgid "_Transferbar"
-#~ msgstr "Batang _transfer"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#~ msgid "Show transferbar"
-#~ msgstr "Tampilkan batang transfer"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Halaman yang baru dikunjungi"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Buka kembali halaman yang sebelumnya anda kunjungi"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Lepaskan panel terpilih dari jendela"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Tampilkan _judul panel"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "Show operating _controls"
-#~ msgstr "Tampilkan _kendali operasi"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "Options"
-#~ msgstr "Opsi"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Tampilkan progres di lema lokasi"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Apakah ingin menampilkan progres memuat di lema lokasi"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Tanya folder tujuan"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Apakah akan menanyakan folder tujuan ketika mengunduh sebuah berkas"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikasi"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr ""
-#~ "Apakah akan menampilkan sebuah notifikasi ketika sebuah transfer telah "
-#~ "selesai"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "Original cookies only"
-#~ msgstr "Hanya kuki asli"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Ingat halaman terakhir dikunjungi"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Apakah halaman terakhir dikunjungi tersimpan"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Ingat bentuk terakhir masukan"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Apakah bentuk terakhir masukan disimpan"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Buat _Peluncur"
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Deteksi server proxy secara otomatis"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Apakah akan mendeteksi server proxy secara otomatis dari lingkungan"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Ukuran tembolok"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Transfer"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Ukuran tembolok yang diizinkan"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Bersihkan Semua"
 
-#~ msgid "Open _Link"
-#~ msgstr "Buka _Tautan"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Unduh Taut tujuan"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Buka _Folder Tujuan"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Simpan Taut tujuan"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Salin Tautan Lok_asi"
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Kembalikan Tab"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Berkas '<b>%s</b>' telah diunduh."
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Kecilkan Tab"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "Encoding"
-#~ msgstr "Penyandian"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Transfer selesai"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Penyandian karakter untuk digunakan sebagai standar"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Beberapa berkas sedang diunduh"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Kecilkan gambar secara otomatis"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Keluar Midori"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Secara otomatis mengecilkan gambar tunggal agar muat"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Transfer akan dibatalkan jika Midori keluar."
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Area teks dapat diubah ukurannya"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Apakah area teks dapat diubah ukurannya"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Aktifkan alat pengembang"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Aktifkan ekstensi khusus untuk pengembang"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Spell Checking"
-#~ msgstr "Pemeriksa Ejaan"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ 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\""
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Console"
-#~ msgstr "Konsol"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Warnai tab dengan jelas"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "Manajer _Kuki"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "URIs"
-#~ msgstr "URI"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "[URIs]"
-#~ msgstr "[URI]"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Root"
-#~ msgstr "Root"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Cari Cepat"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Lompat segera ke kata atau frasa"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Keduanya"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Keduanya horizontal"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Dimuat Saat Hidupkan"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "HTTP Proxy"
-#~ msgstr "Proxy HTTP"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "Buka URL di _Tab Baru"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Source"
-#~ msgstr "Sumber"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Ikon (nama atau berkas):"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Manage search engines"
-#~ msgstr "Atur mesin pencari"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Peringatan: Anda menggunakan akun superuser!"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Pemblokir Iklan"
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s tak memiliki properti '%s'"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blok iklan berdasarkan sebuah senarai filter"
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s tak dapat ditugaskan ke %s.%s"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Atur filter Iklan"
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s tak dapat diakses"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_ok gambar"
 
-#~ msgid "_Disable"
-#~ msgstr "_Non Aktifkan"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_ok tautan"
 
-#~ msgid "Last pageholder URI"
-#~ msgstr "URI pageholder terakhir"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Sunting aturan"
 
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "URI terakhir dibuka di pageholder"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Aturan:"
index dd412634b5d400f1743057d889630d635129f8e2..13c2a2fa51edb7efcbad91c5b148bf18b62503f0 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -9,215 +9,215 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-27 05:21+0000\n"
-"PO-Revision-Date: 2013-04-07 14:29+0100\n"
-"Last-Translator: Marchi Cristian <cri.penta@gmail.it>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-08 21:05+0000\n"
+"Last-Translator: Wiccio <sissach1@tin.it>\n"
 "Language-Team: Italian <xfce-it-translators@googlegroups.com>\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-Launchpad-Export-Date: 2014-11-26 06:01+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Naviga nel web"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Browser web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Browser web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Naviga nel web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nuova finestra di navigazione privata"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nuova scheda"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nuova finestra"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Browser web"
+msgid "New Private Browsing Window"
+msgstr "Nuova finestra di navigazione privata"
 
 #: ../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:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navigazione privata"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Apre una nuova finestra di navigazione privata"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
-msgstr "Istantanea salvata in: %s\n"
+msgstr "Schermata salvata in: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Esegue INDIRIZZO come applicazione web"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "INDIRIZZO"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Usa CARTELLA come cartella di configurazione"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "CARTELLA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navigazione privata: non verrà salvata alcuna modifica"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 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:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Semplice finestra di GTK+ con WebKit, simile a GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Mostra finestra di diagnostica"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Lancia con gdb e salva una traccia del crash"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Esegue il file specificato come javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Scatta istantanea dell'URL specificato"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Esegue il comando specificato"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Elenca i comandi disponibili per l'esecuzione con -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Visualizza la versione dell'applicazione"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Indirizzi"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blocca le URI secondo l'espressione regolare SCHEMA"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "SCHEMA"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Riavvia Midori dopo SECONDI secondi di inattività"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDI"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Errore: \"gdb\" non può essere trovato\n"
 
 # fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Segnalare commenti, suggerimenti e bug su:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Controlla nuove versioni su:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Si è verificato un errore sconosciuto"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "Segnali_bri"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Aggiungi se_gnalibro"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Estensioni"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "C_ronologia"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Script dell'_utente"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Stili dell'utente"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nuova _scheda"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Trasferimenti"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Plugin N_etscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Schede _chiuse"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "N_uova finestra"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nuova _cartella"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Indirizzi]"
 
@@ -234,137 +234,147 @@ msgstr "Documento corrotto."
 msgid "Unrecognized bookmark format."
 msgstr "Formato del segnalibro non riconosciuto."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Va alla sottopagina successiva"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Ricerca sul web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Ricarica la pagina corrente"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Interrompe il caricamento della pagina corrente"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Errore nell'aggiornamento del titolo: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Il valore «%s» non è valido per %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Impostazione \"%s\" non prevista"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Azione \"%s\" inaspettata."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navigazione privata)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Seleziona [testo]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Nuova cartella"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Nuova Cartella"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Modifica cartella"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Modifica Cartella"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
-msgstr "Nuovo segnalibro"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nuovo Segnalibro"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Modifica segnalibro"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Modifica Segnalibro"
 
-#: ../midori/midori-browser.c:973
-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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Digita un nome per questo segnalibro e scegli dove posizionarlo."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Aggiungi a _selezione veloce"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Digita un nome per questa cartella e scegli dove posizionarla."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Mostra nella _barra degli strumenti"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mostra nella Barra dei Segnalibri"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Esegui come applicazione _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Aggiungi a _selezione veloce"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Salva come"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Salva _risorse associate"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "È stata aperta una nuova finestra"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "È stata aperta una nuova scheda"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Errore di apertura dell'immagine"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr ""
 "Impossibile aprire l'immagine selezionata in un visualizzatore predefinito."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Errore di scaricamento dell'immagine"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Impossibile scaricare l'immagine selezionata."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Salva file"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Ricarica la pagina senza effettuare il caching"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Apre file"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -378,31 +388,24 @@ msgstr ""
 "un aggregatore di notizie; al prossimo clic sull'icona del feed delle "
 "notizie, questo verrà aggiunto automaticamente"
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nuovo feed"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Aggiunge un nuovo segnalibro"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Condividi questa pagina"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Vuoto"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Abilita o disabilita la navigazione a cursore"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -410,110 +413,100 @@ msgstr ""
 "Premendo F7 verrà abilitata la navigazione Caret. Quando è attiva, apparirà "
 "un cursore di testo in tutti i siti web."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Abilita navigazione ca_ret"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Apri _tutti in nuove schede"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Apri in una nuova sc_heda"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Apri in una nuova _finestra"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importa segnalibri…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importa segnalibri"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Applicazione:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importa da un file XBEL o HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importa da un file"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Impossibile importare i segnalibri"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Segnalibri XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Segnalibri Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Impossibile esportare i segnalibri"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un browser web leggero"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Consultare about:version per le informazioni di versione."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -525,410 +518,448 @@ msgstr ""
 "pubblicata dalla Free Software Foundation; sia nella versione 2.1 della "
 "licenza che (a scelta) in una versione successiva."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Sergio Durzu <sergio.durzu@ildeposito.org>\n"
 "Luca Perri <kurama_luka@yahoo.it>\n"
 "Fabio Pozzi <pozzi.fabio@gmail.com>\n"
 "Gianluca Foddis <gianluca.foddis@gmail.com>\n"
-"Cristian Marchi <cri.penta@gmail.com>, 2010"
+"Cristian Marchi <cri.penta@gmail.com>, 2010\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Antonio Bisconti https://launchpad.net/~coonkies\n"
+"  Bennici Piercarlo https://launchpad.net/~piercarlo-bennici-"
+"deactivatedaccount\n"
+"  C.R. https://launchpad.net/~c.rs.\n"
+"  Cristian Marchi https://launchpad.net/~cri79\n"
+"  Davide Pelella https://launchpad.net/~dave-ltd\n"
+"  Fabio Gaudenzi https://launchpad.net/~bafio-fruges-c\n"
+"  Fabio Zaramella https://launchpad.net/~ffabio-96-x\n"
+"  Filippo Vicentini https://launchpad.net/~filippovicentini\n"
+"  Lorenzo Bracci https://launchpad.net/~lore-bracci\n"
+"  Marchi Cristian https://launchpad.net/~cri-penta-8\n"
+"  Matteo Formenti https://launchpad.net/~matteoformenti1998\n"
+"  Michael Moroni https://launchpad.net/~airon90\n"
+"  Salvatore Addesa https://launchpad.net/~salvatore-addesa\n"
+"  Salvatore Merone https://launchpad.net/~sal-merone\n"
+"  Vesnar Teach https://launchpad.net/~vesnar\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Wiccio https://launchpad.net/~sissach1\n"
+"  ciuino https://launchpad.net/~ciuino\n"
+"  dadoplus https://launchpad.net/~dadoplus"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplica la scheda corrente"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_File"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Apre una nuova finestra"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Apre una nuova scheda"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nuova _finestra di navigazione privata"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Apre un file"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Sa_lva pagina come…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Salva in un file"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Aggiungi a selezione _veloce"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Abbonati al _feed di notizie"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Chiudi scheda"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Chiude la scheda corrente"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "C_hiudi finestra"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "C_ondividi"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Stampa la pagina corrente"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Chiudi _tutte le finestre"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "Mo_difica"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Cerca…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Cerca una parola o una frase nella pagina"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Trova s_uccessivo"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Trova _precedente"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Imposta le preferenze dell'applicazione"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Barre degli _strumenti"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Ricarica la pagina senza effettuare il caching"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Aumenta il livello di ingrandimento"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Diminuisce il livello di ingrandimento"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codifica"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Visualizza s_orgente"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Visualizza sorgente _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navigazione ca_ret"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Schermo intero"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Scorri a _sinistra"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Scorri in _basso"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Scorri in _alto"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Scorri a _destra"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Leggibile"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "V_ai"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Va alla pagina precedente"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Va alla sottopagina precedente"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Successivo o precedente"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+"Vai alla prossima sottopagina o alla prossima pagina nella cronologia"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Pagina iniziale"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Va alla pagina iniziale"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Svuota cestino"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Annulla chi_usura scheda"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Aggiungi una nuova _cartella"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "Esp_orta segnalibri"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "Importazione Segnalibri"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "Gestione _motori di ricerca"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "Esportazione Segnalibri"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Gestione motori di ricerca"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Rimuovi dati privati"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Elimina i Dati Personali..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Ispeziona pa_gina"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Scheda _precedente"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Scheda _successiva"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Sposta la scheda al _primo posto"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Sposta scheda in_dietro"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Sposta scheda da_vanti"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Sposta la scheda all'_ultimo posto"
 
 # comando per selezionare la scheda corrente
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Scheda _corrente"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Metti a fuoco la vista _successiva"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Mostra solo l'icona della scheda corren_te"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Duplica la scheda corrente"
-
 # acceleratore sulla h per evitare conflitti
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Chiudi le altre sc_hede"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Apri ultima s_essione"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Domande fre_quenti"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Segnala un _problema…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Strumenti"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra dei _menu"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra di _navigazione"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Pannello _laterale"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Pannello laterale"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barra dei s_egnalibri"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra di stat_o"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatico"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Cinese tradizionale (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Cinese semplificato (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Giapponese (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russo (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Occidentale (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalizzato…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Impossibile inizializzare la cronologia: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separatore"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "I_ndirizzo…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Apre un indirizzo specifico"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Ricerca sul _web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Esegue una ricerca sul web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Riapre una scheda o una finestra chiusa precedentemente"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Mostra i segnalibri salvati"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Schede"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Mostra un elenco delle schede aperte"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
 #: ../midori/midori-extension.c:341
 #, 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"
+msgstr ""
+"La configurazione dell'estensione \"%s\" non può essere caricata: %s\n"
 
-#: ../midori/midori-extension.c:880 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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"
+msgstr ""
+"La configurazione dell'estensione \"%s\" non può essere salvata: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Esporta il certificato"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "L'autorità che ha firmato il certificato è sconosciuta."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 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:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Il tempo di attivazione del certificato è ancora nel futuro."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Il certificato è scaduto"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -936,40 +967,40 @@ msgstr ""
 "Il certificato è stato revocato in accordo alla lista di revoca dei "
 "certificati di GTIsConnection."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "L'algoritmo del certificato è considerato insicuro."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Si è verificato un errore durante la validazione del certificato."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Esporta certificato"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Auto firmato"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Dettagli di sicurezza"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Incolla e p_rocedi"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Non verificata"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Connessione verificata e cifrata"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Connessione aperta, non cifrata"
 
@@ -986,441 +1017,455 @@ msgstr "Chiude il pannello"
 msgid "Align sidepanel to the left"
 msgstr "Allinea il pannello laterale a sinistra"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Mostra selezione veloce"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Mostra la pagina iniziale"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Mostra le ultime schede aperte"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Mostra le ultime schede senza caricarle"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Mostra pagina vuota"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Mostra motore di ricerca predefinito"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Mostra pagina personalizzata"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Giapponese (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nuova scheda"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nuova finestra"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Scheda corrente"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Icone"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Icone piccole"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Testo"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Icone e testo"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Testo accanto alle icone"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatico (GNOME o ambiente)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Server proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Nessun proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Scegliere lo stile della barra degli strumenti"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Usa sempre il tipo di carattere di mia scelta"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 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:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Le impostazioni non possono essere caricate: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Valore di configurazione «%s» non valido"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Impossibile applicare il foglio di stile: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Mostra l'_etichetta nella scheda"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Mostra solo l'_icona nella scheda"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Chiudi scheda a D_estra"
+msgstr[1] "Chiudi schede a D_estra"
+
+# acceleratore sulla h per evitare conflitti
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Chiudi l'altra sc_heda"
+msgstr[1] "Chiudi le altre sc_hede"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Credi a questo sito"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Sicurezza sconosciuta"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s vuole salvare un database HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Permetti"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s vuole conoscere la propria posizione."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Errore - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' non è stato trovato"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "La pagina \"%s\" non può essere caricata."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "La pagina '%s' non è stata caricata:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Riprova"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Controlla l'indirizzo per errori di digitazione"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Assicurati che il cavo di rete sia collegato o che la scheda di rete "
+"wireless sia attivata"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verifica che le tue impostazioni di rete siano corrette"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Prova ancora"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Oops - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Qualcosa è andato storto con '%s'"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Riprova"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Invia un messaggio a %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Aggiungi _motore di ricerca..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Ispeziona _elemento"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Apri _Link"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Apri collegamento in una nuova sc_heda"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Apri collegamento in una scheda in primo _piano"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Apri collegamento in una scheda in secondo p_iano"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Apri collegamento in una nuova _finestra"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Apri il collegamento come applicazione _web"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copia l'indirizzo di de_stinazione"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Sa_lva come…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Apri immagine in nuova fi_nestra"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Apri _immagine in nuova scheda"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copi_a immagine"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Salva i_mmagine"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Apri immagine nel _visualizzatore"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copi_a indirizzo video"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Salva _video"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Scarica _video"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Apri indirizzi in una nuova _scheda"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Cerca _con"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Cerca nel web"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Apri indirizzi in una nuova _scheda"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Apri _cornice in nuova scheda"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Ispeziona _elemento"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Apri o scarica file da %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nome file: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipo di file: \"%s\""
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipo di file: %s (\"%s\")"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Apri %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Controllo pagina - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "La documentazione non è installata"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori non salva alcun dato personale:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Non sono salvati cronologia o cookie."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Le estensioni sono disabilitate."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 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:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori impedisce ai siti web di tracciare l'utente:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Gli URL referenti sono limitati al nome host."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Il prefetching DNS è disabilitato."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "I numeri di versione tra parentesi indicano la versione usata durante "
 "l'esecuzione."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Caricamento pagina ritardato"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Caricamento della pagina ritardato:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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"
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Carica pagina"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Pagina vuota"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Duplica scheda"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Mostra l'_etichetta nella scheda"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Mostra solo l'_icona nella scheda"
-
-# acceleratore sulla h per evitare conflitti
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Chiudi l'altra sc_heda"
-msgstr[1] "Chiudi le altre sc_hede"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "precedente"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "successiva"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Stampa immagini di sfondo"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Abilitare questa opzione per stampare le immagini di sfondo"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Opzioni"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s di %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1428,27 +1473,27 @@ msgstr[0] "%d secondo"
 msgstr[1] "%d secondi"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s restanti"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Il file scaricato è erroneo."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1456,137 +1501,134 @@ msgstr ""
 "Il checksum fornito con il collegamento non corrisponde. Ciò significa che "
 "il file è probabilmente incompleto o è stato modificato successivamente."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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:347
+#: ../midori/midori-download.vala:368
 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:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Spazio insufficiente per scaricare \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Selezione veloce"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Fare clic per aggiungere un collegamento"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Inserire l'indirizzo del collegamento"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Inserire il titolo del collegamento"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Eliminare davvero questo collegamento?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Avvio"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "All'avvio di Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Pagina iniziale:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Usa la pagina co_rrente"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Usa la pagina corrente come homepage"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Carattere"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Famiglia di caratteri proporzionale"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr ""
 "Scegliere la famiglia predefinita dei caratteri per visualizzare il testo"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr ""
 "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Caratteri a larghezza fissa"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr ""
 "Dimensione dei caratteri del testo per visualizzare testi di larghezza "
 "predefinita"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr ""
 "Dimensione dei caratteri utilizzati per visualizzare il testo di altezza "
 "fissa"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Dimensione minima caratteri"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
-msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo"
+msgstr ""
+"Scegliere la dimensione minima dei caratteri per visualizzare il testo"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codifica preferita"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Carica immagini automaticamente"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Abilita controllo ortografico"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Abilita script"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Abilita il supporto a WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Abilita plugin di Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Ingrandimento testo e immagini"
@@ -1601,11 +1643,19 @@ msgstr ""
 "Abilitare questa opzione per consentire l'apertura automatica delle finestre "
 "di popup"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Livello di Zoom di Default"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Fattore iniziale di ingrandimento per le nuove schede"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Lingue preferite"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1614,118 +1664,118 @@ msgstr ""
 "di pagine web multilingua, per esempio \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-"
 "fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Salva i file scaricati in:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navigazione"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Stile della barra degli strumenti:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Apri le nuove pagine in:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Comportamento della nuova scheda"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Pulsante di chiusura schede"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Mostra sempre le schede"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Apri schede dopo quella corrente"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Apri schede sullo sfondo"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor di testo"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Aggregatore notizie"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Rete"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nome host"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Porta"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Tipi di proxy supportati"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Cache web"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "La dimensione massima della cache delle pagine su disco"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identifica come"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Elimina i cookie obsoleti dopo:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Numero massimo di giorni per cui possono essere validi i cookie"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Accettare i cookie solo dai siti visitati"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blocca i cookie inviati da siti di terze parti"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1733,123 +1783,122 @@ msgstr ""
 "I cookie immagazzinano i dati di accesso, i giochi salvati o i profili "
 "dell'utente per scopi pubblicitari."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Abilita la cache delle applicazioni web offline"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 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/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Se il \"referer\" deve essere accorciato al nome host"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Elimina le pagine dalla cronologia dopo:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 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-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Gestione _motori di ricerca"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Aggiungi motore di ricerca"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Modifica motore di ricerca"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descrizione:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "Parame_tro:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gestione motori di ricerca"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Usa come _predefinito"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "I motori di ricerca non possono essere caricati. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "I motori di ricerca non possono essere salvati. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Cronologia"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Segnalibri e Cronologia"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Impossibile inizializzare la cronologia: %s"
+msgid "Search for %s"
+msgstr "Cerca %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Impossibile selezionare dalla cronologia: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Cerca %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Cerca con…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Cerca con %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Apri con"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Non è possibile eseguire l'applicazione esterna."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI non valido"
 
@@ -1874,79 +1923,136 @@ msgstr "Maiuscole/minuscole"
 msgid "Close Findbar"
 msgstr "Chiudi barra ricerca"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Impossibile aggiungere il segnalibro: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d segnalibro"
+msgstr[1] "%d segnalibri"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d sottocartella"
+msgstr[1] "%d sottocartelle"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Cartella vuota"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "La cartella contiene %s e nessun segnalibro"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Cartella contenente %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Cartella contenente %s e %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Segnalibro per: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s e nessun segnalibro"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Impossibile aggiornare il segnalibro: %s\n"
+msgid "%s and %s"
+msgstr "%s e %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Modifica il segnalibro selezionato"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Elimina il segnalibro selezionato"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Aggiunge una nuova cartella"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separatore</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Apri in una nuova sc_heda"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Cerca tra i segnalibri"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Cronologia"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Oggi"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Una settimana fa"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Eliminare davvero tutti gli elementi della cronologia?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Crea un segnalibro dall'elemento della cronologia selezionato"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Elimina l'elemento selezionato dalla cronologia"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Cancella l'intera cronologia"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Cerca nella cronologia"
 
@@ -1974,115 +2080,65 @@ msgstr "Password"
 msgid "_Remember password"
 msgstr "Memo_rizza password"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "L'icona denominata \"%s\" non può essere caricata"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "L'icona \"%s\" dello stock non può essere caricata"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "I fotogrammi dell'animazione sono danneggiati"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Nessuno"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "La proprietà \"%s\" non è valida per %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Selezionare un file"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Selezionare una cartella"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 ora"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 giorno"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 settimana"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mese"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 anno"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferenze per %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurazione dei filtri per gli avvisi pubblicitari"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 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:926
-msgid "Edit rule"
-msgstr "Modifica regola"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regola:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_occa immagine"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_occa collegamento"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Blocca avvisi pubblicitari"
-
-#: ../extensions/adblock.c:1926
-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
-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?"
+"La pagina sembra contenere uno script utente. Si desidera installarlo?"
 
 #: ../extensions/addons.c:223
 msgid "_Install user script"
@@ -2091,7 +2147,8 @@ msgstr "_Installa script utente"
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
 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?"
+msgstr ""
+"La pagina sembra contenere uno stile utente. Si desidera installarlo?"
 
 #: ../extensions/addons.c:229
 msgid "_Install user style"
@@ -2101,16 +2158,16 @@ msgstr "_Installa stile utente"
 msgid "Don't install"
 msgstr "Non installare"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Script dell'utente"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Stili dell'utente"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Errore"
 
@@ -2132,40 +2189,40 @@ msgstr "Elimina stile utente"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Il file «<b>%s</b>» verrà eliminato definitivamente."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Apre nell'editor di testo"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Apre la cartella di destinazione"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Aggiunge un nuovo addon"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Rimuove l'addon selezionato"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Estensioni utente"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Impossibile monitorare la cartella «%s»: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Supporto per script utente e stili utente"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Schede colorate"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Colora ogni etichetta in modo differente"
 
@@ -2174,11 +2231,11 @@ msgstr "Colora ogni etichetta in modo differente"
 msgid "Cookie Manager"
 msgstr "Gestore Cookie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Rimuovi tutto"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2186,31 +2243,31 @@ 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:116
 msgid "Expand All"
 msgstr "Espande tutto"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Riduce tutto"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Vuoi davvero eliminare tutti i cookie?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Domanda"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Alla fine della sessione"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2228,15 +2285,15 @@ msgstr ""
 "<b>Scadenza</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Si"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "No"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2245,20 +2302,20 @@ msgstr ""
 "<b>Dominio</b>: %s\n"
 "<b>Cookie</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nome"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Espandi tutto"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Riduci tutto"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Cerca i cookie per nome o dominio"
 
@@ -2278,28 +2335,49 @@ msgstr "Copia gli indirizzi delle schede"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copia gli indirizzi di tutte le schede negli appunti"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Caricamento ritardato"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Ritardo in secondi prima di caricare la pagina:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr ""
 "Ritarda il caricamento della pagina fino al momento dell'utilizzo della "
 "scheda"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Doppio click per altre informazioni"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Questa estensione mostra messaggi di errori glib nel sistray."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Si è verificato un errore cercando di scaricare un file con il seguente "
+"È avvenuto un errore durante lo scaricamento di un  file con il seguente "
 "plugin:\n"
+"\n"
+"%s\n"
+"\n"
+"Errore:\n"
+"%s\n"
+"\n"
+"Continua senza questo plugin."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2339,25 +2417,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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Ultimo aggiornamento: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Feed"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Aggiunge un nuovo feed"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Elimina feed"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Feeds"
 
@@ -2376,37 +2454,37 @@ msgstr "Formato del feed non supportato."
 msgid "Failed to parse XML feed: %s"
 msgstr "Errore nell'analisi del file XML del feed : %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Impossibile trovare l'elemento \"channel\" nell'XML del flusso RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Rilevata versione di RSS non supportata."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Impossibile trovare l'elemento RSS \"item\" nell'XML indicato."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Impossibile trovare l'elemento RSS \"channel\" nell'XML indicato."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Il feed \"%s\" esiste già."
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Errore nel caricare il feed \"%s\""
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Pannello Feed"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Leggi feed Atom o RSS"
 
@@ -2427,123 +2505,410 @@ msgstr ""
 "Sono necessari un nome utente e una password\n"
 "per aprire questo indirizzo:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Memorizzare la password per questo pagina?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Memorizza"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Mai per questa pagine"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Attiva/disattiva la cronologia dei form"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Errore nella connessione al database: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Errore nell'esecuzione della richiesta al database: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 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:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Gestore cronologia form"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Memorizza una cronologia dei dati inseriti nei form"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Impossibile selezionare i suggerimenti\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Sono presenti schede non viste"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Lista-cronologia"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
-msgstr "Comportamento alla chiusura della scheda "
+msgstr "Comportamento alla chiusura della scheda"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Vai all'ultima scheda visitata"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Vai alla scheda più recente"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Lampeggia la finestra se ci sono schede in secondo piano"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Nuova scheda successiva (lista cronologia)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Nuova scheda successiva dalla cronologia"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Nuova scheda precedente (lista cronologia)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Nuova scheda precedente dalla cronologia"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Visualizza scheda in secondo piano (lista cronologia)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Visualizza la scheda selezionata in secondo piano"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Lista cronologia"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Va all'ultima scheda utilizzata quando si cambia o si chiude una scheda"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Errore SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Accetta"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Accetta per la sessione"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blocca"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Non è stato possibile accedere al database dell'estensione: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Errore nell'esecuzione della dichiarazione del database: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Vuoi davvero eliminare tutti i permessi di javascript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Elimini tutti i permessi di javascript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Questa azione cancellerà tutti i permessi di JavaScript. Ti verrà chiesto "
+"nuovamente il permesso per ogni sito visitato."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Istanza del manager"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Istanza del manager NoJS globale"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configura NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Segue una lista di tutti i siti web e le policy impostate per ciascuno. Puoi "
+"eliminare delle policy selezionando le entry e cliccando su <i>Rimuovi</i>"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Politica"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Rimuovi _tutto"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "Consenti gli script a tutti i siti"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blocca di default gli script provenienti da domini sconosciuti"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "I_mposta i permessi sui domini di secondo livello"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Blocca %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permetti %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permetti %s per questa sessione"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Finestra del browser"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "L'istanza del browser midori a cui appartiene questa vista"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vista"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "La schermata dell'istanza Midori a cui appartiene questa schermata"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Icona di stato del menù"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Icona di stato del menù da mostrare nella barra di stato"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Sconosciuto"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Consentito"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Misto"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Negato"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Errore fatale, l'estensione NoJS non può continuare. Disabilitare NoJS."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Errore nell'estensione NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Ragione"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+"Impossibile creare la cartella di configurazione per l'estensione: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Impossibile creare la cartella di configurazione per l'estensione"
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Impossibile aprire il database dell'estensione."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Impossibile impostare la struttura del database dell'estensione."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Istanza estensione"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "L'istanza dell'estensione di Midori per questa estensione"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Istanza applicazione"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+"L'istanza dell'estensione di Midori a cui questa estensione di riferisce"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Istanza database"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Indicatore dell'istanza del database sqlite usata da questa estensione"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Percorso del Database"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Percorso all'istanza del database sqlite utilizzato da questa estensione"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permetti tutti i siti"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Se selezionato, questa estensione non controllerà le politiche per ogni "
+"sito, ma le accetterà tutte."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Solo secondo livello"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Se selezionata, questa estensione ridurrà il dominio al suo secondo livello "
+"(www.example.org diventerà example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Politica del dominio sconosciuta"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Politica da usare per domini sconosciuti"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Accetta temporaneamente"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gesti del mouse"
@@ -2572,11 +2937,11 @@ msgstr "Scorciatoie"
 msgid "View and edit keyboard shortcuts"
 msgstr "Visualizza e modifica le scorciatoie da tastiera"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Orologio della barra di stato"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Mostra la data e l'ora nella barra di stato"
 
@@ -2592,6 +2957,10 @@ msgstr "Script"
 msgid "Netscape plugins"
 msgstr "Plugin di Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Abilita plugin di Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Proprietà della barra di stato"
@@ -2602,15 +2971,15 @@ msgstr ""
 "Permette di attivare o disattivare facilmente determinate funzionalità sulle "
 "pagine internet"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Pannello delle schede"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Pannello _a scheda"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Mostra le schede in un pannello verticale"
 
@@ -2622,11 +2991,11 @@ msgstr "Solo icone sulle schede"
 msgid "New tabs have no label by default"
 msgstr "Le nuove schede non hanno alcuna etichetta di default"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personalizza la barra degli strumenti"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2634,69 +3003,60 @@ msgstr ""
 "Selezionare gli oggetti da visualizzare nella barra degli strumenti. Gli "
 "oggetti possono essere riordinati tramite trascinamento."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Oggetti disponibili"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Oggetti visualizzati"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Personalizza barra degli s_trumenti..."
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor della barra degli strumenti"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr ""
 "Permette di modificare facilmente la disposizione della barra degli strumenti"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Memorizza la comunicazione HTTP sul disco"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Impossibile caricare i cookie\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Pulizia dati personali"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Pulizia dati personali"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Rimuovi i seguenti dati:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Ultime sc_hede aperte"
 
 # cri.penta version
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Cancella i dati personali _quando Midori viene chiuso"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "_Password e login salvati"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Dati dei siti web e cookie"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Icone dei siti"
 
@@ -2704,192 +3064,135 @@ msgstr "Icone dei siti"
 msgid "Open tabs"
 msgstr "Apre schede"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Più tab aperte..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Errore nella eliminazione della cronologia: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Errore nella eliminazione dei vecchi elementi della cronologia: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "Impossibile eseguire ATATCH sul vecchio db"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "Impossibile importare idal vecchio database"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "Impossibile ritirare la transazione"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "Impossibile eseguire DETACH"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Impossibile creare la tabella dei segnalibri: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Impossibile aggiungere il segnalibro: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Impossibile importare dal vecchio database: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Aggiornamento segnalibro fallito: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "I segnalibri non possono essere salvati. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Impossibile rimuovere il segnalibro: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Le impostazioni non possono essere salvate. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "La sessione non può essere caricata: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "La sessione non può essere salvata. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Il cestino non può essere salvato. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 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."
+"usato. Puoi segnalare il problema a %s"
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modifica _preferenze"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Disabilita tutte le _estensioni"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr ""
 "Abilitare questa opzione per mostrare una finestra nel caso Midori si sia "
 "chiuso inaspettatamente"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Scarta le schede vecchie"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Mostra l'ultimo lo_g di errore"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Avvia in _debugger"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "I segnalibri non possono essere caricati: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "La sessione non può essere caricata: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Il cestino non può essere caricato: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "La cronologia non può essere caricata: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Si sono presentati i seguenti errori:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignora"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Errore SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Accetta"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Accetta per la sessione"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Blocca"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Impossibile aprire il databese dell'estensione: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Errore nell'esecuzione della dichiarazione del database: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Eliminare veramente tutti i permessi dei cookie?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Eliminare tutti i permessi dei cookie?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2897,20 +3200,20 @@ msgstr ""
 "Questa operazione eliminerà tutti i permessi dei cookie. Verrà richiesto di "
 "nuovo il permesso per ogni sito visitato."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Gestore dei permessi dei cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Istanza del gestore dei permessi cookie corrente"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configura i permessi dei cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2924,23 +3227,13 @@ msgstr ""
 "regola associata ad un dominio inserendo il nome di tale dominio qui sotto, "
 "scegliendo la regola e cliccando su <i>Aggiungi</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Dominio"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Politica"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Rimuovi _tutto"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Politica per i cookie da domini non in lista "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Chiedi la _politica da adottare per i domini sconosciuti"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Chiedi cosa fare"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2954,153 +3247,139 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Errore nell'estensione di gestione dei permessi dei cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Ragione"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Impossibile creare la cartella di configurazione per l'estensione: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Impossibile creare la cartella di configurazione per l'estensione"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Impossibile aprire il database dell'estensione."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Impossibile impostare la struttura del database dell'estensione."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "Impossibile determinare la politica sui cookie da applicare per il dominio: "
 "%s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Fino al termine della sessione."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Il sito %s vuole salvare %d cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Il sito %s vuole salvare un cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Più siti vogliono salvare complessivamente %d cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Accetta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Accetta per questa _sessione"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Ne_ga"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Nega ques_ta volta"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Percorso"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valore"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Data di scadenza"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Istanza estensione"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"La politica da usare per i domini non è configurata individualmente. Questo "
+"serve a restringere ulteriormente la politica globale per i cookie impostata "
+"nelle preferenze di Midori."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "L'istanza dell'estensione di Midori per questa estensione"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Gestore della sicurezza dei cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Istanza applicazione"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Gestisce i permessi dei cookie per sito"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-"L'istanza dell'estensione di Midori a cui questa estensione di riferisce"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Impossibile recuperare l'icona dell'applicazione in %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Istanza database"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Indicatore dell'istanza del database sqlite usata da questa estensione"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Impossibile creare il nuovo lanciatore (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Percorso del Database"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Lanciatore creato"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-"Percorso all'istanza del database sqlite utilizzato da questa estensione"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Ora puoi lanciare <b>%s</b> dal tuo lanciatore o dal menu"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Chiedi per politica sconosciuta"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Errore nella creazione del lanciatore"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"Se vero, l'estensione chiede il comportamento da adottare per ogni dominio "
-"sconosciuto. Se falso questa estensione utilizza il comportamento globale "
-"per i cookie definito nelle impostazioni di Midori."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applicazioni"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Sconosciuto"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Nuovo _Profilo"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Gestore della sicurezza dei cookie"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Crea un nuovo profilo indipendente ed un lanciatore"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "Gestisce i permessi dei cookie per sito"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nuova_App"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Applicazioni"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Crea nuova applicazione per un sito specifico"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Errore di avvio"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Crea avvia_tore"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Gestore applicazioni web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Gestione dei siti web installati come applicazioni"
 
@@ -3108,911 +3387,198 @@ msgstr "Gestione dei siti web installati come applicazioni"
 msgid "Transfers"
 msgstr "Trasferimenti"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Cancella tutto"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Impossibile aprire il download: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Apri _cartella di destinazione"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copia l'indirizzo del colle_gamento"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Il file «<b>%s</b>» è stato trasferito."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' e %d altri files sono stati scaricati."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Trasferimento completato"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Alcuni file sono stati scaricati"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Chiudi Midori"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "I trasferimenti verranno annullati se Midori viene chiuso"
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Gestore dei trasferimenti"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Mostra i file scaricati"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Tasto centrale apre la selezione"
-
-#~ 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"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr ""
-#~ "Impossibile ottenere il percorso alla configurazione dell'estensione"
-
-#~ msgid "Custom..."
-#~ msgstr "Personalizzato…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Conferma salvataggio del cookie"
-
-#~ msgid "Writing failed."
-#~ msgstr "Errore di scrittura."
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Come essere identificati sul web"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Scorrimento per movimento"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr ""
-#~ "Se durante lo scorrimento si deve tener conto della velocità del movimento"
-
-#~ msgid "_Window"
-#~ msgstr "Fi_nestra"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Aggiungi collegamento sulla _scrivania"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Redirige gli avvisi di console al NOMEFILE specificato"
-
-#~ msgid "FILENAME"
-#~ msgstr "NOMEFILE"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Evidenzia risultati"
-
-#~ 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 "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 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 "Not found - %s"
-#~ msgstr "Non trovato - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Il documento non può essere visualizzato"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Forza 96 punti per pollice"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Abilitare questa opzione per forzare la densità dei punti a 96 DPI"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configura i filtri per gli av_visi pubblicitari…"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Scorre tra le schede con i tasti Ctrl+Tab in ordine di utilizzo"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Cookie"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Cancella i cookie quando Midori viene chiuso"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Elimina i cookie obsoleti dopo 1 ora"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Elimina i cookie obsoleti dopo 1 settimana"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Elimina i cookie obsoleti dopo 1 anno"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Impossibile eseguire la richiesta al database\n"
-
-#~ msgid "All cookies"
-#~ msgstr "Tutti i cookie"
-
-#~ msgid "Session cookies"
-#~ msgstr "Cookie di sessione"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Mostra la barra dei trasferimenti"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Abilitare questa opzione per mostrare la barra degli scaricamenti"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Motori di ricerca nell'autocompletamento"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr ""
-#~ "Abilitare questa opzione per mostrare i motori di ricerca durante il "
-#~ "completamento dell'indirizzo"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Mostra i controlli operativi del pannello"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr ""
-#~ "Abilitare questa opzione per mostrare i controlli operativi del pannello"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Mostra le selezioni veloci nelle nuove schede"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr ""
-#~ "Abilitare questa opzione per mostrare la selezione veloce nelle nuove "
-#~ "schede"
-
-#~ msgid "Download Manager"
-#~ msgstr "Gestione scaricamenti"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Apri le pagine esterne in:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Indicare che tipo di cookie devono essere accettati"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Durata massima dei cookie"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Durata cronologia"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Ricorda gli ultimi file scaricati"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr ""
-#~ "Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati"
-
-#~ msgid "General"
-#~ msgstr "Generale"
-
-#~ msgid "Appearance"
-#~ msgstr "Visualizzazione"
-
-#~ msgid "Font settings"
-#~ msgstr "Impostazioni caratteri"
-
-#~ msgid "Interface"
-#~ msgstr "Interfaccia"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Barra di navigazione"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Scheda successiva (lista cronologia)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Scheda precedente (lista cronologia)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Scheda precedente dalla cronologia"
-
-#~ msgid "Quit the application"
-#~ msgstr "Esce dall'applicazione"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Scarica con Gestore scarica_menti"
-
-#~ msgid "External applications"
-#~ msgstr "Applicazioni esterne"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s di %s, %s/s"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Apre la cartella di destinazione dell'addon selezionato"
-
-#~ msgid "Pageholder"
-#~ msgstr "Cornice della pagina"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Cornice della pagina"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Mantiene una o più pagine aperte in parallelo alla schede"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% caricato"
-
-#~ msgid "_Contents"
-#~ msgstr "_Contenuti"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Mostra la documentazione"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Mostra la barra dei trasferimenti"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Mostra caricamento nella barra degli indirizzi"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr ""
-#~ "Abilitare questa opzione per mostrare la percentuale di caricamento della "
-#~ "pagina nella barra degli indirizzi"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Salva indirizzo collegamento"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "Scarica in_dirizzo collegamento"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Richiedi cartella di destinazione"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr ""
-#~ "Abilitare questa opzione per chiedere la cartella di destinazione quando "
-#~ "si scarica un file"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr ""
-#~ "Abilitare questa opzione per mostrare una notifica quando viene "
-#~ "completato un trasferimento"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Scarica i_mmagine"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Errore nella cancellazione della cronologia delle ricerche: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Stacca il pannello selezionato dalla finestra"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Nasconde i controlli operativi"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Controllo dell'ortografia"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Una lista separata da virgole da usare per il controllo ortografico, per "
-#~ "esempio \"en_GB, de_DE\""
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimizza la scheda _corrente"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimizza la scheda corrente"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Dizionari di controllo ortografico:"
-
-#~ msgid "Console"
-#~ msgstr "Console"
-
-#~ msgid "Copy _All"
-#~ msgstr "Copi_a Tutto"
-
-#~ msgid "Copy All"
-#~ msgstr "Copia tutto"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Gestore _Cookie"
-
-#~ msgid "External Applications"
-#~ msgstr "Applicazioni esterne"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Associa gli schemi URL con comandi esterni"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "_Ripristina scheda"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimizza scheda"
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Copia %s nella cartella %s."
-
-#~ msgid "Minimize new Tabs"
-#~ msgstr "Minimizza le nuove schede"
-
-#~ msgid "New tabs open minimized"
-#~ msgstr "Le nuove schede sono aperte minimizzate"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "Pagine visitate _recentemente"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Riapre le pagine visitate recentemente"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Cookie originali"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Ricorda ultime pagine visitate"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr ""
-#~ "Abilitare questa opzione per salvare l'elenco delle ultime pagine visitate"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Riconosci automaticamente il server proxy"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr ""
-#~ "Abilitare questa opzione per riconoscere automaticamente il server proxy "
-#~ "di sistema"
-
-#~ msgid "Open _Link"
-#~ msgstr "Apri co_llegamento"
-
-#~ msgid "Enable developer tools"
-#~ msgstr "Abilita strumenti di sviluppo"
-
-#~ msgid "Enable special extensions for developers"
-#~ msgstr ""
-#~ "Abilitare questa opzione per utilizzare le estensioni per gli sviluppatori"
-
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Copia gli script utente nella cartella %s e copia gli stili utente nella "
-#~ "cartella %s."
-
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Precarica gli indirizzi IP dei collegamenti attraversati"
-
-#~ msgid "Not available on this platform"
-#~ msgstr "Non disponibile in questa piattaforma"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Aggiornamento database fallito: %s"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Ridimensiona immagini"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Impossibile leggere il database: %s"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr ""
-#~ "Abilitare per ridimensionare automaticamente le immagini caricate da sole"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Impossibile importare la vecchia sessione: %s"
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Colora le etichette in modo distinto"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Striato"
 
-#~ msgid "_Quick Find"
-#~ msgstr "Ricerca _veloce"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestione schede e sessioni"
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Salta velocemente a una parola o frase"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Both"
-#~ msgstr "Entrambi"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Questa estensione fornisce una lista di task per aggiornamenti di lavoro ed "
+"eventi ricorrenti"
 
-#~ msgid "Both horizontal"
-#~ msgstr "Entrambi orizzontalmente"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Aggiunta della nuova nota al database fallita: %s\n"
 
-#~ msgid "Load on Startup"
-#~ msgstr "Carica all'avvio"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+"Rimozione della nota dal database fallita\n"
+"%s\n"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Ricorda i moduli compilati"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+"Rinominazione della nota fallita\n"
+"%s\n"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Abilitare per salvare le informazioni inserite nei moduli."
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+"Aggiornamento della nota fallito\n"
+"%s\n"
 
-#~ msgid "Cache size"
-#~ msgstr "File temporanei"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Note"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Dimensione massima consentita per i file temporanei"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nuova Nota"
 
-#~ msgid "Search"
-#~ msgstr "Cerca"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Crea una nuova nota vuota, distinta dalle pagine aperte"
 
-#~ msgid "Encoding"
-#~ msgstr "Codifica"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nuova nota"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Scegliere la codifica predefinita dei caratteri"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Impossibile accedere alle note del database: %s\n"
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Aree di testo ridimensionabili"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Rinomina la nota"
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Abilitare per rendere le aree di testo ridimensionabili"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copia nota negli appunti"
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore."
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Elimina nota"
 
-#~ msgid "Enable"
-#~ msgstr "Abilita"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copia la selezione in una nota"
 
-#~ msgid "_Disable"
-#~ msgstr "_Disabilita"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Salva testo da pagina web come nota"
 
-#~ msgid "Disable"
-#~ msgstr "Disabilita"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blocca avvisi pubblicitari"
 
-#~ msgid "Source"
-#~ msgstr "Sorgente"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri"
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s non ha la proprietà «%s»"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurazione dei filtri per gli avvisi pubblicitari"
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s non può essere assegnato a %s.%s"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_occa immagine"
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s non è accessibile"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_occa collegamento"
 
-#~ msgid "Plugins"
-#~ msgstr "Plugin"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Modifica regola"
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Icona (nome o file):"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regola:"
index 05598ac8ec3603848c728a8e9aee66b40017f3e6..ff523e45d1f66ea9746dba90d282d73af0110a3e 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,19 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midori 0.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-25 22:50+0900\n"
-"PO-Revision-Date: 2013-04-25 23:14+0900\n"
-"Last-Translator: Masato Hashimoto <cabezon.hashimoto@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-06-06 20:10+0000\n"
+"Last-Translator: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp@googlegroups.com>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:01+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: ja\n"
 
-#: ../data/midori.desktop.in.h:1 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
@@ -39,11 +40,11 @@ msgstr "ウェブを閲覧します"
 msgid "Internet;WWW;Explorer"
 msgstr "インターネット;WWW;エクスプローラー"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "新しいタブ"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "新しいウィンドウ"
 
@@ -55,7 +56,7 @@ msgstr "新しいプライベートブラウジングウィンドウ"
 msgid "Midori Private Browsing"
 msgstr "Midori プライベートブラウジング"
 
-#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "プライベートブラウジング"
 
@@ -63,168 +64,167 @@ msgstr "プライベートブラウジング"
 msgid "Open a new private browsing window"
 msgstr "新しいプライベートブラウジングウィンドウを開きます"
 
-#: ../midori/main.c:72
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "スナップショットを取得しました: %s\n"
 
 # CLI --help
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADDRESS をウェブアプリケーションとして実行する"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
 # CLI --help
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "設定フォルダーとして FOLDER を使用する"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
 # CLI --help
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "プライベートブラウジングで変更を保存しない"
 
 # CLI --help
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "ポータブルモード。すべてのランタイムファイルを 1 箇所に格納する"
 
 # CLI --help
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "GtkLauncher と同種の、WebKit を使用したプレーン GTK+ ウィンドウ"
 
-# CLI --help
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "診断ダイアログを表示する"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "gdb 上で起動しクラッシュ時にバックトレースを保存する"
 
 # CLI --help
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "指定されたファイル名を javascript として実行する"
 
 # CLI --help
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "指定された URI のスナップショットを取得する"
 
 # CLI --help
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "指定されたコマンドを実行する"
 
 # CLI help
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "-e/ --execute で実行できるコマンドの一覧を表示する"
 
 # CLI --help
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "プログラムのバージョンを表示する"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "アドレス"
 
 # CLI --help
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "正規表現 PATTERN に従って URI をブロックする"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATTERN"
 
 # CLI --help
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "エラー: \"gdb\" が見つかりません\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "新しいバージョンのチェックはこちら:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "未知のエラーが発生しました"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "ブックマーク(_B)"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "ブックマークに追加(_K)"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "エクステンション(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "履歴(_H)"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "ユーザースクリプト(_U)"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "ユーザースタイル(_S)"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "新しいタブ(_T)"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "転送(_T)"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape プラグイン(_L)"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "閉じたタブ(_C)"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "新しいウィンドウ(_W)"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "新しいフォルダー(_F)"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[アドレス]"
 
@@ -242,656 +242,682 @@ msgid "Unrecognized bookmark format."
 msgstr "認識できないブックマーク形式です。"
 
 # tooltip
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "次のサブページへ進みます"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "ウェブ検索…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "現在のページを再読み込みします"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "現在のページの読み込みを中止します"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "タイトルの更新に失敗しました: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "'%s' は %s の値として無効です"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "'%s' は予想外の設定です"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "'%s' は想定外のアクションです。"
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (プライベートブラウジング)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "新規履歴アイテムの挿入に失敗しました: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "新しいフォルダー"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "フォルダーの編集"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "新しいブックマーク"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "ブックマークの編集"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "ã\81\93ã\81®ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\81®å\90\8då\89\8dã\81®ã\81¨è¿½å\8a å\85\88ã\82\92æ\8c\87å®\9aしてください。"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "ã\81\93ã\81®ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\81®å\90\8då\89\8dã\82\92å\85¥å\8a\9bã\81\97ã\80\81追å\8a å\85\88ã\82\92é\81¸æ\8a\9eしてください。"
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "ã\82¹ã\83\94ã\83¼ã\83\89ã\83\80ã\82¤ã\82¢ã\83«ã\81«è¿½å\8a (_S)"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "ã\81\93ã\81®ã\83\95ã\82©ã\83«ã\83\80ã\83¼ã\81®å\90\8då\89\8dã\82\92å\85¥å\8a\9bã\81\97ã\80\81追å\8a å\85\88ã\82\92é\81¸æ\8a\9eã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "ã\83\84ã\83¼ã\83«バーに表示する(_B)"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯バーに表示する(_B)"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "ã\82¦ã\82§ã\83\96ã\82¢ã\83\97ã\83ªã\82±ã\83¼ã\82·ã\83§ã\83³ã\81¨ã\81\97ã\81¦å®\9fè¡\8cã\81\99ã\82\8b(_W)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "ã\82¹ã\83\94ã\83¼ã\83\89ã\83\80ã\82¤ã\82¢ã\83«ã\81«è¿½å\8a (_S)"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "名前を付けて保存"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "関連リソースも保存する(_R)"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "新しいウィンドウが開かれました"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "新しいタブが開かれました"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "画像を開く際にエラーが発生しました"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "デフォルトの画像ビューアーでは選択された画像を開けません。"
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "画像をダウンロードする際にエラーが発生しました"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "選択された画像をダウンロードできません。"
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "ファイルの保存"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "ページをキャッシュせずに再読み込み"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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 の設定のアプリケーションタブでフィードリーダーを指定してください。次にニュースフィードアイコンをクリックした時に自動的に追加されます。"
+"もしくは Midori "
+"の設定のアプリケーションタブでフィードリーダーを指定してください。次にニュースフィードアイコンをクリックした時に自動的に追加されます。"
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "新しいフィード"
 
 # tooltip
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "新しいブックマークを追加します"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "このページを共有します"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "空です"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "テキストカーソルナビゲーションへの切り替え"
 
-#: ../midori/midori-browser.c:3500
-msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
 msgstr "F7 キーでキャレットブラウジングに切り替えます。有効にすると、テキストカーソルがすべてのウェブサイト上に表示されます。"
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "キャレットブラウジングを有効にする(_E)"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "新規履歴アイテムの挿入に失敗しました: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "タブですべて開く(_T)"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "新しいタブで開く(_T)"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "新しいウィンドウで開く(_W)"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "風博士"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "ブックマークのインポート…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "ブックマークのインポート(_I)"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "アプリケーション(_A):"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "XBEL または HTML ファイルからインポート"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "ファイルからインポート"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "ブックマークのインポートに失敗しました"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL ブックマーク"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape ブックマーク"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "ブックマークのエクスポートに失敗しました"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "軽快なウェブブラウザー"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
-msgstr "バージョン情報は about:version をご覧ください。"
+msgstr "詳しいバージョン情報は about:version をご覧ください。"
 
-#: ../midori/midori-browser.c:4764
-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: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 ""
+"このライブラリはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 "
+"あるいはそれ以降のいずれかの版で定める条件下で再配布および/または改変することができます。"
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Masato Hashimoto <hashimo@xfce.org>"
+msgstr ""
+"Masato Hashimoto <hashimo@xfce.org>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  BALLOON a.k.a. Fu-sen. https://launchpad.net/~balloon\n"
+"  Joji Bronner https://launchpad.net/~jojiinchrist\n"
+"  Masato HASHIMOTO https://launchpad.net/~hashimo"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "現在のタブの複製(_D)"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "ファイル(_F)"
 
 # tooltip
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "新しいウィンドウを開きます"
 
 # tooltip
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "新しいタブを開きます"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "新しいプライベートブラウジングウィンドウ(_R)"
 
 # tooltip
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "ファイルを開きます"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "名前を付けてページを保存(_S)…"
 
 # tooltip
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "ファイルへ保存します"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "スピードダイアルに追加(_D)"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "ニュースフィードを購読(_F)"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "タブを閉じる(_C)"
 
 # tooltip
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "現在のタブを閉じます"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "ウィンドウを閉じる(_L)"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "共有(_S)"
-
 # tooltip
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "現在のページを印刷します"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "すべてのウィンドウを閉じる(_L)"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "検索(_F)…"
 
 # tooltip
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "ページ内の単語やフレーズを検索します"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "次を検索(_N)"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "前を検索(_P)"
 
 # tooltip
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "このアプリケーションの設定を行います"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "ツールバー(_T)"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "ページをキャッシュせずに再読み込み"
-
 # tooltip
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "ズームレベルを大きくします"
 
 # tooltip
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "ズームレベルを小さくします"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "エンコーディング(_E)"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "ソースを表示(_U)"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "DOM ソースの表示(_D)"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "キャレットブラウジング(_R)"
 
 # tooltip
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "全画面表示/解除を切り替えます"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "左へスクロール(_L)"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "下へスクロール(_D)"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "上へスクロール(_U)"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "右へスクロール(_R)"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "読み込み可(_R)"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "移動(_G)"
 
 # tooltip
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "前のページへ戻ります"
 
 # tooltip
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "前のサブページへ戻ります"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "次へ"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "次のサブページまたは履歴の次のページに移動します"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "ホームページ(_H)"
 
 # tooltip
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "ホームページに移動します"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "ゴミ箱を空にする"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "閉じたタブを元に戻す(_C)"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "新しいフォルダーの追加(_F)"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\81®ã\82¨ã\82¯ã\82¹ã\83\9dã\83¼ã\83\88(_E)"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\81®ã\82¤ã\83³ã\83\9dã\83¼ã\83\88(_I)â\80¦"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "検索エンジンの管理(_M)"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "ブックマークのエクスポート(_E)…"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "プライベートデータのクリア(_C)"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "検索エンジンの管理(_M)…"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "プライベートデータのクリア(_C)…"
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "ページの調査(_I)"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "前のタブ(_P)"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "次のタブ(_N)"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "タブを先頭に移動(_F)"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "後ろのタブへ移動(_B)"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "前のタブへ移動(_M)"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "タブを最後尾に移動(_L)"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "現在のタブにフォーカス(_C)"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "次のビューをフォーカス(_N)"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "現在のタブのアイコンのみ表示(_C)"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "現在のタブの複製(_D)"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "他のタブを閉じる(_H)"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "最後のセッションを開く(_S)"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "よくある質問(_F)"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "問題を報告(_R)…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "ツール(_T)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "メニューバー(_M)"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "ナビゲーションバー(_N)"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "サイドパネル(_P)"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "サイドパネル"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "ブックマークバー(_B)"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "ステータスバー(_S)"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "中国語繁体字 (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "中国語簡体字 (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "日本語 (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "ロシア語 (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "カスタム…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "履歴のクリアに失敗しました: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "セパレーター(_S)"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "場所(_L)…"
 
 # tooltip
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "指定された場所を開きます"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "ウェブ検索(_W)…"
 
 # tooltip
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "ウェブ検索を実行します"
 
 # tooltip
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "これまでに閉じられたタブやウィンドウを再び開きます"
 
 # tooltip
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "ブックマークを表示します"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "タブ(_T)"
 
 # tooltip
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "開いているすべてのタブのリストを表示します"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "メニュー(_M)"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "メニュー"
 
@@ -900,69 +926,73 @@ msgstr "メニュー"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "エクステンション '%s' の設定を読み込めませんでした: %s\n"
 
-#: ../midori/midori-extension.c:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "証明書のエクスポート"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "未知の署名認証局です。"
 
-#: ../midori/midori-locationaction.c:1366
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr "証明書が、それが回収されたサイトから想定されるものと一致しません。"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "証明書のアクティベート日時がまだ未来なままです。"
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "証明書は失効しています"
 
-#: ../midori/midori-locationaction.c:1372
-msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list."
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
 msgstr "GTlsConnection の証明書失効リストに従いこの証明書は破棄されました。"
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "この証明書のアルゴリズムはセキュアでないと考えられます。"
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "この証明書の認証中にいくつか他のエラーが発生しました。"
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "証明書のエクスポート(_E)"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "自己署名"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "セキュリティ詳細"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "貼り付けて開く(_R)"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "未検証"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "検証済および暗号化接続"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "公開、非暗号化接続"
 
@@ -982,589 +1012,599 @@ msgstr "パネルを閉じます"
 msgid "Align sidepanel to the left"
 msgstr "サイドパネルを左側に配置します"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "スピードダイアルを表示"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "ホームページを表示"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "最後に開いたタブを表示"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "最後のタブを読み込まずに表示"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "空白ページを表示"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "デフォルトの検索エンジンを表示"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "カスタムページを表示"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "日本語 (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "新しいタブに表示"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "新しいウィンドウに表示"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "現在のタブに表示"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "アイコン"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "小さいアイコン"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "文字"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "アイコンと文字"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "アイコンと文字 (横方向)"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "自動 (GNOME または環境変数)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP プロキシサーバー"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "プロキシサーバーなし"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
 # tooltip
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "ツールバーの表示方式を指定します"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "常にこの設定を使用する"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "ウェブサイトで指定されているフォントより本設定を優先します"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "設定を読み込めませんでした: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "無効な設定値 '%s'"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "スタイルシートのインジェクションに失敗しました: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "タブラベルの表示(_L)"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "タブアイコンのみ表示(_I)"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "ここより右のタブをすべて閉じる"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "他のタブを閉じる(_H)"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "このウェブサイトを信用する"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "セキュリティ不明"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s は HTML5 データベースの保存を要求しています。"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "許可しない(_D)"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "許可する(_A)"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s はあなたの場所を知ろうとしています。"
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "エラー - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' が見つかりませんでした"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "ページ '%s' を読み込めませんでした"
+msgid "The page '%s' couldn't be loaded:"
+msgstr "ページ '%s' を読み込めませんでした:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "アドレスに誤りがないか確認してください"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "LAN ケーブルが接続されているかどうか、または無線 LAN カードが有効になっているか確認してください"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "ネットワークが正しく設定されているか確認してください"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "再試行"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "おっと - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "'%s' で何かうまく行かなかったようです。"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "再試行"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "メッセージを送信します 宛先: %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "検索エンジンの追加(_S)..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "要素の検証(_E)"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "リンクを開く(_L)"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "リンクを新しいタブで開く(_T)"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "リンクをフォアグラウンドのタブで開く(_F)"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "リンクをバックグラウンドのタブで開く(_B)"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "リンクを新しいウィンドウで開く(_W)"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "ウェブアプリケーションとして実行する(_P)"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "リンク先をコピー(_S)"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "名前を付けてページを保存(_A)…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "新しいウィンドウで画像を開く(_I)"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "画像を新しいタブで開く(_I)"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "画像をコピー(_A)"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "画像を保存(_M)"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "画像ビューアーで開く(_V)"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "動画のアドレスをコピー(_A)"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "動画を保存(_V)"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "動画をダウンロード(_V)"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "アドレスを新しいタブで開く(_T)"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "検索(_W)"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "ウェブで検索(_S)"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "アドレスを新しいタブで開く(_T)"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "フレームを新しいタブで開く(_F)"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "要素の検証(_E)"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "%s を開く、またはダウンロードします"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "ファイル名: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "ファイルタイプ: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "ファイルタイプ: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s を開く"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "ページの調査 - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "ドキュメントはインストールされていません"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori はあらゆる個人データを保存しません:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "履歴あるいはウェブ Cookie は保存されません。"
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "エクステンションは無効になります。"
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "HTML5 ストレージ、ローカルデータベース、およびアプリケーションキャッシュは無効になります。"
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori はウェブサイトによるユーザーのトラッキングを阻止します:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "リファラー URL はホスト名に短縮されます。"
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "DNS プリフェッチは無効になります。"
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "言語およびタイムゾーンはウェブサイトには通知されません。"
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Flash およびその他の Netscape プラグインはウェブサイトには記録されません。"
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。"
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "読み込みが保留されたページ"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "ページ読み込み遅延:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "最近のクラッシュか起動設定により読み込みが保留されています。"
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "ページを読み込む"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "空白ページ"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "タブの複製(_D)"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "タブラベルの表示(_L)"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "タブアイコンのみ表示(_I)"
-
-#: ../midori/midori-view.c:4904
-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:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "前"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "次"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "背景画像を印刷する"
 
 # tooltip
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "印刷する時に背景画像も印刷します"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "機能"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, 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:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - 残り %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "ダウンロードしたファイルに問題があります。"
 
-#: ../midori/midori-download.vala:225
-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:221
+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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "ファイル \"%s\" をこのフォルダーに保存することはできません。"
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "この場所への書き込み権がありません。"
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。"
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。"
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "スピードダイアル"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "クリックするとショートカットを追加できます"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "ショートカットのアドレスを入力してください"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "ショートカットの名前を入力してください"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "このショートカットを削除してもよろしいですか?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "起動"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Midori を起動した時:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "ホームページ:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "現在のページを使用(_C)"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "現在のページをホームページにする"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "プロポーショナルフォントファミリ"
 
 # tooltip
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "文字表示で使用するデフォルトのフォントファミリを指定します"
 
 # tooltip
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "文字表示で使用するデフォルトのフォントサイズを指定します"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "等幅フォントファミリ"
 
 # tooltip
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "等幅文字表示で使用するフォントファミリを指定します"
 
 # tooltip
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "等幅文字表示で使用するフォントのサイズを指定します"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "最小フォントサイズ"
 
 # tooltip
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "文字表示で使用する最小のフォントサイズを指定します"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "文字のエンコーディング"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "振る舞い"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "画像を自動的に読み込む"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "スペルチェックを有効にする"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "スクリプトを有効にする"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "WebGL サポートを有効にする"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape プラグインを有効にする"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "文字や画像を拡大/縮小する"
@@ -1578,248 +1618,261 @@ msgstr "ポップアップを表示するスクリプトを許可する"
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "デフォルトズームレベル"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "新しくタブを開いた時の拡大率です"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "言語の優先度"
 
-#: ../midori/midori-preferences.c:420
-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\" など"
+#: ../midori/midori-preferences.c:426
+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\" など"
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "ダウンロードファイルの保存先:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "ブラウジング"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "テーマ:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "ツールバー方式:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "新しくページを開く時:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "新しいタブを開いた時:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "タブに閉じるボタンを表示する"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "常にタブバーを表示する"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "現在のタブの隣に開く"
 
 # tooltip
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "タブをバックグラウンドで開く"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "テキストエディター"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "フィードリーダー"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "プロキシサーバー"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "ホスト名"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "ポート"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "サポートするプロキシのタイプ:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "ウェブキャッシュ"
 
 # tooltip
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "ディスクのキャッシュページの最大サイズを指定します"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "識別名"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "プライバシー"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "古い Cookie を削除:"
 
 # tooltip
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Cookie を保存する最大日数です"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "訪問したウェブサイトからの Cookie のみ受け入れる"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "サードパーティウェブサイトから送られた Cookie はブロックします"
 
-#: ../midori/midori-preferences.c:565
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
 msgstr "Cookie には、ログインデータやゲームデータ、広告用のユーザープロファイルなどが格納されます。"
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "オフラインウェブアプリケーションキャッシュを有効にする"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 ローカルストレージサポートを有効にする"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "外部サイトへ送るリファラーの詳細情報を除去する"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "\"Referer\" ヘッダーはホスト名に短縮されます"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "履歴から古いページを削除:"
 
 # tooltip
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "履歴を保存する最大日数です"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "エクステンション"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "検索エンジンの管理(_M)"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "検索エンジンの追加"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "検索エンジンの編集"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "説明(_D):"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "アドレス(_A):"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "トークン(_T):"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "検索エンジンの管理"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "デフォルトで使う(_D)"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "検索エンジンを読み込めませんでした。%s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "検索エンジンを保存できませんでした。%s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "履歴"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "ブックマークと履歴"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "履歴のクリアに失敗しました: %s"
+msgid "Search for %s"
+msgstr "%s を検索"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "履歴からの選択に失敗しました: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s を検索"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "検索…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "%s で検索"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "アプリケーションで開く"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "\"%s\" を開くアプリケーションまたはコマンドを選択してください:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "外部プログラムを実行できませんでした。"
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "不正な URI"
 
@@ -1844,83 +1897,138 @@ msgstr "大文字・小文字を区別"
 msgid "Close Findbar"
 msgstr "検索バーを閉じる"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "ブックマークアイテムの追加に失敗しました: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d 個のブックマーク"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "ブックマークの更新に失敗しました: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d 個のサブフォルダー"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "空のフォルダー"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "フォルダーには %s が含まれており、ブックマークはありません"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "フォルダーには %s が含まれています"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "フォルダーには %s と %s が含まれています"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "リンク先: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s と 0 個のブックマーク"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s と %s"
 
 # tooltip
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "選択したブックマークを編集します"
 
 # tooltip
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "選択したブックマークを削除します"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "新しいフォルダーの追加"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>セパレーター</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "新しいタブで開く(_T)"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "ブックマークを検索"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "履歴"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "今日"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "昨日"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "一週間前"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "履歴アイテムの削除に失敗しました: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "すべての履歴アイテムを削除してよろしいですか?"
 
 # tooltip
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "選択した履歴アイテムをブックマークに追加します"
 
 # tooltip
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "選択した履歴アイテムを削除します"
 
 # tooltip
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "すべての履歴をクリアします"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "履歴を検索"
 
@@ -1948,110 +2056,63 @@ msgstr "パスワード"
 msgid "_Remember password"
 msgstr "パスワードを記憶する(_R)"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "アイコン名 '%s' を読み込めませんでした"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "ストックアイコン '%s' を読み込めませんでした"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "アニメーションフレームは壊れています"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "なし"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "'%s' は %s のプロパティとして無効です"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "ファイルの選択"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "フォルダーの選択"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 時間以上過去"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 日以上過去"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 週間以上過去"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 ヶ月以上過去"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 年以上過去"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s の設定"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 チェックサム:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 チェックサム:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "広告フィルターの設定"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "ルールの編集"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "ルール(_R):"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "画像をブロック(_O)"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "リンクをブロック(_O)"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "広告ブロッカー"
-
-# description
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "このページにはユーザースクリプトが含まれているようです。それをインストールしてもよろしいですか?"
 
 #: ../extensions/addons.c:223
@@ -2071,16 +2132,16 @@ msgstr "ユーザースタイルをインストール(_I)"
 msgid "Don't install"
 msgstr "インストールしない"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "ユーザースクリプト"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "ユーザースタイル"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "エラー"
 
@@ -2103,44 +2164,44 @@ msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "ファイル <b>%s</b> は完全に削除されます。"
 
 # tooltip
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "テキストエディターで開きます"
 
 # tooltip
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "対象フォルダーを開きます"
 
 # tooltip
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "新しいアドオンを追加します"
 
 # tooltip
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "選択したアドオンを削除します"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "ユーザーアドオン"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "フォルダー '%s' をモニターできません: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "ユーザースクリプトやユーザースタイルをサポートします"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "カラフルタブ"
 
 # description
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "各タブにそれぞれを区別する色をつけます"
 
@@ -2149,42 +2210,45 @@ msgstr "各タブにそれぞれを区別する色をつけます"
 msgid "Cookie Manager"
 msgstr "Cookie マネージャー"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 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:101
+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:116
 msgid "Expand All"
 msgstr "すべて展開します"
 
 # tooltip
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "すべて折り畳みます"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "本当にすべての Cookie を削除してよろしいですか?"
 
 # Dialog title
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "確認"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "フィルターに入力された文字列にマッチした Cookie のみ削除されます。"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "セッションの終わりまで"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2203,16 +2267,16 @@ msgstr ""
 
 # cookie: Secure flag is set.
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "あり"
 
 # cookie: Secure flag isn't set.
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "なし"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2222,20 +2286,20 @@ msgstr ""
 "<b>Cookie の数</b>: %d"
 
 # Column name of cookie browser
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "名前"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "すべて展開する(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "すべて折り畳む(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "名前またはドメインで Cookie を検索"
 
@@ -2257,26 +2321,49 @@ msgstr "タブのアドレスのコピー"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "すべてのタブのアドレスをクリップボードにコピーします"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "遅延読み込み"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "ページの読み込みを開始するまでの遅延時間 (秒):"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "実際にタブを使用するまでページの読み込みを遅らせます"
 
-#: ../extensions/external-download-manager.vala:124
-msgid "An error occurred when attempting to download a file with the following plugin:\n"
-msgstr "以下のプラグインでファイルをダウンロードする時にエラーが発生しました:\n"
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "ダブルクリックで詳細情報を表示します"
 
-#: ../extensions/external-download-manager.vala:175
-msgid "External Download Manager - Aria2"
-msgstr "外部ダウンロードマネージャー - Aria2"
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Glib エラーメッセージをシステムトレイに表示します"
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"以下のプラグインでファイルをダウンロードしようとした際にエラーが発生しました:\n"
+"%s\n"
+"\n"
+"エラー:\n"
+"%s\n"
+"\n"
+"他のプラグインで試してみてください。"
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "外部ダウンロードマネージャー - Aria2"
 
 #: ../extensions/external-download-manager.vala:176
 msgid "Download files with Aria2"
@@ -2312,25 +2399,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "最終更新: %s"
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "フィード"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "新しいフィードの追加"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "フィードの削除"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "フィード(_F)"
 
@@ -2349,38 +2436,38 @@ msgstr "サポートされていないフィード形式です。"
 msgid "Failed to parse XML feed: %s"
 msgstr "XML フィードの解析に失敗しました: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "RSS XML データ内に \"channel\" 要素が見つかりませんでした。"
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "サポートされていない RSS バージョンが見つかりました。"
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "XML データ内に要求された RSS \"item\" 要素が見つかりませんでした。"
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "XML データ内に要求された RSS \"channel\" 要素が見つかりませんでした。"
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "フィード '%s' はすでに存在します"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "フィード '%s' の読み込みでエラーです"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "フィードパネル"
 
 # description
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom/RSS フィードを購読します"
 
@@ -2401,121 +2488,398 @@ msgstr ""
 "パスワードデータベースを開くための\n"
 "マスターパスワードが必要です"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "このページのパスワードを記憶しますか?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "記憶する"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "今はしない"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "このページではしない"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "フォーム履歴の切り替え"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "現在のタブでのフォーム履歴を有効または無効にします。"
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "データベースのオープンに失敗しました: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "データベース文の実行に失敗しました: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "タブごとにホットキー (Ctrl+Shift+F) でのみフォーム履歴を有効にする"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "入力フォーム履歴フィルター"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "入力されたフォームデータの履歴を記憶します"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "サジェスチョンの選択に失敗しました\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "訪れていないタブはありません"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "履歴リスト"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "タブを閉じるときの振る舞い"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "最後に表示したタブへ切り替える"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "最新のタブへ切り替える"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "次の新しいタブ (履歴リスト)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "履歴から次の新しいタブへ切り替えます"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "前の新しいタブ (履歴リスト)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "履歴から前の新しいタブへ切り替えます"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "タブをバックグラウンドに表示 (履歴リスト)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "現在選択しているタブをバックグラウンドに表示します"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "履歴リスト"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "タブの切り替えや閉じた時に最後に使用したタブに移動します"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL 失敗: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "許可"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "このセッションのみ許可"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "拒否"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "エクステンションのデータベースを開けませんでした: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "データベース文の実行に失敗しました: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "本当にすべての JavaScript パーミッションを削除してよろしいですか?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "すべての JavaScript パーミッションを削除しますか?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"この操作ですべての JavaScript パーミッションを削除します。今後ウェブサイトを訪れる度にまたパーミッションについて尋ねられます。"
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "マネージャーインスタンス"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "グローバル NoJS マネージャーのインスタンス"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "NoJS の設定"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"以下はすべてのウェブサイトとそれに設定されたポリシーのリストです。エントリにマークして<i>削除</i>をクリックするとそのポリシーを削除します。"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "ドメイン"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "ポリシー"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "すべて削除(_A)"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "すべてのサイトでスクリプトを許可する(_L)"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "未知のドメインではデフォルトでスクリプトをブロックする(_K)"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "セカンドレベルドメインでパーミッションを設定する(_E)"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "%s を拒否"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "%s 許可"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "%s をこのセッションのみ許可"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "ブラウザーウィンドウ"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "このビューが所属する Midori ブラウザーインスタンスです"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "ビュー"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "このビューが所属する Midori ビューインスタンスです"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "メニューアイコン状態"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "ステータスバーに表示するメニューアイコンの状態です"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "未確定"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "許可"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "混在"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "拒否"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr "NoJS エクステンションの適用を回避する際に致命的なエラーが発生しました。エクステンションを無効にしてください。"
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "NoJS エクステンションでエラー"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "理由"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "エクステンションの設定フォルダーの作成ができませんでした: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "エクステンションの設定フォルダーの作成ができませんでした。"
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "エクステンションのデータベースをオープンできませんでした。"
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "エクステンションのデータベース構造のセットアップができませんでした。"
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "エクステンションインスタンス"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "このエクステンションのための Midori エクステンションインスタンスです"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "アプリケーションインスタンス"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "このエクステンションが属する Midori アプリケーションインスタンスです"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "データベースインスタンス"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "このエクステンションで使用される SQLite データベースインスタンスへのポインターです"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "データベースパス"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "このエクステンションで使用される SQLite データベースインスタンスへのパスです"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "すべてのサイトで許可する"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr "このオプションを有効にすると、エクステンションはすべてのサイトでポリシーをチェックせず、スクリプトを許可します。"
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "セカンドレベルまで"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"このオプションを有効にすると、対象ドメインをセカンドレベルまで (www.example.org → example.org) にします。"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "未知のドメインへのポリシー"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "未知のドメインに対し使用するポリシーです。"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "一時的に許可"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "マウスジェスチャ"
@@ -2546,11 +2910,11 @@ msgstr "ショートカット"
 msgid "View and edit keyboard shortcuts"
 msgstr "キーボードショートカットの表示および編集を行います"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "ステータスバー時計"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "ステータスバーに日付と時刻を表示します"
 
@@ -2566,6 +2930,10 @@ msgstr "スクリプト"
 msgid "Netscape plugins"
 msgstr "Netscape プラグイン"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape プラグインを有効にする"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "ステータスバー機能"
@@ -2575,16 +2943,16 @@ msgstr "ステータスバー機能"
 msgid "Easily toggle features on web pages on and off"
 msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "タブパネル"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "タブパネル(_A)"
 
 # description
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "タブを縦のパネルに表示します"
 
@@ -2597,78 +2965,71 @@ msgstr "デフォルトでタブのアイコンのみ表示"
 msgid "New tabs have no label by default"
 msgstr "デフォルトで新しいタブのラベルを表示しません"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 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."
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
 msgstr "ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロップで変更できます。"
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "利用可能なアイテム"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "表示するアイテム"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "ツールバーのカスタマイズ(_C)…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "ツールバーエディター"
 
 # description
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "ツールバーのレイアウトを簡単に編集できます"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP 通信をディスクにキャッシュします"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Cookie の読み込みに失敗しました\n"
-
 # Dialog title
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "プライベートデータのクリア"
 
 # Button label
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "プライベートデータのクリア(_C)"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "以下のデータをクリアします:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "最後に開いたタブ(_T)"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Midori 終了時にプライベートデータをクリアする(_Q)"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "ログインおよびパスワード情報(_P)"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookie およびウェブサイトデータ"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "ウェブサイトアイコン"
 
@@ -2676,448 +3037,500 @@ msgstr "ウェブサイトアイコン"
 msgid "Open tabs"
 msgstr "タブを開く"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "もっとタブを開く…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "履歴のクリアに失敗しました: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "古い履歴アイテムの削除に失敗しました: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "古い DB の ATTACH に失敗しました"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "古い DB からのインポートに失敗しました"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "トランザクションのロールバックに失敗しました"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "DETACH に失敗しました "
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\83\86ã\83¼ã\83\96ã\83«ã\82\92ä½\9cæ\88\90ã\81§ã\81\8dã\81¾ã\81\9bã\82\93ã\81§した: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\82¢ã\82¤ã\83\86ã\83 ã\81®è¿½å\8a ã\81«å¤±æ\95\97ã\81\97ã\81¾した: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "古いデータベースからのインポートに失敗しました: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "ブックマークの更新に失敗しました: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\82\92ä¿\9då­\98ã\81§ã\81\8dã\81¾ã\81\9bã\82\93ã\81§ã\81\97ã\81\9fã\80\82%s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "ã\83\96ã\83\83ã\82¯ã\83\9eã\83¼ã\82¯ã\82¢ã\82¤ã\83\86ã\83 ã\81®å\89\8aé\99¤ã\81«å¤±æ\95\97ã\81\97ã\81¾ã\81\97ã\81\9f: %s\n"
 
-#: ../midori/midori-session.c:199
-msgid "No root certificate file is available. SSL certificates cannot be verified."
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
 msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。"
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "設定を保存できませんでした。%s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "セッションを読み込めませんでした: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "セッションは保存できませんでした。%s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "ゴミ箱を保存できませんでした。%s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
-msgid "Midori crashed the last time it was opened. You can report the problem at %s."
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr "Midori は最後に開いた時にクラッシュしたようです。この問題を報告する場合は %s までおねがいします。"
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "設定を変更する(_P)"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "すべてのエクステンションを無効にする(_E)"
 
 # tooltip
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Midori がクラッシュした後の起動時にダイアログを表示します"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "以前のタブを破棄"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "最後のクラッシュログを表示(_L)"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "デバッガー上で起動(_D)"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "ブックマークを読み込めませんでした: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "セッションを読み込めませんでした: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "ゴミ箱を読み込めませんでした: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "履歴を読み込めませんでした: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "次のエラーが発生しました:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "無視(_I)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL 失敗: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "許可"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "このセッションのみ許可"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "拒否"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "エクステンションのデータベースのオープンに失敗しました: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "データベース文の実行に失敗しました: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "本当に Cookie パーミッションをすべて削除してよろしいですか?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Cookie パーミッションをすべて削除"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-msgid "This action will delete all cookie permissions. You will be asked for permissions again for each web site visited."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
 msgstr "この操作は Cookie パーミッションをすべて削除します。次に各ウェブサイトを訪れた時に再度許可するかどうか尋ねます。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Cookie パーミッションマネージャー"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "現在の Cookie パーミッションマネージャーのインスタンスです"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Cookie パーミッションの設定"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
-msgid "Below is a list of all web sites and the policy set for them. You can delete policies by marking the entries and clicking on <i>Delete</i>.You can also add a policy for a domain manually by entering the domain below, choosing the policy and clicking on <i>Add</i>."
-msgstr "ポリシーが設定されているウェブサイトのリストです。ポリシーのエントリを削除するには、そのエントリを選択して<i>削除</i>をクリックします。ドメインに対するポリシーを追加するには、以下にドメイン名を入力し、ポリシーを選択して、<i>追加</i>をクリックします。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "ドメイン"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "ポリシー"
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"ポリシーが設定されているウェブサイトのリストです。ポリシーのエントリを削除するには、そのエントリを選択して<i>削除</i>をクリックします。ドメインに対"
+"するポリシーを追加するには、以下にドメイン名を入力し、ポリシーを選択して、<i>追加</i>をクリックします。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "ã\81\99ã\81¹ã\81¦å\89\8aé\99¤(_A)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "ã\83ªã\82¹ã\83\88ã\81«ã\81ªã\81\84ã\83\89ã\83¡ã\82¤ã\83³ã\81\8bã\82\89ã\81®Cookieã\81«å¯¾ã\81\99ã\82\8bã\83\9dã\83ªã\82·ã\83¼: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "未知のドメインの時ポリシーを尋ねる(_S)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "どうするか尋ねる"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
-msgid "A fatal error occurred which prevents the cookie permission manager extension to continue. You should disable it."
-msgstr "続行するために Cookie パーミッションマネージャーエクステンションを停止する際に致命的なエラーが発生しました。これを無効にしてください。"
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"続行するために Cookie パーミッションマネージャーエクステンションを停止する際に致命的なエラーが発生しました。これを無効にしてください。"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
 msgstr "Cookie パーミッションマネージャーエラー"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "理由"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "エクステンションの設定フォルダーの作成ができませんでした: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "エクステンションの設定フォルダーの作成ができませんでした。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "エクステンションのデータベースをオープンできませんでした。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "エクステンションのデータベース構造のセットアップができませんでした。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "ドメインに設定する一般 Cookie ポリシーを決定できませんでした: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "セッション終了まで"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "このウェブサイト %s は %d 個の Cookie の記憶を要求しています。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "このウェブサイト %s は 1 個の Cookie の記憶を要求しています。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "複数のウェブサイトが合計 %d 個の Cookie の記憶を要求しています。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "許可(_A)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "このセッションのみ許可(_S)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "拒否(_N)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "今回は拒否(_T)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "パス"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "値"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "有効期限"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "エクステンションインスタンス"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"個別に構成されていないドメインに対して使用するポリシーです。Midori 設定内で設定された全体の Cokkie "
+"ポリシーから更に制限するために動作します。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "このエクステンションのための Midori エクステンションインスタンスです"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie セキュリティマネージャー"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "ã\82¢ã\83\97ã\83ªã\82±ã\83¼ã\82·ã\83§ã\83³ã\82¤ã\83³ã\82¹ã\82¿ã\83³ã\82¹"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "ã\82µã\82¤ã\83\88ã\81\94ã\81¨ã\81« Cookie ã\81®ã\83\91ã\83¼ã\83\9fã\83\83ã\82·ã\83§ã\83³ã\82\92管ç\90\86ã\81\97ã\81¾ã\81\99"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "このエクステンションが属する Midori アプリケーションインスタンスです"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "%s のアプリケーションアイコンの取得に失敗しました: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "データベースインスタンス"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "このエクステンションで使用される SQLite データベースインスタンスへのポインターです"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "新規ランチャーの作成に失敗しました (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "ã\83\87ã\83¼ã\82¿ã\83\99ã\83¼ã\82¹ã\83\91ã\82¹"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "ã\83©ã\83³ã\83\81ã\83£ã\83¼ã\82\92ä½\9cæ\88\90ã\81\97ã\81¾ã\81\97ã\81\9f"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "このエクステンションで使用される SQLite データベースインスタンスへのパスです"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "ランチャーメニューから <b>%s</b> を実行できます"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "未知のポリシーを確認する"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "ランチャーの作成でエラー"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid "If true this extension ask for policy for every unknown domain.If false this extension uses the global cookie policy set in Midori settings."
-msgstr "ã\81\93ã\81®ã\82ªã\83\97ã\82·ã\83§ã\83³ã\82\92æ\9c\89å\8a¹ã\81«ã\81\99ã\82\8bã\81¨ã\80\81ã\82¨ã\82¯ã\82¹ã\83\86ã\83³ã\82·ã\83§ã\83³ã\81¯æ\9cªç\9f¥ã\81®ã\83\89ã\83¡ã\82¤ã\83³ã\81\94ã\81¨ã\81«ã\83\9dã\83ªã\82·ã\83¼ã\82\92å°\8bã\81­ã\81¾ã\81\99ã\80\82ç\84¡å\8a¹ã\81«ã\81\99ã\82\8bã\81¨ã\80\81ã\81\93ã\81®ã\82¨ã\82¯ã\82¹ã\83\86ã\83³ã\82·ã\83§ã\83³ã\81¯ Midori ã\81®è¨­å®\9aã\81§æ\8c\87å®\9aã\81\95ã\82\8cã\81\9fä¸\80è\88¬ Cookie ã\83\9dã\83ªã\82·ã\83¼ã\82\92使ç\94¨ã\81\97ã\81¾ã\81\99ã\80\82"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "ã\82¢ã\83\97ã\83ªã\82±ã\83¼ã\82·ã\83§ã\83³"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "æ\9cªç¢ºå®\9a"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "æ\96°ã\81\97ã\81\84ã\83\97ã\83­ã\83\95ã\82¡ã\82¤ã\83«(_P)"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Cookie セキュリティマネージャー"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "新しく独立したプロファイルとランチャーを作成します"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "サイトごとに Cookie のパーミッションを管理します"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "新しいアプリ(_A)"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "アプリケーション"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "指定したサイト用に新しいアプリを作成します"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "起動時にエラー"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "ランチャーの作成(_L)"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Web アプリマネージャー"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "アプリケーションとしてインストールされたウェブサイトを管理します"
 
-#: ../extensions/transfers.vala:89
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "転送"
 
-#: ../extensions/transfers.vala:102 ../extensions/transfers.vala:365
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "すべてクリア"
 
-#: ../extensions/transfers.vala:196
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "保存先フォルダーを開く(_F)"
 
-#: ../extensions/transfers.vala:203
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "リンクの場所をコピー(_A)"
 
-#: ../extensions/transfers.vala:428
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "ファイル '<b>%s</b>' をダウンロードしました。"
 
-#: ../extensions/transfers.vala:429
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' とその他 %d 個のファイルをダウンロードしました。"
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "転送完了"
 
-#: ../extensions/transfers.vala:456 ../extensions/transfers.vala:457
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "ファイルのダウンロード中です"
 
-#: ../extensions/transfers.vala:459
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "Midori を終了(_Q)"
 
-#: ../extensions/transfers.vala:461
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Midori を終了すると転送がキャンセルされます。"
 
-#: ../extensions/transfers.vala:508
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "転送マネージャー"
 
-#: ../extensions/transfers.vala:509
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "ダウンロードしたファイルを表示します"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "選択範囲を中央クリックで開く"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "データベースの更新に失敗しました: %s"
 
-# tooltip
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "選択したアドレスをマウスの中央クリックで読み込みます"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "データベースからの SELECT に失敗しました: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "レガシーセッションのインポートに失敗しました: %s"
 
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "エクステンションを設定するためのパスの取得ができませんでした: パスが空です"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "エクステンションを設定するためのパスの取得ができませんでした。"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "タブとセッションを管理します。"
 
-#~ msgid "Custom..."
-#~ msgstr "カスタム..."
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Cookie 保存の確認"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr "このエクステンションは更新ジョブまたは繰り返し発生するイベントのタスクキューを提供します。"
 
-#~ msgid "_Details"
-#~ msgstr "詳細(_D)"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "新規ノートのデータベースへの追加に失敗しました: %s\n"
 
-# tooltip
-#~ msgid "What to identify as to web pages"
-#~ msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "データベースからのノートの削除に失敗しました: %s\n"
 
-#~ msgid "Writing failed."
-#~ msgstr "書き込みに失敗しました。"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "ノート名の変更に失敗しました: %s\n"
 
-#~ msgid "Kinetic scrolling"
-#~ msgstr "慣性スクロール"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "ノートの更新に失敗しました: %s\n"
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "速度にしたがって慣性がかかったようにスクロールします"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "新規ノート"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "新規ノート"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "ノートデータベースからの SELECT に失敗しました: %s\n"
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "ノート名の変更"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "ノートをクリップボードへコピー"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "ノートの削除"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "選択範囲をノートへコピー"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "ウェブサイトからのテキストクリップをノートとして保存します"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "広告ブロッカー"
+
+# description
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "フィルターリストに登録された広告をブロックします"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "広告フィルターの設定"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "画像をブロック(_O)"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "リンクをブロック(_O)"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "ルールの編集"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "ルール(_R):"
diff --git a/po/ka.po b/po/ka.po
new file mode 100644 (file)
index 0000000..810fc81
--- /dev/null
+++ b/po/ka.po
@@ -0,0 +1,3426 @@
+# Georgian translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-10-18 20:31+0000\n"
+"Last-Translator: Tornike Batavani <Unknown>\n"
+"Language-Team: Georgian <ka@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:00+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "ახალი ფანჯარა"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "მისამართები"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "ახალი _ფანჯარა"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "შეინახე ფაილი როგორც"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "გაიხსნა ახალი ფანჯარა"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "შეინახე ფაილი"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "გახსენი ფაილი"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Tornike Batavani https://launchpad.net/~tornix\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_ფაილი"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "გახსენი ახალი ფანჯარა"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "გახსენი ფაილი"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "მენიუ"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "ჩანაწერები"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "ახალი ჩანაწერი"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "ახალი ჩანაწერი"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "წესის შეცვლა"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 678b3cbb7c0cbc08531d5ed9c815999b3bb9f650..a064eb4b4be98380ccbcc8a9e80c11afb17e6986 100644 (file)
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,211 +7,212 @@ msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-10 06:33+0000\n"
-"PO-Revision-Date: 2013-05-10 16:08+0600\n"
-"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-09-02 12:28+0000\n"
+"Last-Translator: Baurzhan Muftakhidinov <Unknown>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
-"Language: kk\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"
-"X-Generator: Poedit 1.5.4\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:01+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: kk\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Интернетті шолу"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr ""
+msgid "Web Browser"
+msgstr "Веб браузері"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-websettings.c:228
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori веб браузері"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr ""
+msgid "Browse the Web"
+msgstr "Интернетті шолу"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr ""
+msgid "Internet;WWW;Explorer"
+msgstr "Интернет;WWW;Шолушы"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Жаңа бет"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Жаңа терезе"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ð\92еб Ð±Ñ\80аÑ\83зеÑ\80і"
+msgid "New Private Browsing Window"
+msgstr "Ð\96аңа Ð¶ÐµÐºÐµÐ»Ñ\96к Ñ\82еÑ\80езеÑ\81і"
 
 #: ../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 ""
+msgstr "Midori (жекелік режимі)"
 
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4410
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
-msgstr ""
+msgstr "Жекелік шолу режимі"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Жаңа жекелік шолу терезесін ашу"
 
-#: ../midori/main.c:72
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
-msgstr ""
+msgstr "Скриншот келесі жерге сақталды: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr ""
+msgstr "АДРЕСті веб қолданбасы ретінде жөнелту"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРЕС"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr ""
+msgstr "БУМА ішіндегі баптаулар файлдарын қолдану"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "БУМА"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
-msgstr ""
+msgstr "Жекелік шолу режимі, өзгерістер сақталмайды"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr ""
+msgstr "Портативті режим. Барлық орындалатын файлдар бір жерде сақталады"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
-msgstr ""
+msgstr "Қарапайым GTK+ терезесі, WebKit-пен бірге, GtkLauncher сияқты"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr ""
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr ""
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr ""
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr ""
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr ""
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr ""
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr ""
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адрестер"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr ""
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "Шаблон"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr ""
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "СЕКУНД"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr ""
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr ""
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr ""
+msgstr "Белгісіз қате орын алды"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Бетбелгілер"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
-msgstr ""
+msgstr "Бе_тбелгіні қосу"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
-msgstr ""
+msgstr "К_еңейтулер"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Тарих"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr ""
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr ""
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Жаңа _бет"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr ""
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr ""
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr ""
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Жаңа _терезе"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Жаңа бу_ма"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адрестер]"
 
@@ -228,134 +229,146 @@ msgstr ""
 msgid "Unrecognized bookmark format."
 msgstr ""
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr ""
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr ""
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr ""
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr ""
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr ""
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr ""
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr ""
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr ""
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Бетбелгілер"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Жаңа бума"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr ""
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr ""
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
 msgstr ""
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
 msgstr ""
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
 msgstr ""
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
 msgstr ""
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr ""
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr ""
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr ""
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr ""
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr ""
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr ""
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr ""
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr ""
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Файлды сақтау"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Файлды ашу"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -364,139 +377,122 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr ""
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr ""
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr ""
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Бос"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr ""
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr ""
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Жаңа _бетте ашу"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4886 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Жаңа тере_зеде ашу"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "Қолд_анба:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr ""
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr ""
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr ""
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr ""
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -504,366 +500,384 @@ msgid ""
 "option) any later version."
 msgstr ""
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2013"
+msgstr ""
+"Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2013\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Baurzhan Muftakhidinov https://launchpad.net/~baurthefirst\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Файл"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Жаңа терезені ашу"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr ""
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Файлды ашу"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr ""
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr ""
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr ""
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Бетті _жабу"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr ""
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "Бө_лісу"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr ""
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "Түз_ету"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Т_абу…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Кел_есіні табу"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Алд_ыңғысын табу"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr ""
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "Тү_рі"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Панельдер"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr ""
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "Код_талуы"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr ""
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr ""
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Тө_мен айналдыру"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Ж_оғары айналдыру"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr ""
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr ""
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "Ө_ту"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr ""
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Үй _парағы"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr ""
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Қоқыс шелегін тазарту"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "Жеке ақпаратты та_зарту"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "А_лдыңғы бет"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Келесі бет"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr ""
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr ""
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr ""
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr ""
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr ""
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr ""
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Кө_мек"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr ""
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Са_ймандар"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Мәзір жолағы"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr ""
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr ""
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Қалы_п-күй жолағы"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Автоматты түрде"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr ""
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr ""
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "Аж_ыратқыш"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr ""
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr ""
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr ""
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr ""
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr ""
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "Бе_ттер"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "Мә_зір"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Мәзір"
 
@@ -872,73 +886,73 @@ msgstr "Мәзір"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-extension.c:886 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr ""
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr ""
 
@@ -955,585 +969,593 @@ msgstr ""
 msgid "Align sidepanel to the left"
 msgstr ""
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr ""
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr ""
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr ""
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr ""
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Жаңа бет"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Жаңа терезе"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Қалыпты"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Таңбашалар"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Кіші таңбашалар"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Мәтін"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr ""
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Мәтін таңбашалардың қасында"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr ""
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr ""
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr ""
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr ""
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr ""
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr ""
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr ""
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr ""
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Панельдер стилі"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr ""
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr ""
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:984
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr ""
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr ""
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr ""
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "Рұқсат ет_пеу"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "Рұқ_сат ету"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr ""
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Қате - %s"
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
+msgid "The page '%s' couldn't be loaded:"
 msgstr ""
 
-#: ../midori/midori-view.c:1500 ../midori/midori-view.c:1644
-msgid "Try again"
-msgstr "Қайталап көру"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-view.c:1641
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr ""
 
-#: ../midori/midori-view.c:1789 ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Қайталап көру"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr ""
 
-#: ../midori/midori-view.c:2656
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr ""
 
-#: ../midori/midori-view.c:2699 ../midori/midori-view.c:3003
-msgid "Inspect _Element"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
 msgstr ""
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr ""
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr ""
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr ""
 
-#: ../midori/midori-view.c:2773
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Қала_йша сақтау..."
 
-#: ../midori/midori-view.c:2783
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr ""
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2788
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr ""
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr ""
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr ""
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr ""
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
 msgstr ""
 
-#: ../midori/midori-view.c:2804
-msgid "Download _Video"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr ""
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr ""
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2926
-msgid "Open _Frame in New Tab"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
 msgstr ""
 
-#: ../midori/midori-view.c:3147
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr ""
 
-#: ../midori/midori-view.c:3161 ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Файл аты: %s"
 
-#: ../midori/midori-view.c:3170
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Файл түрі '%s'"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Файл түрі: %s ('%s')"
 
-#: ../midori/midori-view.c:3210
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Өлшемі: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3223 ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Ашу %s"
 
-#: ../midori/midori-view.c:3771
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:4335
-#, c-format
-msgid "No documentation installed"
-msgstr ""
-
-#: ../midori/midori-view.c:4411
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr ""
 
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr ""
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr ""
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr ""
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr ""
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
 
-#: ../midori/midori-view.c:4460
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 
-#: ../midori/midori-view.c:4509
-msgid "Page loading delayed"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
 msgstr ""
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr ""
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr ""
 
-#: ../midori/midori-view.c:4890
-msgid "_Duplicate Tab"
-msgstr ""
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Label"
-msgstr ""
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Icon Only"
-msgstr ""
-
-#: ../midori/midori-view.c:4902
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] ""
-msgstr[1] ""
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5596
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "алдыңғы"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5615
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "келесі"
 
-#: ../midori/midori-view.c:5629
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr ""
 
-#: ../midori/midori-view.c:5630
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr ""
 
-#: ../midori/midori-view.c:5660
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Мүмкіндіктер"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s, барлығы %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d сағат"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, 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:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s қалды"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr ""
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr ""
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr ""
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr ""
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr ""
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr ""
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr ""
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr ""
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Іске қосылу"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Үй парағы:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr ""
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr ""
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Қаріптер"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr ""
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr ""
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Мінез-құлығы"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr ""
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr ""
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr ""
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr ""
@@ -1546,248 +1568,255 @@ msgstr ""
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr ""
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr ""
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr ""
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Панельдер стилі:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr ""
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr ""
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr ""
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr ""
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr ""
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Мәтін түзетушісі"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr ""
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Желі"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr ""
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
 msgstr ""
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Порт"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr ""
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr ""
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr ""
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "МБ"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr ""
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Дербестік"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr ""
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr ""
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr ""
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr ""
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr ""
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr ""
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr ""
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr ""
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr ""
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Аты:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "Ан_ықтамасы:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Тарих"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr ""
+msgid "Search for %s"
+msgstr "%s іздеу"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr ""
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s іздеу"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr ""
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr ""
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Көмегімен ашу"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr ""
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr ""
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI қате"
 
@@ -1812,78 +1841,135 @@ msgstr ""
 msgid "Close Findbar"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
 #, c-format
-msgid "Failed to update bookmark : %s\n"
+msgid "Folder containing %s and no bookmark"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:535
-msgid "Edit the selected bookmark"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:543
-msgid "Delete the selected bookmark"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:558
-msgid "Add a new folder"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
-msgid "<i>Separator</i>"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
 msgstr "<i>Ажыратқыш</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Жаңа _бетте ашу"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr ""
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Тарих"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Бүгін"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Кеше"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d күн бұрын"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr ""
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr ""
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr ""
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr ""
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr ""
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr ""
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr ""
 
@@ -1909,111 +1995,63 @@ msgstr "Пароль"
 msgid "_Remember password"
 msgstr ""
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr ""
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr ""
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr ""
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr ""
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 сағат"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 күн"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 апта"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr ""
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 жыл"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr ""
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr ""
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr ""
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr ""
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr ""
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr ""
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr ""
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr ""
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr ""
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 
 #: ../extensions/addons.c:223
@@ -2033,16 +2071,16 @@ msgstr ""
 msgid "Don't install"
 msgstr ""
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr ""
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr ""
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Қате"
 
@@ -2064,40 +2102,40 @@ msgstr ""
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr ""
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr ""
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr ""
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr ""
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr ""
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr ""
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr ""
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr ""
 
@@ -2106,41 +2144,41 @@ msgstr ""
 msgid "Cookie Manager"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 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:116
 msgid "Expand All"
 msgstr "Барлығын жазық қылу"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Барлығын жинау"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Сұрақ"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2152,35 +2190,35 @@ msgid ""
 msgstr ""
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Иә"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Жоқ"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
 "<b>Cookies</b>: %d"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Аты"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Барлығын _жазық қылу"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Барл_ығын жинау"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr ""
 
@@ -2200,23 +2238,37 @@ msgstr ""
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr ""
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr ""
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
 msgstr ""
 
-#: ../extensions/delayed-load.vala:213
-msgid "Delay page load until you actually use the tab."
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
 msgstr ""
 
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
 
 #: ../extensions/external-download-manager.vala:175
@@ -2257,25 +2309,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr ""
 
@@ -2294,37 +2346,37 @@ msgstr ""
 msgid "Failed to parse XML feed: %s"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr ""
 
@@ -2343,121 +2395,395 @@ msgid ""
 "to open password database"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr ""
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr ""
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr ""
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr ""
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr ""
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr ""
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr ""
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ешнәрсе жасамау"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr ""
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr ""
 
-#: ../extensions/history-list.vala:316
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr ""
 
-#: ../extensions/history-list.vala:448
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr ""
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr ""
 
-#: ../extensions/history-list.vala:458
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr ""
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr ""
 
-#: ../extensions/history-list.vala:468
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr ""
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr ""
 
-#: ../extensions/history-list.vala:596
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr ""
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Қабылдау"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Домен"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr ""
@@ -2486,11 +2812,11 @@ msgstr "Жарлықтар"
 msgid "View and edit keyboard shortcuts"
 msgstr ""
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr ""
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr ""
 
@@ -2506,6 +2832,10 @@ msgstr ""
 msgid "Netscape plugins"
 msgstr ""
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr ""
@@ -2514,15 +2844,15 @@ msgstr ""
 msgid "Easily toggle features on web pages on and off"
 msgstr ""
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr ""
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr ""
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr ""
 
@@ -2534,11 +2864,11 @@ msgstr ""
 msgid "New tabs have no label by default"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Панельді баптау"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2546,67 +2876,58 @@ msgstr ""
 "Саймандар панелінде көрсетілетін нәрселерді таңдаңыз. Оларды ұстап апару мен "
 "тастау арқылы жылжытуға болады."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Қолжетерлік элементтер"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Көрсетілетін элементтер"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Панельдер түзетушісі"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr ""
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr ""
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr ""
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Жеке ақпаратты тазарту"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "Жеке ақпаратты та_зарту"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr ""
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr ""
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr ""
 
@@ -2614,204 +2935,148 @@ msgstr ""
 msgid "Open tabs"
 msgstr ""
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr ""
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr ""
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr ""
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
+msgid "Failed to add bookmark item: %s\n"
 msgstr ""
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
+msgid "Failed to update bookmark: %s\n"
 msgstr ""
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
+msgid "Failed to remove bookmark item: %s\n"
 msgstr ""
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr ""
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr ""
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr ""
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr ""
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr ""
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr ""
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr ""
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr ""
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr ""
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr ""
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Елемеу"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Қабылдау"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr ""
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2820,22 +3085,12 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Домен"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr ""
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
@@ -2848,146 +3103,134 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "Қ_абылдау"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Жолы"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Мәні"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Қолданбалар"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
 msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
+#: ../extensions/apps.vala:213
+msgid "New _App"
 msgstr ""
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
 msgstr ""
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Қолданбалар"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Жө_нелткішті жасау"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr ""
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr ""
 
@@ -2995,43 +3238,190 @@ msgstr ""
 msgid "Transfers"
 msgstr ""
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr ""
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr ""
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr ""
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr ""
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr ""
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr ""
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr ""
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr ""
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr ""
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/km.po b/po/km.po
new file mode 100644 (file)
index 0000000..9b6e1a1
--- /dev/null
+++ b/po/km.po
@@ -0,0 +1,3426 @@
+# Khmer translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-03-11 10:03+0000\n"
+"Last-Translator: Sovichet <Unknown>\n"
+"Language-Team: Khmer <km@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:02+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "កម្មវិធីអ៊ីនធឺណិត"
+
+#: ../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 ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "ផ្ទាំង​ថ្មី"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "វីនដូ​ថ្មី"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "វីនដូ​រុករក​សម្ងាត់​ថ្មី"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "ការ​រុករក​សម្ងាត់​របស់ Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "ការ​រុករក​សម្ងាត់"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "បើក​វីនដូ​រុករក​សម្ងាត់​ថ្មី​មួយ"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "បាន​រក្សា​ទុក​រូបថត​ទៅ៖ %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "ដំណើរ​ការ ADDRESS ជា​កម្មវិធី​វេប"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "ប្រើ FOLDER ជា​ថត​កំណត់​រចនា​សម្ព័ន្ធ"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "ការ​រុករក​សម្ងាត់, មិន​បាន​រក្សា​ទុក​បន្លាស់​ប្ដូរ​អ្វី​ទេ"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "បែប​ចល័ត, ឯកសារ​ដំណើរ​ការ​ទាំង​ឡាយ​ត្រូវ​បាន​រក្សា​ទុក​នៅ​មួយ​កន្លែង"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "អាសយដ្ឋាន"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "កំហុស៖ មិន​អាច​រក \"gdb\" ឃើញ\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "ពិនិត្យ​រក​កំណែ​ថ្មី​នៅ៖"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "ការ​ចំណាំ"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "បន្ថែម​ទៅ​ការ​ចំណាំ"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "កម្មវិធី​បន្ថែម"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "ប្រវត្តិ"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "ស្គ្រីប​អ្នក​ប្រើ"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "រចនាបទ​អ្នក​ប្រើ"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "ផ្ទាំង​ថ្មី"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "ផ្ទេរ"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "កម្មវិធី​ជំនួយ Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "ផ្ទាំង​ដែល​បាន​បិទ"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "វីដូន​ថ្មី"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "ថត​ថ្មី"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[អាសយដ្ឋាន]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "រក​ឯកសារ​មិន​ឃើញ។"
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "ស្វែងរក​តាម​វេប..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "ផ្ទុក​ទំព័រ​បច្ចុប្បន្ន​ឡើង​វិញ"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "បញ្ឈប់​ការ​ផ្ទុក​ទំព័រ​បច្ចុប្បន្ន"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "តម្លៃ '%s' គឺ​មិន​ត្រឹម​ត្រូវ​សម្រាប់ %s ទេ"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (ការ​រុករក​ឯកជន)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "ជ្រើស [អត្ថបទ]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "ការ​ចំណាំ"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "ថត​ថ្មី"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "កែ​ថត"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "ការ​ចំណាំ​ថ្មី"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "កែ​ការ​ចំណាំ"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "វាយ​បញ្ចូល​ឈ្មោះ​ការ​ចំណាំ​នេះ ហើយ​ជ្រើស​ទីកន្លែង​ទុក​វា។"
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "វាយ​បញ្ចូល​ឈ្មោះ​ថត​នេះ ហើយ​ជ្រើស​ទីកន្លែង​ទុក​វា។"
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "បង្ហាញ​របារ​ការ​ចំណាំ"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "បន្ថែម​ទៅ​ការ​ចូល​រហ័ស"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "រក្សា​ទុក​ឯកសារ​ជា"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "វីនដូ​ថ្មី​មួយ​ត្រូវ​បាន​បើក"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "ផ្ទាំង​ថ្មី​មួយ​ត្រូវ​បាន​បើក"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "មាន​កំហុស​ក្នុង​ការ​បើក​រូបភាព!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "មាន​កំហុស​ក្នុង​ការ​ទាញយក​រូបភាព!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "មិន​អាច​ទាញយក​រូបភាព​ដែល​បាន​ជ្រើស​ទេ។"
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "រក្សាទុក​ឯកសារ"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "បើក​ឯកសារ"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "បន្ថែម​ការ​ចំណាំ​ថ្មី​មួយ"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "ទទេ"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "បើក​ទាំង​អស់​ក្នុង​ផ្ទាំង"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "បើក​ក្នុង​វីនដូ​ថ្មី"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "នាំ​ចូល​ការ​ចំណាំ..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "នាំ​ចូល​ការ​ចំណាំ"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "កម្មវិធី៖"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "នាំ​ចូល​ពី​ឯកសារ XBEL ឬ HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "នាំ​ចូល​ពី​ឯកសារ"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​នាំចូល​ការ​ចំណាំ"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "ការ​ចំណាំ XBEL"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "ការ​ចំណាំ Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Sovichet https://launchpad.net/~sovichet-tep\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 2eb3e42d66b20b57694a38fe5718693289752ca7..b543acce1b034bdcf7c4e6e1df7a71b88fecf2ce 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
 # This file is distributed under the same license as the midori package.
 # Seo Sanghyeon <sanxiyn@gmail.com> 2009
 # Kim Boram <boramism@gmail.com> 2009-2012
-# 
+#
 # Note:  Report-Mstid-Bugs-To에는 xfce-i18n <xfce-i18n@xfce.org> 를 넣습니다.
 #        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 <gdhong0101@gmail.com>\n"
 #      "YourName Kim <ynkim@gmail.com>"
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-23 14:18+0000\n"
-"PO-Revision-Date: 2013-03-18 01:02+0900\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-02-24 11:53+0000\n"
 "Last-Translator: Kim Boram <boramism@gmail.com>\n"
 "Language-Team: Kim Boram <boramism@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "웹 찾아보기"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "인터넷;WWW;익스플로러"
+"X-Launchpad-Export-Date: 2014-11-26 06:02+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: ko\n"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "미도리"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "웹 브라우저"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "미도리 웹 브라우저"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "웹 찾아보기"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "ì\83\88 ì\82¬ì\83\9dí\99\9c ë³´í\98¸ ëª¨ë\93\9c ì°½"
+msgid "Internet;WWW;Explorer"
+msgstr "ì\9d¸í\84°ë\84·;WWW;ì\9dµì\8a¤í\94\8cë¡\9cë\9f¬"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "새 탭"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "새 창"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "ì\9b¹ ë¸\8cë\9d¼ì\9a°ì \80"
+msgid "New Private Browsing Window"
+msgstr "ì\83\88 ì\82¬ì\83\9dí\99\9c ë³´í\98¸ ëª¨ë\93\9c ì°½"
 
 #: ../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:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "사생활 보호 모드"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "새 사생활 보호 모드 창 열기"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "스냅샷을 다음에 저장했습니다: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "[주소]를 웹 응용 프로그램으로 실행"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "[주소]"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "[폴더]를 설정 폴더로 사용"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "[폴더]"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "개인 정보 보호 모드, 바뀐 사항을 저장하지 않습니다."
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "휴대 모드, 모든 런타임 파일을 한 곳에 보관합니다."
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "GtkLauncher와 유사한 웹킷을 사용하는 일반적인 GTK 창"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "진단 대화 상자 보기"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "GDB 아래에서 실행하여 충돌했을 때의 역 추적 기록을 저장합니다."
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "특정한 파일 이름을 자바 스크립트로 실행"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "지정한 주소의 스냅샷 저장"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "실행할 특정 명령어"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "-e/ --execute 옵션을 이용하면 실행 가능한 명령어의 목록을 표시합니다"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "프로그램의 버전 표시"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "주소"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "정규 표현 패턴에 따라 주소를 막기"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "[패턴]"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "수 초 이상 활동이 없을 경우 미도리 초기화"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "[초]"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "오류: \"gdb\"를 찾을 수 없습니다.\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "다음에서 새 버전 검색:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "알 수 없는 오류가 발생했습니다."
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "책갈피(_B)"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "책갈피 더하기(_K)"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "확장 기능(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "기록(_H)"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "사용자 스크립트(_U)"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "사용자 스타일(_S)"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "새 탭(_T)"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "전송(_T)"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "넷스케이프 플러그인(_L)"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "닫은 탭(_C)"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "새 창(_W)"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "새 폴더(_F)"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[주소]"
 
@@ -234,140 +234,152 @@ msgstr "파일이 없습니다."
 #: ../midori/midori-array.c:574 ../midori/midori-array.c:613
 #: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
-msgstr "ì\9e\98못ë\90\9c ë¬¸ì\84\9c."
+msgstr "ì\98¬ë°\94르ì§\80 ì\95\8aì\9d\80 ë¬¸ì\84\9cì\9e\85ë\8b\88ë\8b¤."
 
 #: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "책갈피 형식을 알 수 없습니다."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "다음 들렀던 페이지로 갑니다"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "다음 들렀던 하위 페이지로 갑니다"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "웹 검색…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "현재 페이지 다시 불러오기"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
-msgstr "í\98\84ì\9e¬ í\8e\98ì\9d´ì§\80 ë¶\88ë\9f¬ì\98¤ê¸° ì¤\91지"
+msgstr "í\98\84ì\9e¬ í\8e\98ì\9d´ì§\80 ë¶\88ë\9f¬ì\98¤ê¸° ì \95지"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "제목 업데이트 실패: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "값 '%s'은(는) %s의 잘못된 값입니다"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
-msgstr "기대하지 않은 설정 '%s'"
+msgstr "예상하지 않은 설정 '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
-msgstr "기대하지 않은 동작 '%s'."
+msgstr "예상하지 않은 동작 '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (사생활 보호 모드)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "새 기록 항목 삽입 실패: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "선택[텍스트]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "책갈피"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "새 폴더"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "폴더 편집"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "새 책갈피"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "책갈피 편집"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "ì\9d´ ì±\85ê°\88í\94¼ì\9d\98 ì\9d´ë¦\84ì\9d\84 ì\9e\85ë ¥í\95\9c í\9b\84 ë³´ê´\80í\95  ì\9e¥ì\86\8c를 선택하십시오."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "ì\9d´ ì±\85ê°\88í\94¼ì\9d\98 ì\9d´ë¦\84ì\9d\84 ì\9e\85ë ¥í\95\98ì\8b\9cê³  ë³´ê´\80í\95  ì\9c\84ì¹\98를 선택하십시오."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "단축 번호에 더하기(_S)"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "이 폴더의 이름을 입력하시고 보관할 위치를 선택하십시오."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "도구 모음에 보이기(_B)"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "책갈피 막대에 보이기(_B)"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "웹 응용 프로그램으로 실행(_W)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "단축 번호에 더하기(_S)"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "다른 이름으로 저장"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "관련된 자원 저장(_R)"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "새 창이 열렸습니다."
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "새 탭이 열렸습니다."
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "그림을 여는 중 오류가 발생했습니다!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "기본 그림 보기 프로그램으로 선택할 그림을 열 수 없습니다."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "그림을 다운로드하는 중 오류가 발생했습니다!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "선택한 그림을 다운로드할 수 없습니다."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "파일 저장"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "저장하지 않고 페이지 다시 불러오기"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "파일 열기"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -375,519 +387,514 @@ msgid ""
 "Aggregator. Next time you click the news feed icon, it will be added "
 "automatically."
 msgstr ""
-"위 주소를 뉴스 수집기로 열어 보려면 보통 메뉴나 \"새 구독\", \"새 뉴스 피드"
-"\"또는 이와 비슷한 단추를 찾을 수 있습니다.\n"
-"이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 "
-"다음 뉴스 피드 아이콘을 누를 때 자동으로 추가합니다."
+"위 주소를 뉴스 수집기로 열어 보려면 보통 메뉴나 \"새 구독\", \"새 뉴스 피드\"또는 이와 비슷한 단추를 찾을 수 있습니다.\n"
+"이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 다음 뉴스 피드 아이콘을 누를 때 자동으로 추가합니다."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "새 피드"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "새 책갈피 더하기"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "이 페이지 공유"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "비어있음"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
-msgstr ""
-"키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기"
+msgstr "키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
-msgstr ""
-"캐럿 브라우징을 켜고 끄려면 F7 키를 눌러주십시오. 사용하게 되면 모든 웹사이트"
-"에 텍스트 커서가 표시됩니다."
+msgstr "캐럿 브라우징을 켜고 끄려면 F7 키를 눌러주십시오. 사용하게 되면 모든 웹사이트에 텍스트 커서가 표시됩니다."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "캐럿 브라우징 사용(_E)"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "새 기록 항목 삽입 실패: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "전부 탭으로 열기(_T)"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "새 탭에서 열기(_T)"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "새 창에서 열기(_W)"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "아로라"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "카제하카세"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "오페라"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "컨쿼러"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "에피파니"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
-msgstr "파이어폭스 (%s)"
+msgstr "파이어폭스(%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "미도리 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "책갈피 가져오기…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "책갈피 가져오기(_I)"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "응용 프로그램(_A):"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "XBEL 또는 HTML 파일에서 가져오기"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "파일에서 가져오기"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "책갈피 가져오기 실패"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL 책갈피"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "넷스케이프 책갈피"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "미도리는 XBEL(*.xbel) 그리고 넷스케이프(*.html)로만 내보낼 수 있습니다"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "책갈피 내보내기 실패"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "가벼운 웹 브라우저."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "버전 정보를 보려면 about:version 페이지를 확인하십시오."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 ""
-"이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에"
-"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전(선택적)에 따"
-"라 재배포하거나 수정할 수 있습니다."
+"이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 "
+"또는 이후 버전(선택적)에 따라 재배포하거나 수정할 수 있습니다."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Seo Sanghyeon <sanxiyn@gmail.com>\n"
-"김보람 <boramism@gmail.com>"
+"김보람 <boramism@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Kim Boram https://launchpad.net/~boramism\n"
+"  MinSik CHO https://launchpad.net/~mscho527\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "현재 탭 복제(_D)"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "새 창을 엽니다"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "새 탭을 엽니다"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "새 사생활 보호 모드 창(_R)"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "파일을 엽니다"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "다른 이름으로 페이지 저장(_S)…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "파일로 저장"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "단축 번호 더하기(_D)"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "뉴스 피드 구독(_F)"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "탭 닫기(_C)"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "현재 탭을 닫습니다."
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "창 닫기(_L)"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "공유(_S)"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "현재 페이지를 인쇄합니다"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "모든 창 닫기(_L)"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "찾기(_F)…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "이 페이지에서 단어나 단락을 찾습니다"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "다음 찾기(_N)"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "이전 찾기(_P)"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "프로그램 기본 설정을 편집합니다"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "도구 모음(_T)"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "저장하지 않고 페이지 다시 불러오기"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "확대/축소 단계 키우기"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "확대/축소 단계 줄이기"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "인코딩(_E)"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "소스 보기(_U)"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "DOM 소스 보기(_D)"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "캐럿 브라우징(_R)"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "전체 화면 보기 전환"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "왼쪽으로 스크롤(_L)"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "아래쪽으로 스크롤(_D)"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "위쪽으로 스크롤(_U)"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "오른쪽으로 스크롤(_R)"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "읽기 쉽게(_R)"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "이동(_G)"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "전에 들렀던 페이지로 갑니다"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "전에 들렀던 하위 페이지로 갑니다"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "다음 또는 이전"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "다음 하위 페이지나 기록에 있는 다음 페이지로 이동"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "홈페이지(_H)"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "홈 페이지로 갑니다."
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "휴지통 비우기"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "닫은 탭 되돌리기(_C)"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "새 폴더 더하기(_F)"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "책갈피 내보내기(_E)"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "책갈피 가져오기(_I)…"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "검색 엔진 관리(_M)"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "책갈피 내보내기(_E)…"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "ê°\9cì\9d¸ ë\8d°ì\9d´í\84° ì§\80ì\9a°ê¸°(_C)"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "ê²\80ì\83\89 ì\97\94ì§\84 ê´\80리(_M)â\80¦"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "개인 정보 지우기(_C)…"
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "페이지 검사(_I)"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "이전 탭(_P)"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "다음 탭(_N)"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "탭을 처음으로 옮기기(_F)"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "탭을 뒤로 옮기기(_B)"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "탭을 앞으로 옮기기(_M)"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "탭을 끝으로 옮기기(_L)"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "현재 탭에 포커스 맞추기(_C)"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "다음 보기에 포커스(_N)"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "현재 탭의 아이콘만 보이기(_C)"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "현재 탭 복제(_D)"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "다른 탭 닫기(_H)"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "마지막 세션 열기(_S)"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "일반적인 질문(_F)"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "버그 보고(_R)…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "도구(_T)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "메뉴 모음(_M)"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "내비게이션 줄(_N)"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "가장자리 패널(_P)"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "가장자리 패널"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "책갈피 모음(_B)"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "상태 표시줄(_S)"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "자동(_A)"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "중국어 번체(BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "중국어 간체(GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "일본어(Shift_JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "한국어(EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "키릴어(KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "유니코드(UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "서양어(ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "사용자 지정…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "기록을 초기화할 수 없습니다: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "구분선(_S)"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "위치(_L)…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "특정 위치 열기"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "웹 검색(_W)…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "웹 검색 실행"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "이전에 닫은 탭이나 창을 다시 엽니다"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "저장한 책갈피 보기"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "탭(_T)"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "모든 열려있는 탭의 목록을 표시합니다"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "메뉴(_M)"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "메뉴"
 
@@ -896,73 +903,73 @@ msgstr "메뉴"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "확장 기능 '%s'의 설정을 불러올 수 없습니다: %s\n"
 
-#: ../midori/midori-extension.c:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "인증서 내보내기"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "서명 인증 기관을 알 수 없습니다."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "인증서가 사이트에서 가져온 신원 기대값과 일치하지 않습니다."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "아직 인증서 활성 시간이 시작하지 않았습니다."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "인증서가 만료되었습니다."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr "GTlsConnection의 인증 철회 목록에 따라 인증서를 취소합니다."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "인증서의 알고리즘이 안전하지 않습니다."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "인증서를 확인하던 중 다른 오류가 발생했습니다."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "인증서 내보내기(_E)"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "스스로 서명함"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "자세한 보안 내용"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "붙여넣기 후 진행(_R)"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "확인하지 않음"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "확인하였고 암호화 한 연결"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "열린, 암호화하지 않은 연결"
 
@@ -979,589 +986,592 @@ msgstr "패널 닫기"
 msgid "Align sidepanel to the left"
 msgstr "창을 왼쪽으로 이동"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "단축 번호 보이기"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "홈 페이지 표시"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "마지막에 연 탭 표시"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "마지막 탭을 불러오지는 않고 표시"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "빈 페이지 보이기"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "기본 검색 엔진 보이기"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "현재 홈 페이지 보이기"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "일본어(Shift_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "새 탭"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "새 창"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "현재 탭"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "기본 값"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "아이콘"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "작은 아이콘"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "텍스트"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "아이콘 및 텍스트"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "아이콘 옆에 글자"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "자동(그놈 또는 환경 변수)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP 프록시 서버"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "프록시 서버 없음"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "크롬"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "사파리"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "아이폰"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "파이어폭스"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "인터넷 익스플로러"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "도구 모음 유형:"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "항상 사용자가 선택한 글꼴을 사용"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "설정을 읽을 수 없습니다: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
-msgstr " '%s'은(는) 잘못된 설정 값입니다."
+msgstr "'%s'은(는) 잘못된 설정 값입니다."
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "스타일 시트를 삽입할 수 없습니다: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "탭 이름 보이기(_L)"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "탭 아이콘만 보이기(_I)"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "오른쪽의 탭 모두 닫기(_I)"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "다른 탭 닫기(_H)"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "이 웹사이트를 신뢰"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "보안 상태 알 수 없음"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "거부(_D)"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "허용(_A)"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s이(가) 위치를 알고 싶어합니다."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "오류 - %s"
+msgid "'%s' can't be found"
+msgstr "'%s'을(를) 찾을 수 없습니다."
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "페이지 '%s'을(를) 불러올 수 없습니다."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "페이지 '%s'을(를) 불러올 수 없습니다:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "다시 시도하십시오"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "입력한 주소가 올바른지 확인해주십시오."
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "인터넷 케이블의 연결 상태나 무선 랜을 사용하도록 설정했는지 확인하십시오."
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "네트워크 설정이 올바른지 확인하십시오."
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "다시 시도"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "오류 - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "'%s'에 문제가 있습니다."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "다시 시도하십시오"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "%s에 메시지 보내기"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "검색 엔진 추가(_S)..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "요소 검사(_E)"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "링크 열기(_L)"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "새 탭에 링크 열기(_T)"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "새 탭에 링크 열고 전환(_F)"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "새 탭에 링크 열고 전환 안 함(_B)"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "새 창에 링크 열기(_W)"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "웹 응용 프로그램으로 링크 열기(_P)"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "링크 위치 복사(_S)"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "다른 이름으로 저장(_A)…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "이미지를 새 창에서 열기(_I)"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "그림 새 탭에서 열기(_I)"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "그림 복사(_A)"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "그림 저장(_M)"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "그림 보기 프로그램으로 열기(_V)"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "비디오 주소 복사(_A)"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "비디오 저장(_V)"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "비디오 다운로드(_V)"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "주소 새 탭에서 열기(_T)"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "다음으로 검색(_W)"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "웹 검색(_S)"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "주소 새 탭에서 열기(_T)"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "프레임 새 탭에서 열기(_F)"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "요소 검사(_E)"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "%s에서 파일을 열거나 다운로드"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "파일 이름: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "파일 종류: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "파일 종류: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "크기: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s 열기"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "페이지 살피기 - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "설치한 문서 도구가 없습니다"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "미도리는 어떤 개인 정보도 보존하지 않습니다:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "기록 또는 웹 쿠키를 저장하지 않습니다."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "확장 기능을 사용하지 않습니다."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
-msgstr ""
-"HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다."
+msgstr "HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "미도리가 사용자를 추적할 수 없게 합니다.:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "리퍼러 웹 주소는 호스트 이름에서 기본적인 것만 남깁니다."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "DNS 사전 판독을 사용하지 않습니다."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "언어와 시간대를 웹 사이트가 알 수 없도록 합니다."
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "플래시와 넷스캐이프 플러그인을 웹 사이트가 알 수 없게 합니다."
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "페이지 불러오기 연기"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "페이지 불러오기를 지연함:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr ""
-"최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기"
-"를 연기합니다."
+msgstr "최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기를 연기합니다."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "페이지 불러오기"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "빈 페이지"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "탭 복제(_D)"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "탭 이름 보이기(_L)"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "탭 아이콘만 보이기(_I)"
-
-#: ../midori/midori-view.c:4904
-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:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "이전"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "다음"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "배경 그림 인쇄"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "배경 그림을 인쇄할 지 결정합니다"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "기능"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 시간"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 분"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, 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:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "- %s 남음"
+msgstr " - %s 남음"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/초)"
+msgstr " (%s/초)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "다운로드한 파일에 오류가 있습니다."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "단축 번호"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "바로 가기를 더하려면 누르십시오"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "바로 가기 주소 입력"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "바로 가기 제목 입력"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "이 바로 가기를 정말로 삭제하시겠습니까?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "시작"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "미도리를 시작할 때:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "홈페이지:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "현재 페이지를 사용(_C)"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "현재 페이지를 홈 페이지로 사용"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "글꼴"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "가변 폭 글꼴 계열"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "텍스트를 표시할 기본 글꼴 계열"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "텍스트를 표시할 기본 글꼴 크기"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "고정 폭 글꼴 계열"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "고정 폭 텍스트를 표시할 글꼴 계열"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "고정 폭 텍스트를 표시할 글꼴 크기"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "최소 글꼴 크기"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "문자를 표시할 최소 글꼴 크기"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "우선할 인코딩"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "행동"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "자동으로 그림 읽기"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "맞춤법 검사 사용"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "스크립트 사용"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "웹GL 지원 사용"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "넷스케이프 플러그인 사용"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "문자와 그림 확대"
@@ -1574,252 +1584,257 @@ msgstr "팝업 열기 스크립트 허용"
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다."
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "기본 확대 단계"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "새로 연 탭을 확대할 초기 비율"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "우선할 인코딩"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
+"복수의 언어로 작성한 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분해 지정합니다. 예) \"de\", \"ru,nl\" 또는 "
+"\"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "다운로드한 파일을 저장할 경로:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "탐색"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "테마:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "도구 모음 유형:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "새 페이지 다음에 열기:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "새 탭을 열면:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "탭에 닫기 단추 표시"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "탭 모음 항상 보기"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "탭을 현재 탭 옆에 열기"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다."
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "탭을 연 후 바로 전환하지 않음"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "텍스트 편집기"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "뉴스 수집기"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "네트워크"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "프록시 서버"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "호스트 이름"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "주소"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "포트"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "지원하는 프록시 형식:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "웹 캐시"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "디스크에 페이지를 저장할 최대 공간"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "식별 명"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "개인 정보"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "쿠키를 보존할 기간:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "쿠키를 저장할 최장 기간을 설정합니다"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "방문한 사이트의 쿠키 만을 허용"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
-msgstr ""
-"쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있"
-"습니다."
+msgstr "쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있습니다."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "오프라인 웹 응용 프로그램 캐시 사용"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 로컬 기억 장치 지원 사용"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "기록에 페이지를 보존할 기간:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "방문 기록을 저장할 최대 기간을 설정합니다"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "확장 기능"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "검색 엔진 관리(_M)"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "검색 엔진 더하기"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "검색 엔진 편집"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "설명(_D):"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "주소(_A):"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "토큰(_T):"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "검색 엔진 관리"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "기본 값으로 사용(_D)"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "검색 엔진을 불러올 수 없습니다. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "검색 엔진을 저장할 수 없습니다. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "기록"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "책갈피와 기록"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "기록을 초기화할 수 없습니다: %s"
+msgid "Search for %s"
+msgstr "%s을(를) 검색"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "기록에서 선택 실패: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s을(를) 검색"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "다음으로 검색…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "%s(으)로 검색"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "다음으로 열기"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "외부  프로그램을 실행할 수 없습니다."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "올바르지 않은 주소"
 
@@ -1844,78 +1859,133 @@ msgstr "대소문자 일치"
 msgid "Close Findbar"
 msgstr "찾기 줄 닫기"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "책갈피 항목을 추가하지 못했습니다: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "책갈피 %d개"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "책갈피를 업데이트할 수 없습니다: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "하위 폴더 %d개"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "빈 폴더"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "폴더에 %s이(가) 있으며 책갈피는 없습니다."
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "폴더에 %s이(가) 있습니다."
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "폴더에 %s와(과) %s이(가) 있습니다."
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "책갈피에 연결된 주소: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s이(가) 있으며 책갈피는 없음"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s와(과) %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "선택한 책갈피를 편집합니다"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "선택한 책갈피를 지웁니다"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "새 폴더를 더합니다"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>구분선</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "새 탭에서 열기(_T)"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "책갈피 검색"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "기록"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "오늘"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "어제"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 일 전"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "일 주 전"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "기록 항목을 제거할 수 없습니다: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "정말 모든 기록 항목을 지우시겠습니까?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "선택한 기록 항목을 책갈피에 더합니다"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "선택한 기록 항목을 지웁니다"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "모든 기록 제거"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "기록 검색"
 
@@ -1943,114 +2013,64 @@ msgstr "암호"
 msgid "_Remember password"
 msgstr "암호 저장(_R)"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "'%s'(이)라는 이름을 가진 아이콘을 열 수 없습니다."
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "보관한 아이콘 '%s'을(를) 열 수 없습니다."
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "애니메이션 프레임이 망가졌습니다"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "없음"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "속성 '%s'은(는) %s에 적당하지 않음"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "파일 선택"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "폴더 선택"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "한 시간"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "하루"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "일 주"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "한 달"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "일 년"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s을(를) 위한 기본 설정"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 체크섬:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 체크섬:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "광고 필터 설정"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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:926
-msgid "Edit rule"
-msgstr "규칙 편집"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "규칙(_R):"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "그림 막기(_O)"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "링크 막기(_O)"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "광고 막기"
-
-#: ../extensions/adblock.c:1926
-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
-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?"
+msgstr "이 페이지에는 설치할 수 있는 사용자 스크립트가 있습니다. 설치하시겠습니까?"
 
 #: ../extensions/addons.c:223
 msgid "_Install user script"
@@ -2059,7 +2079,7 @@ msgstr "사용자 스크립트 설치(_I)"
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
-msgstr "이 페이지는 사용자 스타일을 포함하고 있습니다. 설치하시겠습니까?"
+msgstr "이 페이지에는 설치할 수 있는 사용자 스타일이 있습니다. 설치하시겠습니까?"
 
 #: ../extensions/addons.c:229
 msgid "_Install user style"
@@ -2069,16 +2089,16 @@ msgstr "사용자 스타일 설치(_I)"
 msgid "Don't install"
 msgstr "설치 안 함"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "사용자 스크립트"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "사용자 스타일"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "오류"
 
@@ -2100,40 +2120,40 @@ msgstr "사용자 스타일 삭제"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "파일 '<b>%s</b>'을(를) 영구적으로 삭제합니다."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "텍스트 편집기로 열기"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "대상 폴더 열기"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "새 추가 기능 추가"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "선택한 추가 기능 제거"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "사용자 추가 기능"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "폴더 '%s'을(를) 감시할 수 없습니다: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "사용자 스크립트와 사용자 스타일을 지원합니다."
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "색이 칠해진 탭"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "각 탭을 구분하기 쉽게 색을 칠합니다"
 
@@ -2142,43 +2162,41 @@ msgstr "각 탭을 구분하기 쉽게 색을 칠합니다"
 msgid "Cookie Manager"
 msgstr "쿠키 관리자"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "모두 삭제"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
-msgstr ""
-"보이는 모든 쿠키를 지웁니다. 필터를 설정한 경우 필터와 일치하는 쿠키만 지웁니"
-"다."
+msgstr "보이는 모든 쿠키를 지웁니다. 필터를 설정한 경우 필터와 일치하는 쿠키만 지웁니다."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "모두 펴기"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "모두 접기"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "정말 모든 쿠키를 삭제하시겠습니까?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "물음"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "이 필터와 맞는 쿠키만 지워집니다."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "현재 세션의 끝"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2196,15 +2214,15 @@ msgstr ""
 "<b>만료</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "예"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "아니요"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2213,20 +2231,20 @@ msgstr ""
 "<b>도메인</b>: %s\n"
 "<b>쿠키</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "이름"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "모두 펴기(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "모두 접기(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "이름 또는 도메인으로 쿠키 검색"
 
@@ -2246,24 +2264,45 @@ msgstr "탭 주소를 복사합니다"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "모든 탭의 주소를 클립보드로 복사합니다"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "불러오기 지연"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "페이지를 불러오기 전 몇 초간 지연합니다:"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "실제 탭을 사용하지 전 페이지 불러오기를 지원합니다."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "더 많은 정보는 더블 클릭으로 확인할 수 있습니다."
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "개발 도구"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "시스템 알림 영역에 Glib 오류 메시지를 보이는 확장 기능입니다."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "다음 플러그인으로 파일 다운로드를 사도 하는 중 오류가 발생했습니다:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"다음 플러그인으로 파일 다운로드를 시도하던 중 오류가 발생했습니다:\n"
+"%s\n"
+"\n"
+"오류:\n"
+"%s\n"
+"\n"
+"이 플러그인 없이 계속 진행합니다."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2303,25 +2342,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "마지막 업데이트: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "피드"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "새 피드 더하기"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "피드 삭제"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "피드(_F)"
 
@@ -2340,37 +2379,37 @@ msgstr "지원하지 않은 피드 포맷."
 msgid "Failed to parse XML feed: %s"
 msgstr "XML 피드 %s을(를) 붙여 넣을 수 없습니다"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "RSS XML 데이터에서 \"channel\" 요소를 찾을 수 없습니다."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "지원하지 않는 RSS 버전입니다."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "XML 데이터가 요구한 RSS \"item\" 요소를 찾을 수 없습니다."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "XML 데이터가 요구한 RSS \"channel\" 요소를 찾을 수 없습니다."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "피드 '%s'은(는) 이미 존재합니다."
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "피드 '%s'을(를) 읽어 들이는 중 오류"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "피드 패널"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom/RSS 피드를 읽습니다"
 
@@ -2391,122 +2430,398 @@ msgstr ""
 "암호 데이터베이스를 열어 보려면\n"
 "주 암호가 필요합니다."
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "이 페이지에서 암호를 저장하시겠습니까?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "암호 저장"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "나중에 하기"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "이 페이지는 절대 하지 않기"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "폼 기록 상태 켜고 끄기"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "현재 탭의 폼 기록을 사용하거나 사용하지 않습니다."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "데이터베이스에 접속할 수 없음: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr ""
-"폼 기록을 탭 별로 키보드 바로 가기(컨트롤 + 시프트 + F)로만 활성화합니다."
+msgstr "폼 기록을 탭 별로 키보드 바로 가기(컨트롤 + 시프트 + F)로만 활성화합니다."
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "입력 폼 기록 필터"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "입력한 폼 데이터 기록을 보존합니다"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "제안을 선택할 수 없습니다\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "방문하지 않은 탭이 없습니다"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "기록 목록"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "탭을 닫을 때의 행동"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "아무것도 안 함"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "마지막에 본 탭으로 전환"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "최근 연 탭으로 전환"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "배경 탭에 있는 창 반짝거리게 하기"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "다음 새 탭(기록 목록)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "기록 목록에서 다음 새 탭으로 전환합니다"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "이전 새 탭(기록 목록)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "기록 목록에서 이전 새 탭으로 전환합니다"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "배경에 탭 표시(기록 목록)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "지금 선택한 탭을 배경에 표시"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "기록 목록"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "탭을 닫거나 전환할 때 마지막에 사용한 탭으로 이동합니다"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL 실패: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "허용"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "이번 세션에서만 허용"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "차단"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "확장 기능의 데이터 베이스를 열 수 없습니다: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "자바스크립트 권한을 정말 모두 삭제하시겠습니까?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "자바스크립트 권한을 정말 모두 삭제하시겠습니까?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr "이 동작은 자바스크립트 권한을 모두 삭제합니다. 사용자가 웹 사이트를 다시 방문하면 권한을 묻습니다."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "관리자 인스턴스"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "전역 자바 스크립트 막기 관리자"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "자바 스크립트 막기 설정"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"아래는 모든 웹 사이트와 해당 웹 사이트의 정책 설정 목록입니다. 삭제하고 싶은 정책을 선택한 후 <i>삭제</i>를 누르면 해당 정책을 "
+"삭제할 수 있습니다."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "도메인"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "정책"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "모두 삭제(_A)"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "모든 사이트에서 스크립트 허용(_L)"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "알 수 없는 도메인의 스크립트를 설정하지 않아도 막기(_K)"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "두 번째 단계 도메인에서 권한 설정(_E)"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "%s 거부"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "%s 허용"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "이 세션에서만 %s 허용"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "브라우저 창"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "이 보기가 속하는 미도리 브라우저 인스턴스"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "보기"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "이 보기가 속하는 미도리 보기 인스턴스"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "메뉴 아이콘 상태"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "상태 표시줄에 보일 메뉴 아이콘의 상태"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "분명하지 않음"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "허용함"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "섞임"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "거부함"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr "치명적인 오류가 발생해 자바 스크립트 막기 확장 기능을 사용할 수 없습니다. 사용하지 않도록 설정해주십시오."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "자바 스크립트 막기 확장 기능에 오류 발생"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "이유"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "확장 기능의 데이터베이스를 열 수 없습니다."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "확장 기능의 데이터베이스를 설정할 수 없습니다."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "확장 기능 인스턴스"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "이 확장 기능의 미도리 확장 기능 인스턴스"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "프로그램 인스턴스"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "이 확장 기능에 해당하는 미도리 프로그램 인스턴스"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "데이터베이스 인스턴스"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 포인터"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "데이터베이스 경로"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 경로"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "모든 사이트를 허용"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr "참으로 설정하면 확장 기능은 각 사이트에서 권한을 묻지 않고 자바 스크립트를 허용합니다."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "두 번째 단계에서만"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"참으로 설정하면 이 확장 기능은 각 도메인을 두 번째 단계('www.example.org'를 'example.org'로 줄임)로 줄입니다."
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "알 수 없는 도메인에 대한 정책"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "알 수 없는 도메인에 사용할 정책을 설정합니다."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "임시로 허용"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "마우스 제스처"
@@ -2525,7 +2840,7 @@ msgstr "키보드 바로 가기 설정"
 
 #: ../extensions/shortcuts.c:275
 msgid "Customize Sh_ortcuts…"
-msgstr "바로 가기 사용자 설정(_O)..."
+msgstr "바로 가기 사용자 설정(_O)"
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2535,11 +2850,11 @@ msgstr "바로 가기"
 msgid "View and edit keyboard shortcuts"
 msgstr "키보드 바로 가기를 보고 편집합니다"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "상태 표시줄에 시계 표시"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "상태 표시줄에 시간과 날짜를 표시합니다"
 
@@ -2555,6 +2870,10 @@ msgstr "스크립트"
 msgid "Netscape plugins"
 msgstr "넷스케이프 플러그인"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "넷스케이프 플러그인 사용"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "상태 표시줄 기능"
@@ -2563,15 +2882,15 @@ msgstr "상태 표시줄 기능"
 msgid "Easily toggle features on web pages on and off"
 msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "탭 패널"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "탭 패널(_A)"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "탭을 수직 패널에서 보여줍니다"
 
@@ -2583,79 +2902,68 @@ msgstr "기본으로 탭에 아이콘만 표시"
 msgid "New tabs have no label by default"
 msgstr "기본으로 새 탭에 이름을 보이지 않습니다."
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "도구 모음 사용자 설정"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
-msgstr ""
-"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있"
-"습니다."
+msgstr "도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있습니다."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "가능한 항목"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "표시한 항목"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "사용자 설정 도구 모음(_C)…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "도구 모음 편집기"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "도구 모음 배치를 쉽게 편집합니다"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "디스크에 HTTP 통신을 저장합니다."
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "쿠키를 불러올 수 없습니다\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "개인 데이터 모두 지우기"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "개인 데이터 지우기(_C)"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "다음의 데이터 지우기:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "마지막에 연 탭(_T)"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "저장한 사용자 이름과 암호(_P)"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "쿠키와 웹사이트 데이터"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "웹 사이트 아이콘"
 
@@ -2663,209 +2971,148 @@ msgstr "웹 사이트 아이콘"
 msgid "Open tabs"
 msgstr "탭 열기"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "더 많은 연 탭…"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "기록을 제거할 수 없습니다: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "구 DB를 불일 수 없습니다."
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "구 DB에서 가져올 수 없습니다."
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "처리를 되돌릴 수 없습니다."
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "분리할 수 없습니다."
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "책갈피를 테이블을 만들 수 없습니다: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "책갈피 항목을 추가하지 못했습니다: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "구 데이터베이스에서 가져올 수 없습니다: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "책갈피를 업데이트할 수 없습니다: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "책갈피를 저장할 수 없습니다.%s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "책갈피 항목을 제거할 수 없습니다: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
-msgstr ""
-"사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다."
+msgstr "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "설정을 저장할 수 없습니다. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "세션을 열 수 없습니다: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "세션을 저장할 수 없습니다.%s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "휴지통을 저장할 수 없습니다.%s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
-msgstr ""
-"미도리를 마지막으로 실행했을 때 비 정상적으로 끝난 것 같습니다. 이런 일이 계"
-"속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오."
+msgstr "미도리를 마지막으로 실행했을 때 비 정상적으로 끝난 것 같습니다. 문제는 %s에 보고해주십시오."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "기본 설정 수정(_P)"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "모든 확장 기능 사용하지 않기(_E)"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "미도리가 충돌한 후 대화 상자를 표시합니다"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "오래된 탭 버리기"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
-msgstr "최근 충돌 기록 보이기"
+msgstr "최근 충돌 기록 보이기(_L)"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "디버깅 도구 실행(_D)"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "미도리를 이미 실행했지만 응답이 없습니다.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "책갈피를 읽어올 수 없습니다: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "세션을 열 수 없습니다: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "휴지통을 열 수 없습니다: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "기록을 열 수 없습니다: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "다음의 오류가 발생했습니다:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "무시(_I)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL 실패: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "허용"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "이번 세션에서만 허용"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "차단"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "확장 기능의 데이터베이스를 열 수 없습니다: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "정말 모든 쿠키 권한 설정을 삭제하시겠습니까?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "모든 쿠키 권한 설정을 삭제하시겠습니까?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
-msgstr ""
-"이 동작을 수행하면 모든 쿠키 권한을 삭제합니다. 각 웹 페이지를 방문하면 권한"
-"을 다시 요구합니다."
+msgstr "이 동작을 수행하면 모든 쿠키 권한을 삭제합니다. 각 웹 페이지를 방문하면 권한을 다시 요구합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "쿠키 권한 관리자"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "현재 쿠키 권한 관리자의 인스턴스"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "쿠키 권한 설정"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2873,514 +3120,347 @@ msgid ""
 "add a policy for a domain manually by entering the domain below, choosing "
 "the policy and clicking on <i>Add</i>."
 msgstr ""
-"아래는 모든 웹 사이트와 해당 웹 사이트의 정책 설정 목록입니다. 삭제하고 싶은 "
-"정책을 선택한 후 <i>삭제</i>를 누르면 해당 정책을 삭제할 수 있습니다. 또한 정"
-"책을 선택한 후 <i>추가</i>를 눌러 아래에 정책을 추가하고 싶은 도메인을 직접 "
-"입력할 수도 있습니다."
+"아래는 모든 웹 사이트와 해당 웹 사이트의 정책 설정 목록입니다. 삭제하고 싶은 정책을 선택한 후 <i>삭제</i>를 누르면 해당 정책을 "
+"삭제할 수 있습니다. 또한 정책을 선택한 후 <i>추가</i>를 눌러 아래에 정책을 추가하고 싶은 도메인을 직접 입력할 수도 있습니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "도메인"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "목록에 없는 도메인의 쿠키 정책: "
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "정책"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "모두 삭제(_A)"
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "알 수 없는 도메인인 경우 권한 물어보기(_S)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "사용자에게 묻기"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
 msgstr ""
-"쿠키 권한 관리자 확장 기능을 계속 사용하지 않도록 하는 과정에서 치명적인 오류"
-"가 발생했습니다. 사용하지 않도록 설정하십시오."
+"쿠키 권한 관리자 확장 기능을 계속 사용하지 않도록 하는 과정에서 치명적인 오류가 발생했습니다. 사용하지 않도록 설정하십시오."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
 msgstr "쿠키 권한 관리자 확장 기능에 오류가 발생했습니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "이유"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "확장 기능의 데이터베이스를 열 수 없습니다."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "확장 기능의 데이터베이스를 설정할 수 없습니다."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "도메인에 대한 전체 쿠키 정책을 확인할 수 없습니다: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "틸 세션 끝남"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
-msgstr "웹사이트 %s이(가) %d개의 쿠키를 보관하려 합니다."
+msgstr "웹사이트 %s이(가) 쿠키 %d개를 보관하려 합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "웹사이트 %s이(가) 쿠키를 보관하려 합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr "여러 웹 사이트가 모두 %d개의 쿠키를 보관하려 합니다."
+msgstr "여러 웹 사이트가 쿠키 %d개를 보관하려 합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "허용(_A)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "이번 세션에서만 허용(_S)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "차단(_N)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "이번에는 거부(_T("
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "경로"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "값"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "만료 날짜"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "확장 기능 인스턴스"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr "도메인에 사용할 정책은 각자 설정할 수 없습니다. 이 정책은 미도리 설정의 전역 쿠키 정책 설정에 더해 동작합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "ì\9d´ í\99\95ì\9e¥ ê¸°ë\8a¥ì\9d\98 ë¯¸ë\8f\84리 í\99\95ì\9e¥ ê¸°ë\8a¥ ì\9d¸ì\8a¤í\84´ì\8a¤"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "ì¿ í\82¤ ë³´ì\95\88 ê´\80리ì\9e\90"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "프로그램 인스턴스"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "사이트 별로 쿠키 권한을 관리합니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "이 확장 기능에 해당하는 미도리 프로그램 인스턴스"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "%s에서 프로그램 아이콘을 가져올 수 없습니다: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "데이터베이스 인스턴스"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "미도리(%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 포인터"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "새 런처를 만들 수 없습니다(%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "데이터베이스 경로"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "실행 아이콘을 만들었습니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 경로"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "이제 <b>%s</b>을(를) 메뉴나 런처에서 실행할 수 있습니다."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "ì\95\8c ì\88\98 ì\97\86ë\8a\94 ì \95ì±\85 ë¬¼ì\96´ë³´ê¸°"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "ì\8b¤í\96\89 ì\95\84ì\9d´ì½\98 ë§\8cë\93¤ê¸° ì\98¤ë¥\98"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"참으로 설정하면 이 확장 기능은 모든 알 수 없는 도메인의 권한을 물어봅니다.거"
-"짓으로 설정하는 경우 미도리 설정에 있는 전체 쿠키 설정을 사용합니다."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "프로그램"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "분명하지 않음"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "새 프로필(_P)"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "ì¿ í\82¤ ë³´ì\95\88 ê´\80리ì\9e\90"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "ì\83\88ë¡­ê³  ë\8f\85립ì \81ì\9d¸ í\94\84ë¡\9cí\95\84ê³¼ ì\8b¤í\96\89 ì\95\84ì\9d´ì½\98ì\9d\84 ë§\8cë\93­ë\8b\88ë\8b¤."
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "ì\82¬ì\9d´í\8a¸ ë³\84ë¡\9c ì¿ í\82¤ ê¶\8cí\95\9cì\9d\84 ê´\80리í\95©ë\8b\88ë\8b¤."
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "ì\83\88 ì\95±(_A)"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "프로그램"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "지정한 사이트의 새 앱 만들기"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "실행 오류"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "실행 아이콘 만들기(_L)"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "웹 앱 관리자"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "프로그램으로 설치한 웹 사이트를 관리합니다."
 
-#: ../extensions/transfers.vala:52
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "전송"
 
-#: ../extensions/transfers.vala:65 ../extensions/transfers.vala:330
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "모두 지우기"
 
-#: ../extensions/transfers.vala:160
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "다운로드한 항목을 열 수 없습니다: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "다운로드 폴더 열기(_F)"
 
-#: ../extensions/transfers.vala:167
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "링크 위치 복사(_A)"
 
-#: ../extensions/transfers.vala:394
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "파일 '<b>%s</b>'을(를) 다운로드 했습니다."
 
-#: ../extensions/transfers.vala:395
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>'와(과) 파일 %d개를 다운로드했습니다."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "전송이 끝났습니다"
 
-#: ../extensions/transfers.vala:422 ../extensions/transfers.vala:423
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "파일을 다운로드 하고 있습니다"
 
-#: ../extensions/transfers.vala:425
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "미도리 종료(_Q)"
 
-#: ../extensions/transfers.vala:427
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "미도리를 종료하시면 파일 다운로드를 취소합니다."
 
-#: ../extensions/transfers.vala:474
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "파일 전송 관리자"
 
-#: ../extensions/transfers.vala:475
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "다운로드한 파일 보기"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "가운데 버튼 클릭으로 선택한 주소 열기"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다."
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "확장 기능의 설정 파일 경로를 찾을 수 없습니다: 경로를 설정하지 않았습니다."
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "확장 기능의 설정 파일 경로를 찾을 수 없습니다."
-
-#~ msgid "Custom..."
-#~ msgstr "사용자 지정..."
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "쿠키 보존 확인"
-
-#~ msgid "_Details"
-#~ msgstr "자세한 내용(_D)"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "웹 페이지에 보낼 식별 명을 지정합니다."
-
-#~ msgid "Writing failed."
-#~ msgstr "쓸 수 없습니다."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "동역학 스크롤"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다."
-
-#~ msgid "_Window"
-#~ msgstr "창(_W)"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "바로 가기를 바탕 화면에 추가(_D)"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "콘솔 경고를 지정한 파일로 전송합니다."
-
-#~ msgid "FILENAME"
-#~ msgstr "[파일 이름]"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "일치하는 단어 강조 표시"
-
-#~ 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 "간략한 사이드 패널(_C)"
-
-#~ 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 "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 "넷스케이프 플러그인 개체를 사용합니다."
-
-#~ 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 로컬 기억 장치 지원을 사용할지 결정합니다."
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "데이터베이스를 업데이트할 수 없습니다: %s"
 
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "오프라인 웹 응용 프로그램 캐시를 사용할지 결정합니다."
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "데이터베이스에서 선택할 수 업습니다: %s"
 
-#~ msgid "Flash the browser window if a new tab was opened in the background"
-#~ msgstr "배경에 새 탭이 열리면 브라우저 창을 반짝거리게 합니다"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "이전 버전의 세션을 가져올 수 없습니다: %s"
 
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "웹페이지를 오픈GL을 사용해 표현할 수 있도록 합니다."
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "태비"
 
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "글자와 그림을 확대할지 결정합니다."
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "탭과 세션을 관리합니다."
 
-#~ msgid "Find inline while typing"
-#~ msgstr "주소 창에 입력할 때 바로 찾기"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "플러미"
 
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "입력 중 자동으로 찾을지 결정합니다."
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr "작업을 업데이트하거나 이벤트 순환을 처리할 작업 대기열을 제공하는 확장 기능입니다."
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "사용할 프록시 서버의 종류"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "데이터베이스에 새 노트를 추가할 수 없습니다: %s\\n\n"
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP 프록시 서버"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "데이터베이스에서 노트를 제거할 수 없습니다: %s\\n\n"
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "HTTP 연결에 사용하는 프록시 서버"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "노트의 이름을 바꿀 수 없음: %s\\n\n"
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "HTTP 연결에 사용하는 프록시 서버 포트"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "노트 업데이트 실패: %s\\n\n"
 
-#~ msgid "Identification string"
-#~ msgstr "식별 문자열"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "노트"
 
-#~ msgid "The application identification string"
-#~ msgstr "응용 프로그램 식별 문자열"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "새 노트"
 
-#~ msgid "Clear private data"
-#~ msgstr "개인 데이터 지우기"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "연 페이지와 관계가 없는 빈 노트를 새로 만듭니다."
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "삭제하기 위해 선택한 개인 데이터"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "새 노트"
 
-#~ msgid "Clear data"
-#~ msgstr "데이터 지우기"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "노트 데이터베이스에서 선택할 수 없습니다: %s\\n\n"
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "삭제할 데이터를 선택했습니다"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "노트 이름 바꾸기"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "다른 탭 닫기(_H)"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "노트를 클립보드로 복사"
 
-#~ msgid "_Icon:"
-#~ msgstr "아이콘(_I):"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "노트 제거"
 
-#~ msgid "Filter:"
-#~ msgstr "필터:"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "선택 영역을 노트로 복사"
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr ""
-#~ "이름 또는 도메인 필드가 입력한 필터와 맞는 쿠키만 보려면 필터 문자열을 입"
-#~ "력하세요"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "웹사이트의 텍스트 클립을 노트로 복사"
 
-#~ msgid "_Bookmark"
-#~ msgstr "책갈피(_B)"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "광고 막기"
 
-#~ msgid "_Console"
-#~ msgstr "콘솔(_C)"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "필터 목록에 따라 광고를 막습니다"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "최상위 폴더"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "광고 필터 설정"
 
-#~ msgid "_Title:"
-#~ msgstr "제목(_T):"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "그림 막기(_O)"
 
-#~ msgid "_Folder:"
-#~ msgstr "폴더(_F):"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "링크 막기(_O)"
 
-#~ msgid "_Customize…"
-#~ msgstr "사용자 지정(_C)…"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "규칙 편집"
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "지정한 설정 폴더가 올바르지 않습니다."
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "규칙(_R):"
diff --git a/po/ky.po b/po/ky.po
new file mode 100644 (file)
index 0000000..08b0cb9
--- /dev/null
+++ b/po/ky.po
@@ -0,0 +1,3426 @@
+# Kirghiz translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:34+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Kirghiz <ky@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-27 05:46+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Интернет-серепчи"
+
+#: ../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 "Internet;Explorer;Интернет;браузер;обозреватель;www"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Жаңы салма"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Жаңы терезе"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Жаңы _терезе"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Жаңы _папка"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Кезектеги баракты жаңыртуу"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Жаңы чөп кат кошуу"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Жаңы _терезеден ачуу"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  chyngyz https://launchpad.net/~chyngyz"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Жаңы салманы ачуу"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "Ат коюп баракты _сактоо…"
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Жаңы _папканы кошуу"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Меню панели"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Желеден издөөнү жүргүзүү"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Меню"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Меню"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Жаңы салма"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Шилтемени жаңы _салмадан ачуу"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Шилтемени жаңы _терезеден ачуу"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "_Сүрөттү жаңы салмадан ачуу"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Даректи жаңы _салмадан ачуу"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "_Фреймди жаңы салмадан ачуу"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Жаңы _салмадан ачуу"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/lb.po b/po/lb.po
new file mode 100644 (file)
index 0000000..97fc49b
--- /dev/null
+++ b/po/lb.po
@@ -0,0 +1,3425 @@
+# Luxembourgish translation for midori
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-02-15 00:57+0000\n"
+"Last-Translator: Yvo Marques <macghivo@gmail.com>\n"
+"Language-Team: Luxembourgish <lb@li.org>\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-Launchpad-Export-Date: 2015-02-16 05:51+0000\n"
+"X-Generator: Launchpad (build 17341)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Web Browser"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Browser"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Am Internet surfen"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Neien Tab"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nei Fënster"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nei Privat Fënster"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Privat Surfen"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privat Surfen"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "ADRESSE als Web Applikatioun starten"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRESSE"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "DOSSIER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Privat surfen, keng ännerungen gin gespäichert"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Portable mode, all runtime Fischien sin an enger platz gespäichert"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Deen spezifeschen Befehl ausféieren"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Versioun von der Applikatioun uweisen"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adressen"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "MUSTER"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Midori reseten no SEKONNEN sekonnen Inaktivitéit"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKONNEN"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Fehler: \"gdb\" kann net fonnt gin\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "No enger neier Versioun sichen um:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Een onbekannte Feeler ass opgetrueden"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bookmarks"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Verlaf"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Yvo Marques https://launchpad.net/~macghivo"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index ac035ff1c7b5cfba14a898fa746f2b9ccbbbdfe8..339731b8e4076c9716084da4ce79e95622225122 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
 # This file is distributed under the same license as the midori package.
 # Ričardas Vasiulis <ricardas.v@inbox.lt> 2010
 # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 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 <margevicius.algimantas@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-02-02 21:23+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lietuvių <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-02-03 06:06+0000\n"
+"X-Generator: Launchpad (build 17330)\n"
 "Language: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Poedit-Language: Lithuanian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../data/midori.desktop.in.h:1
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Žiniatinklio naršyklė"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Interneto naršyklė Midori"
+
+#: ../data/midori.desktop.in.h:4
 msgid "Browse the Web"
 msgstr "Naršyti internete"
 
-#: ../data/midori.desktop.in.h:2
+#: ../data/midori.desktop.in.h:5
 msgid "Internet;WWW;Explorer"
 msgstr "Internetas;WWW;Naršyklė"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nauja kortelė"
 
-#: ../data/midori.desktop.in.h:4
-msgid "Web Browser"
-msgstr "Žiniatinklio naršyklė"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Naujas langas"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Naujas privataus naršymo langas"
 
 #: ../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
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privatus naršymas"
 
-#: ../midori/main.c:96 ../midori/main.c:102
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Nepavyko įkelti konfigūracijos: %s\n"
-
-#: ../midori/main.c:150
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Reikšmė „%s” yra netinkama su %s "
-
-#: ../midori/main.c:155 ../midori/main.c:259
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Netinkama konfigūracijos reikšmė: „%s”"
-
-#: ../midori/main.c:380
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Paieškos sistemos įkelti nepavyko. %s\n"
-
-#: ../midori/main.c:434
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Nepavyko ištrinti žurnalo įrašų: %s\n"
-
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Nepavyko atverti duomenų bazės: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Nepavyko pašalinti senų žurnalo įrašų: %s\n"
-
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Nepavyko pašalinti žurnalo įrašo: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Adresyno įrašų nepavyko išsaugoti. %s"
-
-#: ../midori/main.c:633
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Konfigūracijos nepavyko išsaugoti. %s"
-
-#: ../midori/main.c:668
-#, 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
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Šiukšlinės nepavyko išsaugoti. %s"
-
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "Plėtiniai"
-
-#: ../midori/main.c:760
-msgid "Privacy"
-msgstr "Privatumas"
-
-#: ../midori/main.c:772
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Slapukai kaupia prisijungimo duomenis, išsaugotus žaidimus ar naudotojo "
-"profilį reklamos reikmėms."
-
-#: ../midori/main.c:828
-#, 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: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:1134
-msgid "Modify _preferences"
-msgstr "Keisti _nustatymus"
-
-#: ../midori/main.c:1138
-msgid "Disable all _extensions"
-msgstr "Išjungti _visus plėtinius"
-
-#: ../midori/main.c:1151
-msgid "Discard old tabs"
-msgstr "Naikinti ankstesnes korteles"
-
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
-msgid "Show last tabs without loading"
-msgstr "Rodyti ankstesnes korteles neįkeliant"
-
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
-msgid "Show last open tabs"
-msgstr "Rodyti ankstesnes korteles"
-
-#: ../midori/main.c:1400 ../midori/main.c:2464
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sesija negali būti įkelta: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Atverti naują _privataus naršymo langą"
 
-#: ../midori/main.c:1538
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Momentinė nuotrauka išsaugota: %s\n"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Vykdyti ADRESĄ kaip interneto programą"
 
-#: ../midori/main.c:1951
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESAS"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Naudokite APLANKĄ kaip konfigūracijos aplanką"
 
-#: ../midori/main.c:1954
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "APLANKAS"
 
-#: ../midori/main.c:1957
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privatus naršymas, jokie pakeitimai nesaugomi"
 
-#: ../midori/main.c:1959
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Rodyti diagnostikos dialogą"
 
-#: ../midori/main.c:1961
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Vykdyti nurodyto pavadinimo failą, kaip JavaScript"
 
-#: ../midori/main.c:1963
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Padaryti nurodyto URI momentinę nuotrauką"
 
-#: ../midori/main.c:1965
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Vykdyti nurodytą komandą"
 
-#: ../midori/main.c:1967
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Parodyti visas komandas, kurias galima vykdyti su e-/ --execute"
 
-#: ../midori/main.c:1969
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Rodyti programos versiją"
 
-#: ../midori/main.c:1971
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresai"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blokuoti URI pagal reguliariųjų išraiškų MODELĮ"
 
-#: ../midori/main.c:1973
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "MODELIS"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Atstatyti Midori po SEKUNDŽIŲ neaktyvumo"
 
-#: ../midori/main.c:1977
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDĖS"
 
-#: ../midori/main.c:1980
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Nukreipia konsolės įspėjimus į nurodytą FAILO VARDĄ"
-
-#: ../midori/main.c:1980
-msgid "FILENAME"
-msgstr "FAILO VARDAS"
-
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Adresai]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Klaida: nerastas \"gdb\" įrankis\n"
 
-#: ../midori/main.c:2087
+#: ../midori/main.c:162
 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:164
 msgid "Check for new versions at:"
 msgstr "Ieškoti naujų versijų:"
 
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
-msgid "Saved logins and _passwords"
-msgstr "Išsaugoti vardai ir sla_ptažodžiai"
-
-#: ../midori/main.c:2175
-msgid "Cookies and Website data"
-msgstr "Slapukai ir tinklalapių duomenys"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "Žiniatinklio podėlis"
-
-#: ../midori/main.c:2182
-msgid "Website icons"
-msgstr "Svetainės piktogramos"
-
-#: ../midori/main.c:2288
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Įvyko nežinoma klaida"
 
-#: ../midori/main.c:2395
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Midori egzempliorius jau veikia, tačiau neatsako.\n"
-
-#: ../midori/main.c:2431
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Adresyno nepavyksta įkelti: %s\n"
-
-#: ../midori/main.c:2479
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Šiukšlinės įkelti nepavyko: %s\n"
-
-#: ../midori/main.c:2492
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Žurnalo įkelti nepavyko: %s\n"
-
-#: ../midori/main.c:2508
-msgid "The following errors occured:"
-msgstr "Įvyko šios klaidos:"
-
-#: ../midori/main.c:2524
-msgid "_Ignore"
-msgstr "_Nepaisyti"
-
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "Ž_ymelės"
-
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "Ž_ymelės"
 
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Pridėti ž_ymelę"
 
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Konsolė"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Plėtiniai"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Istorija"
 
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Pradžios tinklalapis"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Naudotojo scenarijai"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nauja _kortelė"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Perdavimai"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape _įskiepiai"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Už_vertos kortelės"
 
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Naujas _langas"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Naujas _aplankas"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresai]"
+
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Klaidingas dokumentas."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Neatpažintas adresyno formatas."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Rašymas nepavyko."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Eiti į tolimesnį puslapį"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Eiti į kitą popuslapį"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Ieškoti internete..."
 
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
-msgstr "Perkrauti šį puslapį"
+msgstr "Iš naujo įkelti šį puslapį"
 
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Sustabdyti šį puslapį"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Reikšmė „%s” yra netinkama su %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Netikėtas nustatymas „%s“"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Nenumatytas veiksmas „%s”."
 
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:723
 #, 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:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Nepavyko įterpti naujo žurnalo įrašo: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Adresynas"
 
-#: ../midori/midori-browser.c:774
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Naujas aplankas"
 
-#: ../midori/midori-browser.c:774
-msgid "Edit folder"
-msgstr "Redaguoti aplanką"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Keisti aplanką"
 
-#: ../midori/midori-browser.c:776
-msgid "New bookmark"
-msgstr "Naujas adresyno įrašas"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nauja žymelė"
 
-#: ../midori/midori-browser.c:776
-msgid "Edit bookmark"
-msgstr "Taisyti adresyno įrašą"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Keisti žymelę"
 
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Pavadinimas:"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresas:"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "Ap_lankas:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:1185
 msgid "Add to _Speed Dial"
 msgstr "Pridėti į _spartųjį rinkimą"
 
-#: ../midori/midori-browser.c:890
-msgid "Show in the tool_bar"
-msgstr "Rodyti įrankių _juostoj"
-
-#: ../midori/midori-browser.c:905
-msgid "Run as _web application"
-msgstr "Veikia kaip _interneto programa"
-
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Failo „%s” nepavyko išsaugoti šiame aplanke."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Jūs neturite leidimo rašyti į šią vietą."
-
-#: ../midori/midori-browser.c:985
-#, 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
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Failui reikia %s bet liko tik %s."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Išsaugokite failą kaip"
 
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Naujas langas"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
 
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Naujas langas atidarytas"
 
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nauja kortelė"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Nauja kortelė atidaryta"
 
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Klaida atveriant paveikslėlį!"
 
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Numatytoje žiūryklėje paveikslėlio atverti nepavyko."
 
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Klaida parsiunčiant paveikslėlį!"
 
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Nepavyko parsiųst paveikslėlio."
 
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Išsaugoti failą"
 
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Įkelti iš naujo puslapį nekešuojant"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Atverti failą"
 
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2692
 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"
@@ -534,139 +386,122 @@ msgstr ""
 "programą. Kitą kartą spustelėjus naujienų piktogramą, ji bus pridėta "
 "automatiškai."
 
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Naujas kanalas"
 
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 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:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Tuščias"
 
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Perjungti teksto žymeklio naršymą"
 
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Nepavyko įterpti naujo žurnalo įrašo: %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
 
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Atverti viską _kortelėse"
 
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
-msgid "Open in New _Tab"
-msgstr "Atidaryti naujoje _kortelėje"
-
-#: ../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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Atverti _naujame lange"
 
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4239
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importuoti adresyną …"
 
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importuoti adresyną"
 
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Programa:"
 
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importuoti iš XBEL ar HTML failo"
 
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importuoti iš failo"
 
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Adresyno importas nepavyko"
 
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL adresynas"
 
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape adresynas"
 
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4546
 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:4558
 msgid "Failed to export bookmarks"
 msgstr "Adresyno eksportas nepavyko"
 
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
-msgid "Clear Private Data"
-msgstr "Pašalinti asmeninius duomenis"
-
-#: ../midori/midori-browser.c:4560
-msgid "_Clear private data"
-msgstr "Šalinti _asmeninius duomenis"
-
-#: ../midori/midori-browser.c:4573
-msgid "Clear the following data:"
-msgstr "Šalinti šiuos duomenis:"
-
-#: ../midori/midori-browser.c:4583
-msgid "Last open _tabs"
-msgstr "Paskutinės atvertos _kortelės"
-
-#: ../midori/midori-browser.c:4609
-msgid "Clear private data when _quitting Midori"
-msgstr "Šalinti asmeninius duomenis _uždarant Midori"
-
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Paprasta naršyklė."
 
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Norėdami pamatyti versijos informaciją pažiūrėkite about:version ."
 
-#: ../midori/midori-browser.c:4807
+#: ../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 "
@@ -678,926 +513,1103 @@ msgstr ""
 "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:4780
 msgid "translator-credits"
 msgstr ""
 "Ričardas Vasiulis <ricardas.v@inbox.lt>\n"
-"Algimantas Margevičius <margevicius.algimantas@gmail.com>"
+"Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Algimantas Margevičius https://launchpad.net/~gymka\n"
+"  Edvinas Šedeckis https://launchpad.net/~edvinas-sedeckis\n"
+"  Mantas Kriaučiūnas https://launchpad.net/~mantas\n"
+"  Ričardas V. https://launchpad.net/~ricardas-v\n"
+"  Simonas Gudjonis https://launchpad.net/~simonas-8\n"
+"  madrakas https://launchpad.net/~arvydas-simbelis"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dubliuoti dabartinę kortelę"
 
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Failas"
 
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Atverti naują langą"
 
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Atverti naują kortelę"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Naujas _privataus naršymo langas"
 
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Atverti failą"
 
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Išsaugoti tinklapį kaip…"
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Išsaugoti faile"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Pridėti į spartųjį _rinkimą"
 
-#: ../midori/midori-browser.c:5235
-msgid "Add Shortcut to the _desktop"
-msgstr "Įdėti nuorodą į _darbastalį"
-
-#: ../midori/midori-browser.c:5237
-msgid "Create _Launcher"
-msgstr "Sukurti _leistuką"
-
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "_Užsisakyti šį kanalą"
 
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Užverti kortelę"
 
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Užverti šią kortelę"
 
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Užverti _langą"
 
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
-msgstr "Spausdinti šį puslapį "
+msgstr "Spausdinti šį puslapį"
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Užverti _visus langus"
 
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Iešk_oti …"
 
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Surasti žodį arba frazę puslapyje"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Ieškoti _kito"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Ieškoti _ankstesnio"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Konfigūruoti programos nuostatas"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Rodymas"
 
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Įrankių _juostos"
 
-#: ../midori/midori-browser.c:5300
-msgid "Reload page without caching"
-msgstr "Perkrauti puslapį be spartinimo"
-
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Didinti mastelį"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Sumažinti mastelį"
 
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodavimas"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Rodyti pirminį _kodą"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "_Privatus naršymas"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Perjungti viso ekrano veikseną"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Slinkti _kairėn"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Slinkti _žemyn"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Slinkti _aukštyn"
 
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Slinkti _dešinėn"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Eiti"
 
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Grįžti į ankstesnį puslapį"
 
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Eiti į tolimesnį puslapį"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Eiti į kitą popuslapį"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Pradžios tinklalapis"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Eiti į jūsų pradžios tinklapį"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "_Atšaukti kortelės užvėrimą"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Pridėti naują _aplanką"
 
-#: ../midori/midori-browser.c:5375
-msgid "_Export bookmarks"
-msgstr "_Eksportuoti adresyną"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Tvarkyti paieškos variklius"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5381
-msgid "_Clear Private Data"
-msgstr "Šalinti _asmeninius duomenis"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Apžiūrėti _tinklapį"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Ankstesnė kortelė"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Sekanti kortelė"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Perkelti kortelę į _atgal"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Perkelti kortelę į _pirmyn"
 
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Fokusuoti dabartinę _kortelę"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Fokusuoti _sekantį rodinį"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Rodyti tik dabartinės _kortelės piktogramą"
 
-#: ../midori/midori-browser.c:5407
-msgid "_Duplicate Current Tab"
-msgstr "_Dubliuoti dabartinę kortelę"
-
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Užverti _kitas korteles"
 
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Atverti paskutinį _seansą"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
-msgstr "_Žinynas"
+msgstr "_Pagalba"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Klausimai ir atsakymai"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Pranešti apie pro_blemą…"
 
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "Įra_nkiai"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Meniu juosta"
 
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Naršymo juosta"
 
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Š_oninis skydelis"
 
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Šoninis skydelis"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Adresų juosta"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Būsenos juosta"
 
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatiškai"
 
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Kinų (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonų (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korėjiečių (EUC-KR)"
 
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rusų (KOI8-R)"
 
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unikodas (UTF-8)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Pasirinktas…"
 
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Skirtukas"
 
-#: ../midori/midori-browser.c:5992
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Vieta…"
 
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Atverti tam tikrą adresą"
 
-#: ../midori/midori-browser.c:6016
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Paieška žiniatinklyje …"
 
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Vykdyti paiešką žiniatinklyje"
 
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Rodyti išsaugotas žymeles"
 
-#: ../midori/midori-browser.c:6079
-msgid "_Tools"
-msgstr "Įra_nkiai"
-
-#: ../midori/midori-browser.c:6095
-msgid "_Window"
-msgstr "_Langas"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Kortelės"
 
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Rodyti atvertų kortelių sąrašą"
 
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Meniu"
 
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Meniu"
 
-#: ../midori/midori-browser.c:6927
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Netikėtas nustatymas „%s“"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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"
 
-#: ../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:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "Eksportuoti liudijimą"
 
-#: ../midori/midori-locationaction.c:412
-msgid "Search with…"
-msgstr "Ieškoti su…"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Nepavyko pažymėti žurnalo įrašo\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "Ieškoti %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Įdėti ir _tęsti"
 
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Nepatvirtinta"
 
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Patikrintas ir užšifruotas ryšys"
 
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1814
 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:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 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:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Užverti skydelį"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Lygiuoti šoninį skydelį kairėn"
 
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Rodyti Sparčiąją rinktį"
 
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Rodyti pradžios tinklapį"
 
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Rodyti ankstesnes korteles"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Rodyti ankstesnes korteles neįkeliant"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Rodyti tuščią puslapį"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonų (Shift_JIS)"
 
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nauja kortelė"
 
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Naujas langas"
 
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Dabartinė kortelė"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Numatyta"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Piktogramos"
 
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Mažos piktogramos"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekstas"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Piktogramos ir tekstas"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekstas šalia piktogramų"
 
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatinis (GNOME ar aplinkos)"
 
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP įgaliotasis serveris"
 
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Nėra įgaliotojo serverio"
 
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Įsiminti paskutini lango dydį"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Įrankių juostos stilius"
 
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Ar išsaugoti paskutinio lango dydį"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Visada naudoti mano pasirinktus šriftus"
 
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Paskutinio lango plotis"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Perrašyti tinklalapių parinktus šriftus naudotojo pasirinktais"
 
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "Paskutinio išsaugoto lango plotis"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Nepavyko įkelti konfigūracijos: %s\n"
 
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Paskutinio lango aukštis"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Netinkama konfigūracijos reikšmė: „%s”"
 
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "Paskutinio išsaugoto lango aukštis"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Ankstesnė skydelio padėtis"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Rodyti kortelės _antraštę"
 
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "Paskutinė išsaugota skydelio padėtis"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Rodyti tik kortelės _piktogramą"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Paskutinis skydelio puslapis"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "Paskutinis išsaugotas skydelio puslapis"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Paskutinė interneto paieška"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
 
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "Paskutinė išsaugota interneto paieška"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
 
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Rodyti meniu juostą"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s nori išsaugoti HTML5 duomenų bazę."
 
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Ar rodyti meniu juostą"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Neleisti"
 
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Rodyti naršymo juostą"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Leisti"
 
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Ar rodyti naršymo juostą"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s nori žinoti jūsų vietą."
 
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Rodyti žymelių juostą"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Ar rodyti žymelių juostą"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Rodyti skydelį"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Ar rodyti skydelį"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Rodyti būsenos juostą"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Ar rodyti būsenos juostą"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:519
-msgid "Toolbar Style:"
-msgstr "Įrankių juostos stilius:"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:520
-msgid "The style of the toolbar"
-msgstr "Įrankių juostos stilius"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Įrankinės elementai"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Bandyti dar kartą"
 
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Elementai rodomi įrankių juostoje"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Siųsti laišką į %s"
 
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Suspaustas šoninis skydelis"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
 
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Ar suspausti šoninį skydelį"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Lygiuoti šoninį skydelį dešinėn"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Atverti nuorodą naujoje _kortelėje"
 
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Ar lygiuoti šoninį skydelį dešinėn"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Atverti nuorodą priekinėje _kortelėje"
 
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Atverti skydelius atskiruose languose"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Atverti nuorodą fono _kortelėje"
 
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Ar visada atverti skydelius atskiruose languose"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Atverti nuorodą _naujame lange"
 
-#: ../midori/midori-websettings.c:580
-msgid "When Midori starts:"
-msgstr "Paleidžiant „Midori”:"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Kopijuoti nuorodos pa_skirtį"
 
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Ką daryti paleidžiant „Midori”"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
 
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Pradžios tinklapis:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
 
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "Pradžios tinklapis"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Paveikslėlį atverti naujoje k_ortelėje"
 
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Rodyti strigties dialogo langą"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
 
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Rodyti dialogo langą po „Midori” strigties"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Išsaugoti p_aveikslėlį"
 
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Išsaugoti atsiųstus failus į:"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Atverti _paveikslėlių žiūryklėje"
 
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "Aplankas atsiųstų failų išsaugojimui"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopijuoti video _adresą"
 
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Teksto redaktorius"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Parsiųsti _video"
 
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Išorinė rašyklė"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Atverti adresą naujoje _kortelėje"
 
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Naujienų skaityklė"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Ieškoti _su"
 
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Išorinė naujienų skaityklė"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Ieškoti žiniatinklyje"
 
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Vietos įvesties paieška"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "Paieška kuri bus vykdoma vietos įvestyje"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Apžiūrėti _elementą"
 
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "Pageidautina koduotė"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "Pageidautina simbolių koduotė"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Failo vardas: „%s“"
 
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Visada rodyti ąseles"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Failo tipas: „%s“"
 
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Visada rodyti kortelių ąseles"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Failo tipas: %s („%s“)"
 
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Uždarymo mygtukai ant kortelių "
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Ar kortelės turi uždarymo mygtukus"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Atverti %s"
 
-#: ../midori/midori-websettings.c:709
-msgid "Open new pages in:"
-msgstr "Atverti naujus tinklapius:"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Apžiūrėti puslapį - %s"
 
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Kur atverti naujus tinklapius"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori nesaugo asmeninių duomenų:"
 
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Vidurinis klavišas atveria pasirinkimą"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Nėra išsaugotų slapukų ar istorijos įrašų."
 
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Įkelti pasirinktą adresą paspaudus per vidurį"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Plėtiniai išjungti."
 
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Atverti korteles antrame plane"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"HTML5 saugykla, vietinė duomenų bazė ir programos podėlis yra išjungti."
 
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Ar atverti naują kortelę antrajam plane"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori neleidžia tinklalapiams sekti naudotojo:"
 
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Atverti kortelę šalia dabartinės"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Pasirinkimo URL apkarpyti iki serverio vardo."
 
-#: ../midori/midori-websettings.c:738
-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-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS išankstinis gavimas išjungtas."
 
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Atverti iškylančius langus kaip korteles"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Tinklalapiams kalba ir laiko zona neatskleidžiama."
 
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Ar atverti iškylančius langus kaip korteles"
+#: ../midori/midori-view.c:3906
+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-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Automatiškai įkelti paveikslus"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr "Versijų numeriai skliaustuose rodo naudojamas versijas."
 
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Įkelti ir atvaizduoti paveikslus automatiškai"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Leisti scenarijus"
+#: ../midori/midori-view.c:4000
+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ų."
 
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Leisti įstatytas scenarijų kalbas"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Įkelti puslapį"
 
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Naudoti „Netscape” įskiepius"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Išvalyti puslapį"
 
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Naudoti įmontuotus „Netscape” įskiepius"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "ankstesnis"
 
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Leisti tikrinti rašybą"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "sekantis"
 
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Leisti tikrinti rašybą berašant"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Spausdinti fono paveikslėlius"
 
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Įjungti HTML5 duomenų bazės palaikymą"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Ar spausdinti fono piešinius"
 
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Ar įjungti HTML5 duomenų bazės palaikymą"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Galimybės"
 
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Įjungti HTML 5 vietinio kaupimo funkcijos palaikymą"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s iš %s"
 
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Ar įjungti HTML5 vietinės saugyklos palaikymą"
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d valanda"
+msgstr[1] "%d valandos"
+msgstr[2] "%d valandų"
 
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Įjungti žiniatinklio programų podėlį darbui neprisijungus"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutė"
+msgstr[1] "%d minutės"
+msgstr[2] "%d minučių"
 
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Ar įjungti žiniatinklio programų podėlį darbui neprisijungus"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundė"
+msgstr[1] "%d sekundės"
+msgstr[2] "%d sekundžių"
 
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Blykstelti langą atvėrus kortelę fone"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s liko"
 
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Jei nauja kortelė buvo atidaryta fone, blykstelti naršyklės langą"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Įgalinti WebGL palaikymą"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Leisti tinklalapiams naudoti OpenGL atvaizdavimą"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Parsiųstas failas yra klaidingas."
 
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Keisti teksto ir paveikslų mastelį"
+#: ../midori/midori-download.vala:221
+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."
 
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Ar keisti teksto ir paveikslų mastelį"
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Failo „%s” nepavyko išsaugoti šiame aplanke."
 
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Ieškoti rašant"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Jūs neturite leidimo rašyti į šią vietą."
 
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Ar automatiškai ieškoti rašant"
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Čia nepakanka laisvos vietos atsisiųsti „%s”."
 
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Kinetinis slinkimas"
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Failui reikia %s bet liko tik %s."
 
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
-"Ar slinkimo greitis turėtų būti atitinkamas kinetiniam slinkimo greičiui"
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Sparčioji rinktis"
 
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Šalinti slapukus senesnius nei:"
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Bakstelkit nuorodai pridėti"
 
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "Didžiausias dienų skaičius slapukams saugoti "
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Įveskit nuorodos adresą"
 
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Slapukus priimti tik iš aplankytų puslapių"
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Įveskit nuorodos pavadinimą"
 
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Blokuoti slapukus siunčiamus trečiųjų šalių"
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Ar tikrai norite pašalinti šią nuorodą?"
 
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Iš žurnalo šalinti tinklapius senesnius nei:"
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Paleistis"
 
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "Didžiausias dienų skaičius tinklapiams žurnale saugoti"
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Paleidžiant „Midori”:"
 
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Įgaliotasis serveris"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Pradžios tinklapis:"
 
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "Naudojamo įgaliotojo serverio tipas"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Naudoti _dabartinį puslapį"
 
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "HTTP tarpinis serveris"
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Naudoti dabartinį tinklapį kaip pradžios"
 
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Tarpinis serveris naudojamas HTTP prisijungimams"
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Šriftai"
 
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Prievadas"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Įvairiaplotė garnitūra"
 
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "Tarpinio serverio prievadas naudojamas HTPP susijungimams"
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Numatytoji tekstui atvaizduoti naudojama šriftų šeima"
 
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "Didžiausias galimas podėlio dydis diske"
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Numatytasis tekstui atvaizduoti naudojamas šriftas"
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
-msgid "Identify as"
-msgstr "Prisistatyti kaip"
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Lygiaplotė garnitūra"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "Numatytoji tekstui atvaizduoti naudojama lygiapločių šriftų šeima"
+
+#: ../midori/midori-preferences.c:351
+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:353
+msgid "Minimum Font Size"
+msgstr "Mažiausias galimas šrifto dydis"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto dydis"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Pageidautina koduotė"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Elgsena"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Automatiškai įkelti paveikslus"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Leisti tikrinti rašybą"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Leisti scenarijus"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Įgalinti WebGL palaikymą"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Keisti teksto ir paveikslų mastelį"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Leisti iškylančius langus"
 
-#: ../midori/midori-websettings.c:1015
-msgid "What to identify as to web pages"
-msgstr "Kaip prisistatyti tinklalapiams"
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Ar leisti scenarijams atverti iškylančius langus automatiškai"
 
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Atpažinimo eilutė"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
 
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "Programos atpažinimo eilutė"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Pageidaujamos kalbos"
 
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1605,569 +1617,361 @@ 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:1064
-msgid "Clear private data"
-msgstr "Šalinti asmeninius duomenis"
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Išsaugoti atsiųstus failus į:"
 
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Asmeniniai duomenys pažymėti šalinimui"
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Naršymas"
 
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Išvalyti duomenis"
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "Duomenys pasirinkti šalinimui"
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Įrankių juostos stilius:"
 
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Apkarpyti „referrer“ detales siunčiamas tinklapiams"
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Atverti naujus tinklapius:"
 
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Ar apkarpyti „Referer“ antraštę iki serverio adreso"
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:1146
-msgid "Always use my font choices"
-msgstr "Visada naudoti mano pasirinktus šriftus"
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Uždarymo mygtukai ant kortelių"
 
-#: ../midori/midori-websettings.c:1147
-msgid "Override fonts picked by websites with user preferences"
-msgstr "Perrašyti tinklalapių parinktus šriftus naudotojo pasirinktais"
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Atverti kortelę šalia dabartinės"
 
-#: ../midori/midori-view.c:1360
-#, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "%s nori išsaugoti HTML5 duomenų bazę."
+#: ../midori/midori-preferences.c:487
+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-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Deny"
-msgstr "_Neleisti"
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Atverti korteles antrame plane"
 
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
-msgid "_Allow"
-msgstr "_Leisti"
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Teksto redaktorius"
 
-#: ../midori/midori-view.c:1392
-#, c-format
-msgid "%s wants to know your location."
-msgstr "%s nori žinoti jūsų vietą."
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Naujienų skaityklė"
 
-#: ../midori/midori-view.c:1485
-#, c-format
-msgid "Error - %s"
-msgstr "Klaida - %s"
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Tinklas"
 
-#: ../midori/midori-view.c:1486
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Puslapio „%s“ įkelti nepavyko."
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Įgaliotasis serveris"
 
-#: ../midori/midori-view.c:1488
-msgid "Try again"
-msgstr "Bandyti dar kartą"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
-#, c-format
-msgid "Send a message to %s"
-msgstr "Siųsti laišką į %s"
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Prievadas"
 
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
-msgid "Inspect _Element"
-msgstr "Apžiūrėti _elementą"
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
 
-#: ../midori/midori-view.c:2480
-msgid "Open Link in New _Tab"
-msgstr "Atverti nuorodą naujoje _kortelėje"
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Žiniatinklio podėlis"
 
-#: ../midori/midori-view.c:2484
-msgid "Open Link in _Foreground Tab"
-msgstr "Atverti nuorodą priekinėje _kortelėje"
-
-#: ../midori/midori-view.c:2485
-msgid "Open Link in _Background Tab"
-msgstr "Atverti nuorodą fono _kortelėje"
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Didžiausias galimas podėlio dydis diske"
 
-#: ../midori/midori-view.c:2488
-msgid "Open Link in New _Window"
-msgstr "Atverti nuorodą _naujame lange"
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
 
-#: ../midori/midori-view.c:2491
-msgid "Open Link as Web A_pplication"
-msgstr "Atverti nuorodą kaip _interneto programą"
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Prisistatyti kaip"
 
-#: ../midori/midori-view.c:2496
-msgid "Copy Link de_stination"
-msgstr "Kopijuoti nuorodos pa_skirtį"
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Privatumas"
 
-#: ../midori/midori-view.c:2512
-msgid "Open _Image in New Tab"
-msgstr "Paveikslėlį atverti naujoje k_ortelėje"
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Šalinti slapukus senesnius nei:"
 
-#: ../midori/midori-view.c:2515
-msgid "Copy Image _Address"
-msgstr "_Kopijuoti paveikslėlio adresą"
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Didžiausias dienų skaičius slapukams saugoti"
 
-#: ../midori/midori-view.c:2518
-msgid "Save I_mage"
-msgstr " Išsaugoti p_aveikslėlį"
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Slapukus priimti tik iš aplankytų puslapių"
 
-#: ../midori/midori-view.c:2521
-msgid "Open in Image _Viewer"
-msgstr "Atverti _paveikslėlių žiūryklėje"
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokuoti slapukus siunčiamus trečiųjų šalių"
 
-#: ../midori/midori-view.c:2528
-msgid "Copy Video _Address"
-msgstr "Kopijuoti video _adresą"
+#: ../midori/midori-preferences.c:599
+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/midori-view.c:2531
-msgid "Save _Video"
-msgstr "Išsaugoti _video"
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Įjungti žiniatinklio programų podėlį darbui neprisijungus"
 
-#: ../midori/midori-view.c:2531
-msgid "Download _Video"
-msgstr "Parsiųsti _video"
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Įjungti HTML 5 vietinio kaupimo funkcijos palaikymą"
 
-#: ../midori/midori-view.c:2557
-msgid "Search _with"
-msgstr "Ieškoti _su"
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Apkarpyti „referrer“ detales siunčiamas tinklapiams"
 
-#: ../midori/midori-view.c:2589
-msgid "_Search the Web"
-msgstr "_Ieškoti žiniatinklyje"
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Ar apkarpyti „Referer“ antraštę iki serverio adreso"
 
-#: ../midori/midori-view.c:2606
-msgid "Open Address in New _Tab"
-msgstr "Atverti adresą naujoje _kortelėje"
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Iš žurnalo šalinti tinklapius senesnius nei:"
 
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Atverti arba parsiųsti failą"
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Didžiausias dienų skaičius tinklapiams žurnale saugoti"
 
-#: ../midori/midori-view.c:2929
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Failo tipas: „%s“"
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Plėtiniai"
 
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Failo tipas: %s („%s“)"
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Tvarkyti paieškos variklius"
 
-#: ../midori/midori-view.c:2935
-#, c-format
-msgid "File Name: %s"
-msgstr "Failo vardas: „%s“"
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Pridėti paieškos variklį"
 
-#: ../midori/midori-view.c:2955
-#, c-format
-msgid "Open %s"
-msgstr "Atverti %s"
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Taisyti paieškos variklį"
 
-#: ../midori/midori-view.c:3576
-#, c-format
-msgid "Inspect page - %s"
-msgstr "Apžiūrėti puslapį - %s"
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Pavadinimas:"
 
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "Sparčioji rinktis"
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "Ap_rašas:"
 
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "Bakstelkit nuorodai pridėti"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresas:"
 
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "Įveskit nuorodos adresą"
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "Ž_ymė:"
 
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "Įveskit nuorodos pavadinimą"
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Tvarkyti ieškykles"
 
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Ar tikrai norite pašalinti šią nuorodą?"
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Naudoti kaip _numatytą"
 
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-searchaction.c:1619
 #, 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:4166
-msgid "No history or web cookies are being saved."
-msgstr "Nėra išsaugotų slapukų ar istorijos įrašų."
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Paieškos sistemos įkelti nepavyko. %s\n"
 
-#: ../midori/midori-view.c:4167
-msgid "Extensions are disabled."
-msgstr "Plėtiniai išjungti."
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Paieškos sistemos nepavyko išsaugoti. %s"
 
-#: ../midori/midori-view.c:4168
-msgid "HTML5 storage, local database and application caches are disabled."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
 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-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Ieškoti %s"
 
-#: ../midori/midori-view.c:4171
-msgid "DNS prefetching is disabled."
-msgstr "DNS išankstinis gavimas išjungtas."
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/midori-view.c:4172
-msgid "The language and timezone are not revealed to websites."
-msgstr "Tinklalapiams kalba ir laiko zona neatskleidžiama."
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Ieškoti su…"
 
-#: ../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-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Ieškoti su %s"
 
-#: ../midori/midori-view.c:4222
-msgid "Version numbers in brackets show the version used at runtime."
-msgstr "Versijų numeriai skliaustuose rodo naudojamas versijas."
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Atverti su"
 
-#: ../midori/midori-view.c:4278
-msgid "Page loading delayed"
-msgstr "Puslapio įkrovimas uždelstas"
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Pasirinkite programą ar komandą „%s“ atvėrimui:"
 
-#: ../midori/midori-view.c:4279
-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ų."
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Nepavyksta paleisti išorinės programos."
 
-#: ../midori/midori-view.c:4280
-msgid "Load Page"
-msgstr "Įkrauti puslapį"
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
 
-#: ../midori/midori-view.c:4446
-msgid "Blank page"
-msgstr "Išvalyti puslapį"
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Paieška tinklapyje:"
 
-#: ../midori/midori-view.c:4708
-msgid "_Duplicate Tab"
-msgstr "_Dubliuoti kortelę"
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Ankstesnis"
 
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Label"
-msgstr "Rodyti kortelės _antraštę"
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Kitas"
 
-#: ../midori/midori-view.c:4713
-msgid "Show Tab _Icon Only"
-msgstr "Rodyti tik kortelės _piktogramą"
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Skirti dydį"
 
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Užverti _kitas korteles"
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Užverti paieškos juostą"
 
-#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
-msgid "previous"
-msgstr "ankstesnis"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
-msgid "next"
-msgstr "sekantis"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:5564
-msgid "Print background images"
-msgstr "Spausdinti fono paveikslėlius"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
 
-#: ../midori/midori-view.c:5565
-msgid "Whether background images should be printed"
-msgstr "Ar spausdinti fono piešinius"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../midori/midori-view.c:5597
-msgid "Features"
-msgstr "Galimybės"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Paleistis"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Naudoti _dabartinį puslapį"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Naudoti dabartinį tinklapį kaip pradžios"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Šriftai"
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
 
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Įvairiaplotė garnitūra"
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Taisyti pažymėtą adresyno įrašą"
 
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "Numatytoji tekstui atvaizduoti naudojama šriftų šeima"
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Pašalinti pažymėta adresyno įrašą"
 
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "Numatytasis tekstui atvaizduoti naudojamas šriftas"
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Pridėti naują aplanką"
 
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Lygiaplotė garnitūra"
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Skirtukas</i>"
 
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "Numatytoji tekstui atvaizduoti naudojama lygiapločių šriftų šeima"
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Atidaryti naujoje _kortelėje"
 
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
 msgstr ""
-"Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto lygiapločio šrifto "
-"dydis"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Mažiausias galimas šrifto dydis"
 
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Mažiausias leistinas tekstui atvaizduoti naudojamo šrifto dydis"
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Žurnalas"
 
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Elgsena"
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Šiandien"
 
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Leisti iškylančius langus"
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Vakar"
 
-#: ../midori/midori-preferences.c:386
-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
-msgid "Browsing"
-msgstr "Naršymas"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Tinklas"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Pagrindinio kompiuterio vardas"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Pridėti paieškos variklį"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Taisyti paieškos variklį"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Pavadinimas:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "Ap_rašas:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "Pikto_grama:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "Ž_ymė:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Tvarkyti ieškykles"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Naudoti kaip _numatytą"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Atverti su"
-
-#: ../midori/sokoke.c:362
-#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Pasirinkite programą ar komandą „%s“ atvėrimui:"
-
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Nepavyksta paleisti išorinės programos."
-
-#: ../midori/sokoke.c:1595
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d valanda"
-msgstr[1] "%d valandos"
-msgstr[2] "%d valandų"
-
-#: ../midori/sokoke.c:1596
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutė"
-msgstr[1] "%d minutės"
-msgstr[2] "%d minučių"
-
-#: ../midori/sokoke.c:1597
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekundė"
-msgstr[1] "%d sekundės"
-msgstr[2] "%d sekundžių"
-
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s iš %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
-#, c-format
-msgid " - %s remaining"
-msgstr " - %s liko"
-
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "_Paieška tinklapyje:"
-
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Ankstesnis"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Kitas"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Skirti dydį"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Paryškinti surastus"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Užverti paieškos juostą"
-
-#: ../toolbars/midori-transferbar.c:122
-#, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Failas „<b>%s</b>“ parsiųstas."
-
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Siuntimas baigtas"
-
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "Parsiųstas failas yra klaidingas."
-
-#: ../toolbars/midori-transferbar.c:194
-msgid ""
-"The checksum provided with the link did not match. This means the file is "
-"probably incomplete or was modified afterwards."
-msgstr ""
-"Kontrolinė suma kurią suteikė nuoroda nesutampa. Tai reiškia jog failas "
-"nepilnas arba buvo pakeistas po to."
-
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "Išvalyti visus"
-
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
-msgid "Some files are being downloaded"
-msgstr "Kai kurie failai parsiunčiami"
-
-#: ../toolbars/midori-transferbar.c:377
-msgid "_Quit Midori"
-msgstr "_Baigti darbą su Midori"
-
-#: ../toolbars/midori-transferbar.c:379
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Visi siuntimai nutrūks jei baigsit darbą su Midori."
-
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Adresynas"
-
-#: ../panels/midori-bookmarks.c:257
-#, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Nepavyko pridėti adresynan: %s\n"
-
-#: ../panels/midori-bookmarks.c:435
-msgid "Edit the selected bookmark"
-msgstr "Taisyti pažymėtą adresyno įrašą"
-
-#: ../panels/midori-bookmarks.c:443
-msgid "Delete the selected bookmark"
-msgstr "Pašalinti pažymėta adresyno įrašą"
-
-#: ../panels/midori-bookmarks.c:458
-msgid "Add a new folder"
-msgstr "Pridėti naują aplanką"
-
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
-msgid "<i>Separator</i>"
-msgstr "<i>Skirtukas</i>"
-
-#: ../panels/midori-history.c:111
-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:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2175,37 +1979,35 @@ 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Prieš savaitę"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nepavyko pašalinti žurnalo įrašo: %s\n"
+
+#: ../panels/midori-history.c:312
 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:358
 msgid "Bookmark the selected history item"
 msgstr "Įtraukti į adresyną pažymėtą žurnalo įrašą"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Ištrinti pažymėtą žurnalo įrašą"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Pašalinti žurnalo įrašus"
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
-msgstr "Siuntimai"
-
-#: ../panels/midori-transfers.c:469
-msgid "Open Destination _Folder"
-msgstr "Atverti paskirties _aplanką"
-
-#: ../panels/midori-transfers.c:472
-msgid "Copy Link Loc_ation"
-msgstr "Kopijuoti saito _adresą"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2231,187 +2033,148 @@ msgstr "Slaptažodis"
 msgid "_Remember password"
 msgstr "P_risiminti slaptažodį"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Pavadintos piktogramos „%s“ įkelti nepavyko"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Piktogramos „%s“ įkelti nepavyko"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Animuoti kadrai sugadinti"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Joks"
 
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Savybė „%s“ netinka %s"
 
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Pasirinkite failą"
 
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Pasirinkite aplanką"
 
-#: ../katze/katze-utils.c:610
-msgid "None"
-msgstr "Joks"
-
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 valanda"
 
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 diena"
 
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 savaitė"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mėnuo"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 metai"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s nustatymai"
 
-#: ../extensions/adblock.c:473
-msgid "Configure Advertisement filters"
-msgstr "Konfigūruoti reklamų filtrus"
-
-#: ../extensions/adblock.c:504
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
 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
-msgid "Edit rule"
-msgstr "Keisti taisyklę"
-
-#: ../extensions/adblock.c:896
-msgid "_Rule:"
-msgstr "_Taisyklė:"
-
-#: ../extensions/adblock.c:950
-msgid "Bl_ock image"
-msgstr "B_lokuoti paveikslėlį"
 
-#: ../extensions/adblock.c:955
-msgid "Bl_ock link"
-msgstr "_Blokuoti nuorodą"
-
-#: ../extensions/adblock.c:1670
-msgid "Advertisement blocker"
-msgstr "Reklamų blokavimas"
-
-#: ../extensions/adblock.c:1671
-msgid "Block advertisements according to a filter list"
-msgstr "Blokuoti reklamas remiantis filtrų sąrašu"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
 
 #. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "Šis puslapis turėtų turėti naudotojo scenarijų. Ar norite įdiegti jį?"
-
 #: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Šis puslapis turėtų turėti naudotojo scenarijų. Ar norite įdiegti jį?"
+
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "Įdiegti naudotojo _scenarijų"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr "Šis puslapis turėtų turėti naudotojo stilių. Ar norite įdiegti jį?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Įdiegti naudotojo stilių"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Nediegti"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Naudotojo scenarijai"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Naudotojo stiliai"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Klaida"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Ar norite ištrinti „%s“?"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Ištrinti naudotojo scenarijų"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Ištrinti naudotojo stilių"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Failas <b>%s</b> bus ištrintas visam laikui."
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Atverti teksto redaktoriuje"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Atverti paskirties aplankką"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Pridėti naują papildinį"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Pašalinti pasirinktą papildinį"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Naudotojo papildiniai"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Negaliu stebėti aplanko „%s“: %s"
 
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Naudotojo stilių ir naudotojo scenarijų palaikymas"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Spalvotos kortelės"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Kiekvienos kortelės atspalvį keisti aiškiai"
 
@@ -2420,11 +2183,11 @@ msgstr "Kiekvienos kortelės atspalvį keisti aiškiai"
 msgid "Cookie Manager"
 msgstr "Slapukų tvarkytuvė"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Ištrinti viską"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2432,31 +2195,31 @@ 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:116
 msgid "Expand All"
 msgstr "Išskleisti viską"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Suskleisti viską"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Klausimas"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Bus ištrinti tik tie slapukai kurie atitiks filtrą."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Seanso pabaigoje"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2473,15 +2236,16 @@ msgstr ""
 "<b>Saugus</b>: %s\n"
 "<b>Galioja iki</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Taip"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ne"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2490,378 +2254,1229 @@ msgstr ""
 "<b>Domenas</b>: %s\n"
 "<b>Slapukai</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Išskleisti visus"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Suskleisti visus"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-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:1128
+msgid "Search Cookies by Name or Domain"
 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"
 
-#: ../extensions/copy-tabs.c:38
+#: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
 msgstr "Kopijuoti kortelių _adresus"
 
-#: ../extensions/copy-tabs.c:95
+#: ../extensions/copy-tabs.c:96
 msgid "Copy Addresses of Tabs"
 msgstr "Kopijuoti kortelių adresus"
 
-#: ../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ę"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "XML duomenyse nepavyko rasti Atom „entry“ elementų."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "XML duomenyse nepavyko rasti Atom „feed“ elementų."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:387
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Paskutinis atnaujinimas: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:653
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Kanalai"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Pridėti naują kanalą"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Ištrinti kanalą"
 
-#: ../extensions/feed-panel/feed-panel.c:795
-msgid "_Feeds"
-msgstr "_Kanalai"
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Kanalai"
+
+#: ../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."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Kanalo formatas nepalaikomas."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Nepavyko apdoroti XML kanalo: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "RSS XML duomenų „channel“ elementas nerastas."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Rasta nepalaikoma RSS versija."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Nepavyko rasti reikiamo RSS „item“ XML duomenų elemento."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Nepavyko rasti reikiamo RSS „channel“ XML duomenų elemento."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Kanalas „%s“ jau yra"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Klaida įkraunant kanalą „%s“"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Kanalų skydelis"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Skaityti Atom/RSS kanalus"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Nepavyko pridėti formos reikšmės: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Formų istorija"
+
+#: ../extensions/formhistory/formhistory.c:117
+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:289
+msgid "Remember password on this page?"
+msgstr "Šiame puslapyje prisiminti slaptažodį?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Prisiminti"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ne dabar"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Šiame puslapyje niekada"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Perjungti formų istorijos būseną"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Aktyvuoti ar deaktyvuoti formų istoriją dabartinei kortelei."
+
+#: ../extensions/formhistory/formhistory.c:598
+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:655
+msgid "Form history filler"
+msgstr "Formų istorijos pildytojas"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Saugo įvestų duomenų istoriją"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Nepavyko pasirinkti pasiūlymų\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "Nėra neaplankytų kortelių"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Istorijos sąrašas"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Kortelės užvėrimo elgsena"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Nieko nedaryti"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Persijungti į paskutinę žiūrėtą kortelę"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Persijungti į naujausią kortelę"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Blykstelti langą atvėrus kortelę fone"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Sekanti nauja kortelė iš istorijos (Istorijos sąrašas)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Sekanti nauja kortelė iš istorijos"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Ankstesnė nauja kortelė iš istorijos (Istorijos sąrašas)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Ankstesnė nauja kortelė iš istorijos"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Kortelę rodyti fone (Istorijos sąrašas)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Rodyti dabartinę pasirinktą kortelę fone"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "Istorijos sąrašas"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"Perjungiant ar užveriant korteles, perkelti į paskutinę naudotą kortelę"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Pelės gestai"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Valdykite Midori stumdami pelę"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Puslapį įkelti iš naujo arba sustabdyti įkėlimą"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Derinti klaviatūros susiejimus"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Derinti _susiejimus…"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Susiejimai"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Rodyti ir keisti klaviatūros susiejimus"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Būsenos juostos laikrodis"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Būsenos juostoje rodyti datą ir laiką"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Paveikslėliai"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Scenarijai"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape papildiniai"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Naudoti „Netscape” įskiepius"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Būsenos juostos galimybės"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Interneto puslapiuose lengvai įjunkite ar išjunkite galimybes"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Kortelių skydelis"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "_Kortelių skydelis"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Korteles rodo vertikaliame skydelyje"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Pagal nutylėjimą ant kortelių tik piktogramos"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Pagal nutylėjimą kortelės neturi etikečių"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Įrankių juostos derinimas"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Pasirinkite kurie elementai bus rodomi įrankių juostoje. Elementai gali būti "
+"sukeisti vietomis tiesiog juos velkant."
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Prieinami elementai"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Rodomi elementai"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Įrankinės redaktorius"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Lengvai pakeiskite įrankinės išdėstymą"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Pašalinti asmeninius duomenis"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "Šalinti _asmeninius duomenis"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Šalinti šiuos duomenis:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Paskutinės atvertos _kortelės"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Šalinti asmeninius duomenis _uždarant Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Išsaugoti vardai ir sla_ptažodžiai"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Slapukai ir tinklalapių duomenys"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Svetainės piktogramos"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Nepavyko ištrinti žurnalo įrašų: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Nepavyko pašalinti senų žurnalo įrašų: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Nepavyko pridėti adresynan: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Šakninis sertifikatas neprieinamas. SSL sertifikatai negali būti patikrinti."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Konfigūracijos nepavyko išsaugoti. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Šiukšlinės nepavyko išsaugoti. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Keisti _nustatymus"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Išjungti _visus plėtinius"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Rodyti dialogo langą po „Midori” strigties"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Naikinti ankstesnes korteles"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Midori egzempliorius jau veikia, tačiau neatsako.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Adresyno nepavyksta įkelti: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sesija negali būti įkelta: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Šiukšlinės įkelti nepavyko: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Žurnalo įkelti nepavyko: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Įvyko šios klaidos:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Nepaisyti"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+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."
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
-msgid "Unsupported feed format."
-msgstr "Kanalo formatas nepalaikomas."
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:265
-#, c-format
-msgid "Failed to parse XML feed: %s"
-msgstr "Nepavyko apdoroti XML kanalo: %s"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+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."
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:51
-msgid "Unsupported RSS version found."
-msgstr "Rasta nepalaikoma RSS versija."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+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."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+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."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
-msgid "Feed '%s' already exists"
-msgstr "Kanalas „%s“ jau yra"
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
-msgid "Error loading feed '%s'"
-msgstr "Klaida įkraunant kanalą „%s“"
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#: ../extensions/feed-panel/main.c:518
-msgid "Feed Panel"
-msgstr "Kanalų skydelis"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#: ../extensions/feed-panel/main.c:519
-msgid "Read Atom/ RSS feeds"
-msgstr "Skaityti Atom/RSS kanalus"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:39
-#, c-format
-msgid "Failed to add form value: %s\n"
-msgstr "Nepavyko pridėti formos reikšmės: %s\n"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:95
-msgid "Form history"
-msgstr "Formų istorija"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:112
-msgid ""
-"Master password required\n"
-"to open password database"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
 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/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:299
-msgid "Remember"
-msgstr "Prisiminti"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:300
-msgid "Not now"
-msgstr "Ne dabar"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:301
-msgid "Never for this page"
-msgstr "Šiame puslapyje niekada"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:437
-msgid "Toggle form history state"
-msgstr "Perjungti formų istorijos būseną"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:438
-msgid "Activate or deactivate form history for the current tab."
-msgstr "Aktyvuoti ar deaktyvuoti formų istoriją dabartinei kortelei."
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
+#: ../extensions/apps.vala:46
 #, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Nepavyko įvykdyti duomenų bazės sakinio: %s\n"
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:629
-msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
 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/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory.c:669
-msgid "Stores history of entered form data"
-msgstr "Saugo įvestų duomenų istoriją"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
-#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#: ../extensions/apps.vala:146
 #, c-format
-msgid "Failed to select suggestions\n"
-msgstr "Nepavyko pasirinkti pasiūlymų\n"
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#: ../extensions/history-list.vala:197
-msgid "There are no unvisited tabs"
-msgstr "Nėra neaplankytų kortelių"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#: ../extensions/history-list.vala:235
-#, c-format
-msgid "History-List"
-msgstr "Istorijos sąrašas"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
 
-#: ../extensions/history-list.vala:275
-msgid "Tab closing behavior"
-msgstr "Kortelės užvėrimo elgsena"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#: ../extensions/history-list.vala:283
-msgid "Do nothing"
-msgstr "Nieko nedaryti"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#: ../extensions/history-list.vala:289
-msgid "Switch to last viewed tab"
-msgstr "Persijungti į paskutinę žiūrėtą kortelę"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#: ../extensions/history-list.vala:295
-msgid "Switch to newest tab"
-msgstr "Persijungti į naujausią kortelę"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#: ../extensions/history-list.vala:423
-msgid "Next new Tab (History List)"
-msgstr "Sekanti nauja kortelė iš istorijos (Istorijos sąrašas)"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#: ../extensions/history-list.vala:424
-msgid "Next new tab from history"
-msgstr "Sekanti nauja kortelė iš istorijos"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Sukurti _leistuką"
 
-#: ../extensions/history-list.vala:433
-msgid "Previous new Tab (History List)"
-msgstr "Ankstesnė nauja kortelė iš istorijos (Istorijos sąrašas)"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#: ../extensions/history-list.vala:434
-msgid "Previous new tab from history"
-msgstr "Ankstesnė nauja kortelė iš istorijos"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#: ../extensions/history-list.vala:443
-msgid "Display tab in background (History List)"
-msgstr "Kortelę rodyti fone (Istorijos sąrašas)"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Siuntimai"
 
-#: ../extensions/history-list.vala:444
-msgid "Display the current selected tab in background"
-msgstr "Rodyti dabartinę pasirinktą kortelę fone"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Išvalyti visus"
 
-#: ../extensions/history-list.vala:569
-msgid "History List"
-msgstr "Istorijos sąrašas"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#: ../extensions/history-list.vala:570
-msgid "Move to the last used tab when switching or closing tabs"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Atverti paskirties _aplanką"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopijuoti saito _adresą"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Failas „<b>%s</b>“ parsiųstas."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
 msgstr ""
-"Perjungiant ar užveriant korteles, perkelti į paskutinę naudotą kortelę"
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
-msgstr "Pelės gestai"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Siuntimas baigtas"
 
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
-msgstr "Valdykite Midori stumdami pelę"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Kai kurie failai parsiunčiami"
 
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "Perkrauti puslapį arba sustabdyti krovimą"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Baigti darbą su Midori"
 
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
-msgstr "Derinti klaviatūros susiejimus"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Visi siuntimai nutrūks jei baigsit darbą su Midori."
 
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts…"
-msgstr "Derinti _susiejimus…"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
-msgstr "Susiejimai"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "Rodyti ir keisti klaviatūros susiejimus"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
-msgstr "Būsenos juostos laikrodis"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
-msgstr "Būsenos juostoje rodyti datą ir laiką"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:131
-msgid "Images"
-msgstr "Paveikslėliai"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:140
-msgid "Scripts"
-msgstr "Scenarijai"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:151
-msgid "Netscape plugins"
-msgstr "Netscape papildiniai"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:199
-msgid "Statusbar Features"
-msgstr "Būsenos juostos galimybės"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:200
-msgid "Easily toggle features on web pages on and off"
-msgstr "Interneto puslapiuose lengvai įjunkite ar išjunkite galimybes"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
-msgid "Tab Panel"
-msgstr "Kortelių skydelis"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#: ../extensions/tab-panel.c:663
-msgid "T_ab Panel"
-msgstr "_Kortelių skydelis"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#: ../extensions/tab-panel.c:681
-msgid "Show tabs in a vertical panel"
-msgstr "Korteles rodo vertikaliame skydelyje"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "Pagal nutylėjimą ant kortelių tik piktogramos"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "Pagal nutylėjimą kortelės neturi etikečių"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:393
-msgid "Customize Toolbar"
-msgstr "Įrankių juostos derinimas"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:409
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/notes.vala:153
+msgid "New note"
 msgstr ""
-"Pasirinkite kurie elementai bus rodomi įrankių juostoje. Elementai gali būti "
-"sukeisti vietomis tiesiog juos velkant."
 
-#: ../extensions/toolbar-editor.c:425
-msgid "Available Items"
-msgstr "Prieinami elementai"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:446
-msgid "Displayed Items"
-msgstr "Rodomi elementai"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar…"
-msgstr "Įrankių juostos _derinimas"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize…"
-msgstr "_Derinti…"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:627
-msgid "Toolbar Editor"
-msgstr "Įrankinės redaktorius"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:628
-msgid "Easily edit the toolbar layout"
-msgstr "Lengvai pakeiskite įrankinės išdėstymą"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklamų blokavimas"
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Podėlio HTTP bendravimas su disku"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokuoti reklamas remiantis filtrų sąrašu"
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Nurodytos konfigūracijos aplankas yra netinkamas."
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfigūruoti reklamų filtrus"
 
-#~ msgid "Cookies"
-#~ msgstr "Slapukai"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "B_lokuoti paveikslėlį"
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "„Flash” Slapukai"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Blokuoti nuorodą"
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 _duomenų bazės"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Keisti taisyklę"
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "Atsijungusių programų podėlis"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Taisyklė:"
diff --git a/po/lv.po b/po/lv.po
new file mode 100644 (file)
index 0000000..be0d04e
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,3428 @@
+# Latvian translation for midori
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-23 23:24+0000\n"
+"Last-Translator: ERX <eriksh@inbox.lv>\n"
+"Language-Team: Latvian <lv@li.org>\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 != 0 ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2014-12-24 05:53+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Tīmekļa pārlūks"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori tīmekļa pārlūks"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Pārlūkot tīmekli"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internets;WWW;Pārlūks"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Jauna cilne"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Jauns logs"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Jauns, Privāts Pārlūka Logs"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Privātā pārlūkošana"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privātā pārlūkošana"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Atvērt jaunu Privātā pārlūkošana logu"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Momentuzņēmums saglabāts:%s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Izpildīt ADRESI web aplikāciju"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRESE"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Litot MAPI kā iestatījumu mapi"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "MAPE"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Privāta pārlūkošana, bez izmaiņām un saglabāšanas"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Parādīt diagnostikas dialogu"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Palaist norādīto faila nosaukumu kā javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Izpildīt norādīto komandu"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Rādīt programmas versiju"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adreses"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PARAUGS"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Grāmatzīmes"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Vēsture"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Lietotājaskripts"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Lietotāja_motīvs"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Jauna _cilne"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Aizvērtā Cilne"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Jauns _logs"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Jauna _mape"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Addresses]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Fails nav atrasts"
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Uz priekšu, uz nākamo lapu"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Web meklēšana"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Pārlādēt tekošo lapu"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Beig tekošās lapas ielādi"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Neparedzēta darbība '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Labot Mapi"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Jauna Grāmatzīme"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Labot Grāmatzīmi"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Ierakstiet grāmatzīmes nosaukumu, un izvēlieties kur to saglabāt."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Ierakstiet mapes nosaukumu, un izvēlieties kur to saglabāt."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Rādīt Grāmatzīmju_Panelī"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Saglabāt failukā"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Kļūda atverot attelu"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Nav iespējams atvērt attelu noklusējuma programā"
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Kļūda lejuplādējot attēlu"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Nevar lejuplādēt izvēlēto attelu"
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Saglabāt failu"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Atvērt failu"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Pievienot jaunu grāmatzīmi"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Tukšs"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Atvērt visu_cilnēs"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Atvērt Jaunā_Logā"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Importēt grāmatzīmes"
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Importēt grāmatzīmes"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Lietojumprogramma:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Importēt no XBEL vai HTML fila"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Importēt no fila"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Kļūda importējot grāmatzīmes"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL Grāmatzīmes"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Netscape grāmatzīmes"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr "Midori var exportēt tikai XBEL (*.xbel) un Netscape (*.html)"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Kļūda eksportējot grāmatzīmes"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Viegls interneta pārlūks."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Arvis Lācis https://launchpad.net/~arvis-lacis\n"
+"  ERX https://launchpad.net/~eriksh\n"
+"  Jānis Marks Gailis https://launchpad.net/~jeanmarc-gailis\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dublēt Cilni"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Fails"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Atvērt jaunu logu"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Atvērt jaunu cilni"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Jauns P_rivāts Pārlūka Logs"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Atvērt failu"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Saglabāt Lapu Kā..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Saglabāt failā"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Aizvērt cilni"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Aizvērt aktīvo cilni"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "Aizvērt _logu"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Drukāt aktīvo lapu"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Aizvērt visus_Logus"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Rediģēt"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Meklēt…"
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Meklēt vārdu vai frāzi lapā"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Meklēt _nākamo"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Meklēt _iepriekšējo"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Konfigurēt aplikācijas iestatījumus"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Skatīt"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Rīkjoslas"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "Kodējumi"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Skatīt saturu"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Pa_Kreisi"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Uz_Leju"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Uz_Augšu"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Pa_Labi"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Doties"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Doties uz iepriekšējo lapu"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Nākošais vai Tālāk"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Mājas lapa"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Doties uz mājas lapu"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Iztukšot Miskasti"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Pievienot jaunu _mapi"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importēt grāmatzīmes..."
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Eksportēt grāmatzīmes"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Iestatīt Meklētājus..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Tīrīt Privāto Informāciju"
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Iepriekšējā Cilne"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Nākamā cilne"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/ml.po b/po/ml.po
new file mode 100644 (file)
index 0000000..4960b4a
--- /dev/null
+++ b/po/ml.po
@@ -0,0 +1,3427 @@
+# Malayalam translation for midori
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:45+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Malayalam <ml@li.org>\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-Launchpad-Export-Date: 2014-11-27 05:47+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "മിഡോരി"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "വെബ് ബ്രൗസര്‍"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "മിഡോരി വെബ് ബ്രൗസര്‍"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "വെബില്‍  തിരയുക"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "പുതിയ ടാബ്"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "പുതിയ ജാലകം"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "വിലാസം"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "പ്രോഗ്രാം പതിപ്പ് കാണിക്കുക"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "വിലാസങ്ങള്‍"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "രീതി"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "അപരിചിതമായ ഒരു പിശക് ഉണ്ടായിരിക്കുന്നു"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_സൂചിതസ്ഥാനങ്ങള്‍"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_ചേര്‍പ്പുകള്‍"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_ചരിത്രം"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "പുതിയ _ടാബ്"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "പുതിയ _ജാലകം"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "പുതിയ _അറ"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  ST Alfas https://launchpad.net/~alfasst\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  jithin https://launchpad.net/~jithinkumarkp"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
new file mode 100644 (file)
index 0000000..497569c
--- /dev/null
+++ b/po/ms.po
@@ -0,0 +1,3512 @@
+# Malay translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-04-05 23:04+0000\n"
+"Last-Translator: abuyop <Unknown>\n"
+"Language-Team: Malay <ms@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:02+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Pelayar Sesawang"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Pelayar Sesawang Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Layari Sesawang"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Tab Baru"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Tetingkap Baru"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Tetingkap Pelayaran Peribadi Baru"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Pelayaran Peribadi Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Pelayaran Peribadi"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Buka tetingkap pelayaran peribadi baru"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Petikan disimpan ke: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Jalan ADDRESS sebagai aplikasi sesawang"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ALAMAT"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Guna FOLDER sebagai folder konfigurasi"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Pelayaran peribadi, tiada perubahan disimpan"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Mod mudah alih, semua fail masa jalan disimpan dalam satu tempat"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Tetingkap GTK+ biasa dengan WebKit, serupa dengan GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Papar dialog diagnostik"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Jalankan didalam gdb dan simpan surih balik bila rosak"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Jalankan nama fail yang dinyatakan sebagai skrip java"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Ambil petikan URI yang dinyatakan"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Lakukan perintah yang dinyatakan"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Senarai perintah tersedia untuk dilakukan dengan -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Papar versi program"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Alamat"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Sekat URI berdasarkan ungkapan nalar PATTERN"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "CORAK"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Tetap semula Midori selepas SECONDS saat ketidakaktifan"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SAAT"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Ralat: \"gdb\" tidak ditemui\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Sila laporkan ulasan, cadangan dan pepijat kepada:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Semak versi baru di:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Ralat yang tidak diketahui muncul"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Tanda Buku"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Tambah Tan_da Buku"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "Sam_bungan"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "Sejara_h"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Skrip Pengg_una"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Gaya pengguna"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "_Tab Baru"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "Pemin_dahan"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Pema_lam Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "Tab Tert_utup"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Tetingkap Baru"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_Folder Baru"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Alamat]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Fail tidak ditemui."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Dokumen cacat."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Format tanda buku tidak dikenali."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+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:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Maju ke sub-halaman berikutnya"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Gelintar Sesawang..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Muat semula halaman semasa"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Henti memuatkan halaman semasa"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Gagal mengemaskini tajuk: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Nilai '%s' tidak sah untuk %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Tetapan '%s' tidak dijangka"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Tindakan '%s' tidak dijangka."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Pelayaran Peribadi)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Gagal menyisip item sejarah baru: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Pilih [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Tanda Buku"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Folder Baru"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Sunting Folder"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Tanda Buku Baru"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Sunting Tanda Buku"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Taip nama tanda buku ini, dan pilih lokasi menyimpannya."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Taip nama folder ini, dan pilih lokasi menyimpannya."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Papar dalam Pa_lang Tanda Buku"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Tambah ke Dail Pa_ntas"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Simpan fail sebagai"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Simpan sumbe_r berkaitan"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Satu tetingkap baru telah dibuka"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Satu tab baru telah dibuka"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Ralat membuka imej!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Tidak dapat buka imej terpilih dalam pelihat lalai."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Ralat memuat turun imej!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Tidak dapat muat turun imej terpilih."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Simpan fail"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Muat semula halaman tanpa cache"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Buka fail"
+
+#: ../midori/midori-browser.c:2692
+msgid ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+msgstr ""
+"Untuk guna URI diatas, buka aggregator berita. Umumnya terdapat menu atau "
+"butang \"Langganan Baru, \"Suapan Berita Baru\" atau yang seangkatan "
+"dengannya. Cara lain, pergi ke keutamaan, Aplikasi dalam Midori, kemudian "
+"pilih Aggregator Berita. Dilain masa, bila anda klik ikon suapan berita, ia "
+"akan ditambah secara automatik."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Suapan baru"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Tambah tanda buku baru"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Kosong"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Togol navigasi kursor teks"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Menekan F7 akan menogol Pelayaran Karet. Bila aktif, kursor teks akan muncuk "
+"dalam semua laman sesawang."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "B_enarkan Pelayaran Karet"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Buka semua dalam _Tab"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Buka dalam _Tetingkap Baru"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Import tanda buku..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Import tanda buku"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Aplikasi:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Import dari fail XBEL atau HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Import dari fail"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Gagal mengimport tanda buku"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "Tanda Buku XBEL"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Tanda Buku Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr "Midori hanya boleh eksport ke XBEL (*.xbel) dan Netscape (*.html)"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Gagal mengeksport tanda buku"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Merupakan pelayar sesawang yang ringan dan pantas."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Rujuk about:version mengenai maklumat versi."
+
+#: ../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 perisian bebas; anda boleh edar ia semula dan/atau "
+"ubahsuai ia dibawah terma Lesen Awam Am GNU sepertimana yang diterbitkan "
+"oleh Yayasan Perisian Bebas; sama ada versi 2.1 daripada lesen atau (ikut "
+"pilihan anda) mana-mana versi terkemudian."
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  abuyop https://launchpad.net/~abuyop"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duakan Tab Semasa"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Fail"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Buka tetingkap baru"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Buka tab baru"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Tetingkap Pelayaran P_eribadi Baru"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Buka fail"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Simpan Halaman Sebagai..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Simpan ke fail"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Tambah ke _dail Pantas"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Langgan ke s_uapan Berita"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "T_utup Tab"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Tutup tab semasa"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "T_utup Tetingkap"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Cetak halaman semasa"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Tutup se_mua Tetingkap"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Sunting"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Cari..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Cari perkataan atau frasa pada laman"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Cari _Berikutnya"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Cari _Terdahulu"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Konfigur keutamaan aplikasi"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Lihat"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "Palang Ala_t"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Tingkatkan aras zum"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Kurangkan aras zum"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Pengekodan"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Lihat S_umber"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Lihat Sumber _DOM"
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Pelayaran Ka_ret"
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Togol paparan skrin penuh"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Tatal K_iri"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Tatal _Bawah"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Tatal _Atas"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Tatal Ka_nan"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "Boleh _Dibaca"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "Per_gi"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Undur ke halaman terdahulu"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Undur ke sub-halaman terdahulu"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Berikutnya atau Maju"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+"Pergi ke sub-halaman berikutnya atau halaman berikutnya dalam sejarah"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Laman Sesawang"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Pergi ke laman sesawang anda"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Kosongkan Tong Sampah"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Buat Asal _Tutup Tab"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Tambah _folder baru"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Import tanda buku..."
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Eksport tanda buku..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Urus Enjin Gelintar..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Kosongkan Data Peribadi..."
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "_Periksa Halaman"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "Tab _Terdahulu"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "Tab _Berikutnya"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Alih Tab ke kedudukan pe_rtama"
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "Alih Tab Mengu_ndur"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "A_lih Tab Keha_dapan"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Alih Tab ke kedudukan _terakhir"
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "Fokus Tab Se_masa"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Fokus paparan B_erikutnya"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "Hanya papar Ikon Tab Se_masa"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Tutup Tab _Lain"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "Buka _sesi terakhir"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Bantuan"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "Soalan Ke_rap Ditanya"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "Lap_or Masalah..."
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Alatan"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Palang Alat"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "Palang _navigasi"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "_Panel sisi"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Panel sisi"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "Palang _tanda buku"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "Palang _status"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automatik"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Cina Tradisional (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Cina Dipermudah (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Jepun (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Korean (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Rusia (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unikod (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Barat (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Suai..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Gagal awalkan sejarah: %s"
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "Pem_isah"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Lokasi..."
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Buka lokasi tertentu"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "Gelintar Sesa_wang..."
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Jalankan gelintar sesawang"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Buka semula tab atau tetingkap yang ditutup sebelum ini"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Papar tanda buku tersimpan"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Tab"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Papar senarai semua tab dibuka"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Menu"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Menu"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr "Konfigurasi bagi sambungan '%s' tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Konfigurasi bagi sambungan '%s' tidak dapat disimpan: %s\n"
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "Eskport sijil"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Autoriti sijil menandatangani tidak diketahui."
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Sijil tidak sepadan dengan identiti dijangka bagi laman yang mana ia "
+"diperolehi."
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Masa pengaktifan sijil melangkau tarikh semasa."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Sijil telah tamat tempoh"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Sijil telah ditarik balik berdasarkan senarai penarikan sijil GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algortima sijil dianggap tidak selamat."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Beberapa ralat lain berlaku mengesahkan sijil."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Eksport sijil"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Ditandatangan-kendiri"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Perincian keselamatan"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr "Tampal dan te_ruskan"
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Tidak disahkan"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Sambungan yang disah dan disulitkan"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Sambungan terbuka dan tidak disulitkan"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Jajar panel sisi ke sebelah kanan"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Tutu panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Jajar panel sisi ke sebelah kiri"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Papar Dail Pantas"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Papar Laman Utama"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Papar tab terakhir dibuka"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Papar tab terakhir tanpa dimuatkan"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Papar Halaman Kosong"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Papar Enjin Gelintar lalai"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Papar halaman suai"
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Jepun (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Tab baru"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Tetingkap baru"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Tab semasa"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Lalai"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikon"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Ikon kecil"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Teks"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Ikon dan teks"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Teks di sebelah ikon"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatik (GNOME atau persekitaran)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "Pelayan proksi HTTP"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "Tiada pelayan proksi"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Merupakan gaya bagi palang alat"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Sentiasa guna fon pilihan saya"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+"Batalkan fon yang dipilih oleh laman sesawang dengan keutamaan pengguna"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Konfigurasi tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Nilai konfigurasi '%s' tidak sah"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Gagal menyuntik lembaran gaya: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Papar _Label Tab"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Papar _Ikon Tab Sahaja"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Tutup Tab ke K_anan"
+msgstr[1] "Tutup Tab ke K_anan"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Tutup Tab _Lain"
+msgstr[1] "Tutup Tab _Lain"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Percayai laman sesawang ini"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Keselamat tidak diketahui"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s hendak simpan pangkalan data HTML5."
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Nafikan"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Benar"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s mahu mengetahui lokasi anda."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' tidak ditemui"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Halaman '%s' tidak boleh dimuatkan:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Periksa alamat jika ada kesalahan taip"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "Pastikan kabel ethernet dipalamkan atau kad tanpa wayar diaktifkan"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Sahkan sama ada tetapan rangkaian anda adalah betul"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Cuba Lagi"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Oops - %s"
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Ada masalah dengan '%s'."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Cuba lagi"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Hantar mesej ke %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Tambah enjin _gelintar..."
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Buka _Pautan"
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Buka Pautan di _Tab Baru"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Buka Pautan dalam Tab Latar _Hadapan"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Buka Pautan dalam Tab Latar _Belakang"
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Buka Pautan di _Tetingkap Baru"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Salin de_stinasi Pautan"
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Simp_an Sebagai..."
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Buka _Imej dalam Tetingkap Baru"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Buka _Imej dalam Tab Baru"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Salin Im_ej"
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Simpan I_mej"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Buka dalam Pe_lihat Imej"
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Salin _Alamat Video"
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Muat Turun _Video"
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Buka Alamat dalam _Tab Baru"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Gelintar _dengan"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Gelintar Sesawang"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Buka _Bingkai dalam Tab Baru"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Periksa _Unsur"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Buka atau muat turun fail dari %s"
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Nama Fail: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Jenis Fail: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Jenis Fail: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Saiz: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Buka %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Periksa halaman - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori tidak menyimpan sebarang data peribadi:"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Tiada kuki sejara atau sesawang telah disimpan."
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Sambungan dllumpuhkan."
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"Sotrin, pangkalan data setempat dan cache aplikasi HTML5 dilumpuhkan."
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori menghalang laman sesawang daripad menjejak pengguna:"
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "URL perujuk ditanggalkan daripada nama hos."
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "Pra-dapatkan DNS dilumpuhkan."
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Bahasa dan zon waktu tidak ditunjukkan ke laman sesawang."
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+"Pemalam Flash dan Netscape yang lain akan disenaraikan oleh laman sesawang."
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+"Nombor versi dalam kurungan paparkan versi yang digunakan pada masa jalan,"
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Lengah pemuatan halaman:"
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"Pemuatan dilengahkan kerana kerosakan terkini atau keutamaan permulaan."
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Muat Halaman"
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Laman kosong"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "terdahulu"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "berikutnya"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Cetak imej latar belakang"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Sama ada imej latar belakang patut dicetak"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Fitur"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s dari %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d jam"
+msgstr[1] "%d jam"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minit"
+msgstr[1] "%d minit"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d saat"
+msgstr[1] "%d saat"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s berbaki"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Fail muat turun adalah mengandungi ralat."
+
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Hasil tambah semak disediakan dengan pautan tidak sepadan. Ini bermakna fail "
+"berkemungkinan tidak lengkap atau telah diubahsuai."
+
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Fail \"%s\" tidak dapat disimpan dalam folder ini."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Anda tidak mempunyai keizinan tulis dalam lokasi ini."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Ruang bebas tidak mencukupi untuk muat turun \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Fail perlukan %s tetapi hanya %s berbaki."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Dial Pantas"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Klik untk tambah pintasan"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Masukkan alamat pintasan"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Masukkan tajuk pintasan"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Anda pasti hendak memadam pintasan ini?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Permulaan"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Bila Midori bermula:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Laman Sesawang:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Guna halaman se_masa"
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Guna halaman semasa sebagai laman utama"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Fon"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Keluarga Fon Berkadaran"
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Keluarga fon lalai yan digunakan untuk paparkan teks"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Saiz fon lalai yang digunakan untuk paparkan teks"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Keluarga Fon Lebar-tetap"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "Keluarga fon yang digunakan untuk paparkan teks lebar-tetap"
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "Saiz fon yang digunakan untuk paparkan teks lebar-tetap"
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Saiz Fon Minimum"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Saiz fon minimum yang digunakan untuk paparkan teks"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Pengekodan Digemari"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Kelakuan"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Muat imej secara automatik"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Benarkan Semakan Ejaan"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Benarkan skrip"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Benarkan sokongan WebGL"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zum Teks dan Imej"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Benarkan skrip untuk buka tetingkap timbul"
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Sama ada skrip dibenarkan untuk buka tetingkap timbul secara automatik"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Aras Zum Lalai"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Faktor awal untuk besarkan tab yang baru dibuka"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Bahasa digemari"
+
+#: ../midori/midori-preferences.c:426
+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 terpisah tanda koma bagi bahasa yang digemari untuk menerapkan "
+"halaman sesawang berbilang bahasa, contohnya \"de\", \"ru,nl\" atau \"en-"
+"us;q=1.0, fr-fr;q=0.667\""
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Simpan fail termuat turun ke:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Pelayaran"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Gaya Palang Alat:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Buka halaman baru dalam:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Kelakuan tab baru:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Butan Tutup pada Tab"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Buka Tab bersebelahan Tab Semasa"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Sama ada hendak buka tab baru berikutnya kepada tab semasa atau selepas yang "
+"terakhir"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Buka tab dilatar belakang"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Penyunting Teks"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Aggregator Berita"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Rangkaian"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Pelayan proksi"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Jenis proksi disokong:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Simpanan Sesawang"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Saizk maksimum bagi halaman tercache pada cakera"
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Dikenalpasti sebagai"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Kerahsiaan"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Padam Kuki lama selepas:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Bilangan maksimum hari untuk simpan kuki"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Hanya terima Kuki dari laman yang anda lawati"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Sekat kuki yang dihantar oleh laman sesawang pihak ketiga"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Kuki menyimpan data daftar masuk, permainan tersimpan, atau profil pengguna "
+"untuk tujuan periklanan."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Benarkan cache aplikasi sesawang luar talian"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Benarkan sokongan pangkalan data HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Tanggalkan perincian perujuk yang dihantar ke laman sesawang"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Sama ada pengepala \"Perujuk\" patut dipendekkan ke nama hos"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Padam halaman dari sejarah selepas:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Bilangan maksimum hari untuk simpan sejarah selama"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Sambungan"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Urus Enjin Gelintar"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Tambah enjin gelintar"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Sunting enjin gelintar"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Nama:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Keterangan:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Alamat"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Token:"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Urus Enjin Gelintar"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Guna sebagai _lalai"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Enjin gelintar tidak dapat dimuatkan. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Enjin gelintar tidak dapat disimpan. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Tanda Buku dan Sejarah"
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Gelintar untuk %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Gagal memilih dari sejarah: %s"
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Gelintar dengan..."
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Gelintar dengan %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Buka dengan"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Pilih satu aplikasi atau perintah untuk buka \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Tidak dapat jalankan program luaran"
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI tidak sah"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Garis Dalam Carian:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Terdahulu"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Berikutnya"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Padan Kata"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Tutup Palang Cari"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d tanda buku"
+msgstr[1] "%d tanda buku"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subfolder"
+msgstr[1] "%d subfolder"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Folder kosong"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Folder mengandungi %s dan tiada tanda buku"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Folder mengandungi %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Folder mengandungi %s dan %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Tanda buku menuju ke: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s dan tiada tanda buku"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s dan %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Sunting tanda buku terpilih"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Padam tanda buku terpilih"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Tambah folder baru"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Pemisah</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Buka dalam _Tab Baru"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Gelintar Tanda Buku"
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Sejarah"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Hari Ini"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Semalam"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d hari yang lalu"
+msgstr[1] "%d hari yang lalu"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "Seminggu yang lalu"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Gagal membuang item sejarah: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "Anda pasti hendak buang semua item sejarah?"
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Tanda buku item sejarah terpilih"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Padam item sejarah terpilih"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Kosongkan keseluruhan sejarah"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Gelintar Sejarah"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Pengesahihan Diperlukan"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"Nama pengguna dan kata laluan diperlukan\n"
+"untuk membuka lokasi ini:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Nama Pengguna"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Kata Laluan"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Ingat kata laluan"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Tiada"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "Sifat '%s' tidak sah untuk %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Pilih Fail"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Pilih folder"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 jam"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 hari"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 minggu"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 bulan"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 tahun"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Keutamaan untuk %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "Hasiltambahsemak-MD5:"
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "Hasiltambahsemak-SHA1:"
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Halaman ini kelihatan mengandungi skrip pengguna. Anda hendak pasang ia?"
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "P_asasng skrip pengguna"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+"Halaman ini kelihatan mengandungi gaya pengguna. Anda hendak pasang ia?"
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr "_Pasang gaya pengguna"
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Jangan pasang"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Skrip Pengguna"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Gaya Pengguna"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Ralat"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Anda hendak padam '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Padam skrip pengguna"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Padam gaya pengguna"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file <b>%s</b> will be permanently deleted."
+msgstr "Fail <b>%s</b> akan dipadam secara kekal."
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr "Buka dalam Penyunting Teks"
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr "Buka Folder Sasaran"
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr "Tambah tambahan baru"
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr "Buang tambahan terpilih"
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr "Tambahan pengguna"
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Tidak dapat pantau folder '%s': %s"
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr "Sokongan untk skrip pengguna dan gaya pengguna"
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Tab Berwarna-warni"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Seri warnakan setiap tab dengan jelas"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Pengurus Kuki"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Padam Semua"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Padam semua kuki yang dipaparkan. Jika penapis ditetapkan, hanya kuki "
+"tersebut dipadam yang memadani penapis tersebut."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Kembang Semua"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Kuncup Semua"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Anda pasti hendak padam semua kuki?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Pertanyaan"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Hanya kuki yang padan dengan penapis akan dipadam."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr "Dipenghujung sesi"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Hos</b>: %s\n"
+"<b>Nama</b>: %s\n"
+"<b>Nilai</b>: %s\n"
+"<b>Laluan</b>: %s\n"
+"<b>Selamat</b>: %s\n"
+"<b>Luput</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Ya"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Tidak"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+"<b>Domain</b>: %s\n"
+"<b>Kuki</b>: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Nama"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "Kem_bangkan Semua"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "Kun_cupkan Semua"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Gelintar Kuki berdasarkan Nama atau Domain"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "Senarai, lihat dan padam kuki"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr "Salin _Alamat Tab"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Salin Alamat Tab"
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr "Salin alamat semua tab ke papan keratan"
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Muatan terlengah"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Lengah muat halaman sehingga anda sebenarnya guna tab."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dwi klik untuk maklumat lanjut"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Sambungan ini menunjukkan mesesj ralat glib  dalam systray."
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"Satu ralat berlaku bila cuba memuat turun fail dengan pemalam berikut:\n"
+"%s\n"
+"\n"
+"Ralat:\n"
+"%s\n"
+"\n"
+"Teruskan tanpa pemalam ini."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Pengurus Muat Turun Luaran - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Muat turun fail dengan Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Pengurus Muat Turun Dalaman - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Muat turun fail dengan SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Perintah:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Muat turun fail dengan \"%s\" atau perintah suai"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Pengurus Muat Turun Luaran - BarisPerintah"
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "Gagal mencari unsur \"masukan\" atom yang diperlukan dalam data XML."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr "Gagal mencari unsur \"suapan\" atom yang diperlukan dalam data XML."
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Terakhir dikemaskini: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Suapan"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Tambah suapan baru"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Padam suapan"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Suapan"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Gagal mencari unsur root dalam data XML suapan."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Format suapan tidak disokong."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Gagal menghurai suapan XML: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Gagal mencari unsur \"saluran\" dalam data XML RSS."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Versi RSS tidak disokong ditemui."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Gagal mencari unsur \"item\" RSS yang diperlukan dalam data XML."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Gagal mencari unsur \"saluran\" RSS yang diperlukan dalam data XML."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Suapan '%s' sudah wujud"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Ralat memuatkan suapan '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Panel Suapan"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Baca suapan Atom/RSS"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Gagal menambah nilai bentuk: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Sejarah borang"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Kata laluan master diperlukan\n"
+"untuk membuka pangkalan data kata laluan"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Ingat kata laluan dalam halaman ini?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Ingat"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Bukan sekarang"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Jangan sesekali untuk halaman ini"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Togol keadaan sejarah borang"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Aktif atau nyahaktifkan sejarah borang dari tab semasa."
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+"Hanya aktifkan sejarah borang melalui kekunci panas (Ctrl+Shift+F) per tab"
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr "Pengisi sejarah borang"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Simpan sejarah bagi data borang yang dimasukkan"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Gagal memilih cadangan\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "Tiada tab tidak dilawati"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Senarai-Sejarah"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Kelakuan penutupan tab"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Jangan lakukan apa-apa"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Tukar ke tab dilihat kali terakhir"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Tukar ke tab terbaru"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Denyarkan tetingkap pada tab latar belakang"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Tab baru berikutnya (Senarai Sejarah)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Tab baru berikutnya dari sejarah"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Tab baru terdahulu (Senarai Sejarah)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Tab baru terdahulu dari sejarah"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Papar tab dilatar belakang (Senarai Sejarah)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Papar tab terpilih semasa dilatar belakang"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "Senarai Sejarah"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr "Alih ke tab yang terakhir digunakan bila menukar atau menutup tab"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL gagal: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Terima"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Terima sesi"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Sekat"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Tidak dapat buka pangkalan dat untuk sambungan: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Gagal lakukan penyataan pangkalan data: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Anda pasti mahu memadam semua keizinan Skrip Java?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Padam semua keizinan Skrip Java?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Tindakan ini akan memadam semua keizinan Skrip Java. Anda akan ditanya "
+"keizinan lagi bagi setiap laman sesawang yang dilawati."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Kejadian pengurus"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Kejadian ke pengurus NoJS sejagat"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Konfigur NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Dibawah adalah senarau semua laman sesawang dan set polisi untuk mereka. "
+"Anda boleh padam polisi dengan menanda masukan dan mengklik pada "
+"<i>Padam</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domain"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Polisi"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Padam semu_a"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Benarkan skrip pada semua halaman"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Se_kat skrip pada domain yang tidak diketahui secara lalai"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "T_etapkan keizinan pada domain aras-kedua"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Nafi %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Benarkan %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Benarkan %s dalam sesi ini"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Tetingkap pelayar"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Kejadian pelayar Midori bagi paparan ini milik"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Lihat"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Kejadian paparan Midoeri bagi paparan ini milik"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Keadaan ikon menu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Keadaan ikon menu untuk ditunjuk dalam palang status"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Tidak ditentukan"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Dibenarkan"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Bercampur"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Dinafi"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Satu ralat mati berlaku yang menghalaan sambungan NoJS diteruskan. Anda "
+"seharusnya lumpuhkannya."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Ralat dalam sambungan NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Alasan"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Tidak dapat cipta folder konfigurasi untuk sambungan: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Tidak dapat cipta folder konfigurai untuk sambungan."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Tidak dapat buka pengkalan data sambungan."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Tidak dapat tetapkan struktur sambungan pangkalan data."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Kejadian sambungan"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Kejadian sambungan Midori untuk sambungan ini"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Kejadian aplikasi"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Kejadian aplikasi Midori yang mana sambungan ini miliki"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Kejadian pengkalan data"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Penuding ke kejadian pengkalan data sqlite yang digunakan oleh sambungan ini"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Laluan pangkalan data"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Laluan ke kejadian pengkalan data sqlite yang digunakan oleh sambungan ini"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Benarkan semua laman"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Jika benar sambungan ini tidak akan memeriksa polisi bagi setiap laman "
+"tetapi benarkannya."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Hanya aras kedua"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Jika benar sambungan ini akan kurangkan setiap domain ke aras-keduanya "
+"(www.contoh.org akan dikurangkan menjadi contoh.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Polisi domain tidak diketahui"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Polisi yang digunakan untuk domain tidak diketahui."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Diterima buat sementara"
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Gerakan Tetikus"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Kawal Midori dengan menggerakkan tetikus"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Muat semula halaman atau hentikan pemuatan"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Suaikan pintasan Papan Kekunci"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Suaikan P_intasan..."
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Pintasan"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Lihat dan sunting pintasan papan kekunci"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Jam Palang Status"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Papar tarikh dan masa dalam palang status"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Imej"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skrip"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Pemalam Netscape"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Benarkan pemalam Netscape"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Fitur Palang Status"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
+"Togol fitur dengan mudah pada laman sesawang dihidupkan dan dimatikan"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Panel Tab"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Panel T_ab"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Papar tab dalam panel menegak"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Hanya Ikon pada Tab secara lalai"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Tab baru tidak mempunyai label secara lalai"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Suaikan Palang Alat"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Pilih item yang akan dipaparkan pada palang alat. Item boleh ditertib semula "
+"dengan cara seret dan lepas."
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Item Tersedia"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Item Dipaparkan"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "S_uaikan Palang Alat..."
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Penyunting Palang Alat"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Sunting bentangan palang alat dengan mudah"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Kosongkan Data Peribadi"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Kosongkan data peribadi"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Kosongkan data berikut:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "_Tab terakhir dibuka"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Kosongkan data peribadi bila men_utup Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Daftar masuk dan kata _laluan tersimpan"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Data Kuki dan Laman Sesawang"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikon laman sesawang"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Buka tab"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Buka lagi tab..."
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Gagal kosongkan sejarah: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Gagal membuang item sejarah lama: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Gagal menambah item tanda buku: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Gagal mengemaskini tanda buku: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Gagal membuang item tanda buku: %s\n"
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr "Tiada fail sijil root tersedia. Sijil SSL tidak dapat disahkan."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Konfigurasi tidak dapat disimpan. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Tong sampah tidak dapat disimpan. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori mengalami kerosakan kali terakhir dibuka. Anda boleh laporkan masalah "
+"di %s."
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Ubahsuai k_eutamaan"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Lumpuhkan semua sa_mbungan"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Paparkan dialog selepas Midori mengalami kerosakan"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Singkir tab lama"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Papar _log kerosakan terakhir"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Jalankan dalam pen_yahpepijat"
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Kejadian Midori sudah pun berjalan tetapi tidak bergerakbalas.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Tanda buku tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sesi tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Tong sampah tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Sejarah tidak dapat dimuatkan: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Ralat berikut berlaku:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Abai"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Tidak dapat buka pengkalan data sambungan: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Anda pasti hendak padam semua keizinan kuki?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Padam semua keizinan kuki?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Tindakan ini akan padam semua keizinan kuki. Anda akan ditanya keizinan "
+"sekali lagi untuk setiap laman sesawang yang dilawati."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Pengurus keizinan kuki"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Kejadian pengurus keizinan kuki semasa"
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Konfigur keizinan kuki"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Dibawah adalah senarai laman sesawang dan polisi yang ditetapkan untuk "
+"mereka. Anda boleh padam polisi dengan menanda masukan dan mengklik pada "
+"<i>Padam</i>. Anda juga boleh menambah polisi untuk domain secara manual "
+"dengan memasukkan domain dibawah, pilih polisi dan klik pada <i>Tambah</>."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Polisi untuk kuki dari domain tiada dalam senarai: "
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Tanya untuk kepastian"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"Ralat mati berlaku yang menghalang sambungan pengurus keizinan kuki untuk "
+"diteruskan. Anda sepatutnya lumpuhkannya."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Ralat dalam sambungan pengurus keizinan kuki"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+"Tidak dapat memastikan polisi kuki sejagat untuk ditetapkan pada domain: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Sehingga sesi berakhir"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Laman sesawang %s ingin menyimpan %d kuki."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Laman sesawang %s hendak menyimpan kuki."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Laman sesawang berbilang hendak menyimpan sejumlah %d kuki."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "Terim_a"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Terima untuk _sesi ini"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "Na_fi"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Naf_i buat masa ini"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Laluan"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Nilai"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Tarikh luput"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"Polisi yang digunakan untuk domain tidak dikonfigur secara individu. Ia "
+"hanya bertindakan untuk sekatan set polisi kuki lanjutan dalam tetapan "
+"Midori."
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Pengurus Keselamatan Kuki"
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Urus keizinan kuki per halaman"
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Gagal mendapatkan ikon aplikasi dalam %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Gagal mencipta pelancar baharu (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Pelancar dicipta"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Kini anda boleh jalankan <b>%s</b> dari pelancar atau menu anda"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Ralat mencipta pelancar"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikasi"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "_Profil Baru"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Cipta profil dan pelancar bebas dan baharu"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "_Apl Baru"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Cipta aplikasi baru untuk laman tertentu"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Ralat pelancaran"
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Cipta Pe_lancar"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Pengurus Apl Sesawang"
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Urus laman sesawang yang dipasang sebagai aplikasi"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Pemindahan"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Kosongkan Semua"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Gagal membuka muat turun: %s"
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Buka _Folder Destinasi"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Salin Loka_si Pautan"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Fail '<b>%s</b>' telah dimuat turun."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' dan %d lain-lain fail telah dimuat turun."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Pemindahan selesai"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Beberapa fail sedang dimuat turun"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Keluar Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Pemnindahan akan dibatalkan jika Midori ditutup."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Pengurus Pemindahan"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Lihat fail dimuat turun"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Gagal mengemaskini pangkalan data: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Gagal memilih dari pangkalan data: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Gagal mengimport sesi legasi: %s"
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Pengurusan tab dan sesi."
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Sambungan ini menyediakan baris gilir tugas untuk kemaskini kerja atau "
+"peristiwa berulang."
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Gagal menambah nota baharu ke pangkalan data: %s\n"
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Gagal membuang nota dari pangkalan data: %s\n"
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Gagal menama semula nota: %s\n"
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Gagal mengemaskini nota: %s\n"
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Nota"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nota Baharu"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Cipta nota kosong baharu, tidak berkaitan dengan halaman yang dibuka"
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nota baharu"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Gagal memilih dari pangkalan data nota: %s\n"
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Nama semula nota"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Salin nota dari papan keratan"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Buang nota"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Salin pemilihan sebagai nota"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Simpan klip teks dari laman sesawang sebagai nota"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Penyekat iklan"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Sekat iklan berdasarkan senarai penapis"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfigur penapis Iklan"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Se_kat imej"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "S_ekat pautan"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Sunting peraturan"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "Pe_raturan:"
diff --git a/po/nap.po b/po/nap.po
new file mode 100644 (file)
index 0000000..2280584
--- /dev/null
+++ b/po/nap.po
@@ -0,0 +1,3439 @@
+# Neapolitan translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-09-14 16:36+0000\n"
+"Last-Translator: C.R. <stolatstolatstolatstolat@gmail.com>\n"
+"Language-Team: Neapolitan <nap@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:02+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navigatore web"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Navigatore web Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Naviga dint' 'o web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Scheda nova"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Fenesta nova"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Fenesta 'e navigazione privata nova"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Navigazione privata 'e Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Navigazione privata"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Arape na fenesta 'e navigazione privata nova"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Schermata sarvata int'a: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Secuta INDIRIZZO comme apprecazione web"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "INDIRIZZO"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Aúsa CARTELLA comme cartella 'e configurazione"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "CARTELLA"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Navigazione privata: nun sarrà sarvato nisciuno cagnamiento"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Modalità portatile: tutte 'e file d' 'a sessione songo sarvate dint'a na "
+"posizione uneca"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Fenesta semprice 'e GTK+ c' 'o WebKit, suóccio a 'o GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Mmusta 'a fenesta 'e diagnostica"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Lanza comme gdb e astipa na traccia inversa d' 'o scasso"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Secuta 'o file specificato comme javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Piglia na fotografia 'e l'URI specificata"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Secuta 'o cumanno specificato"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Fà n'alenco d' 'e cumanne a secutà cu -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Vide 'a verzione d' 'o prugramma"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Indirizze"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blocca l'URI a sicondo l'espressione reolare SCHEMA"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "SCHEMA"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Riabbia 'o Midori aropp'a SECONDE seconde d'inattività"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECONDE"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Errore: \"gdb\" nun se può truvà\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Pe' piacere mannate cummente, suggerimente e bug a:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Cuntrolla verziune nove ncopp'a:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "N'errore scanusciuto è cumparzo"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Indirizze 'e nteresse"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "_Nzegna n'indirizzo 'e nteresse"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Estensiune"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Cronologgia"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Scripts d'utente"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Stile d'_utente"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "_Scheda nova"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Trasferimente"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "_Plugin 'e Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "Schede _Nchiuse"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Fenesta Nova"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_Cartella Nova"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Indirizze]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "File nun truvato."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Documento corrotto."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Furmato 'e l'indirizzo 'e nteresse nun ricanusciuto"
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Và annanze 'a paggena successiva"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Và 'a sottopaggena annanze"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Ricerca ncopp' 'o web..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Carreca sta paggena n'ata vota"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Ferniscela 'e carrecà sta paggena"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "S'è scassato quanno s'agghiurnava 'o titolo: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "'O valore «%s» nun è bbuono pe' %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Mpustazione «%s» inaspettata"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Azione «%s» inaspettata."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Navigazione privata)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Nun s'è pututo azzeccà n'elemento nuovo 'a cronologgia: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Seleziona [testo]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Indirizzo 'e nteresse"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Nuova Cartella"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Cágna Cartella"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nuovo indirizzo 'e nteresse"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Cágna indirizzo 'e nteresse"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+"Scrivete nu nomme pe' st'indirizzo 'e nteresse, e scigliete addò v' 'o "
+"vulite astipà."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Scrivete nu nomme pe sta cartella, e scigliete addò v' 'a vulite astipà."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mmusta dint' 'a _Barra 'e l'Indirizze 'e nteresse"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Azzecca â _selezione ampressa"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Astipa 'e file comme"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Astipa 'e _risorse suoccie"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "S'è araputa na fenesta nova"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "S'è araputa na scheda nova"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Errore quanno s'arapeva l'immaggene!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+"Nun se può arapì 'a fenesta scigliuta dint' 'o visualizzatore predefinito"
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Errore quanno se scarrecava l'immaggene!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Nun se può scarrecà l'immaggene scigliuta."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Astipa file"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Carreca 'a paggena n'ata vota senza fà 'o caching"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Arape file"
+
+#: ../midori/midori-browser.c:2692
+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 ""
+"Pe te piglià st'URI ccà ncoppa, arapite n'azzeccatóre 'e nutizie o simile. "
+"Normalmente , ce sta nu menù o nu buttóne ca se chiammasse \"Nova "
+"sottoscrizione\", \"Nuovo Azzeccatore 'e Nutizie\".\n"
+"Si nò, iate ncopp' 'e Preferenze, Applicaziune dint' 'a Midori, e scigliete "
+"n'Azzeccatore 'e Nutizie. Accussì, n'ata vota quanno spremmerrite 'o buttóne "
+"'e nutizie azzeccate, s'azzeccarrà 'n automatico."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Azzeccatore 'e nutizie nuovo"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Azzecca n'indirizzo 'e nteresse nuovo"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Abbacante"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Appiccia 'a funzione 'e navigazione a curzore"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Spremmenno F7 s'appiccia 'a funzione 'e navigazione Caret. Quann'è attiva, "
+"accumpare nu curzore 'e testo dint'a tutt' 'e site."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "_Appiccia 'a funzione 'e navigazione Caret"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Arape dint'a tutt' 'e _Schede"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Arape dint'a na _fenesta nova"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Mpurta indirizze 'e nteresse..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Mpurta indirizze 'e nteresse"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Applicazione"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Mpurta 'a nu file XBEL o HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Mpurta 'a nu file"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Nun se ponno mpurtà l'indirizze 'e nteresse"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "Indirizze 'e nteresse XBEL"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Indirizze 'e nteresse Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr "Midori può sulamente spurtà a XBEL (*.xbel) e Netscape (*.html)"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Nun se ponno spurtà l'indirizze 'e nteresse"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Nu navigatore web liggiero liggiero"
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  C.R. https://launchpad.net/~c.rs."
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
new file mode 100644 (file)
index 0000000..52295ab
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,3509 @@
+# Norwegian Bokmal translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-04-28 04:45+0000\n"
+"Last-Translator: kingu <comradekingu@gmail.com>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: nb\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Nettleser"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Nettleser"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Bruk internett"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internett;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Ny fane"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nytt vindu"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nytt privatsurfing vindu"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori privat nettlesing"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privat nettlesing"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Åpne et nytt privat nettleservindu"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Bilde lagret til. %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Kjør ADDRESS som en nettapplikasjon"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRESS"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Bruk FOLDER som konfigureringsmappe"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FODLER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Privat nettlesning; ingen endringer lagres"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Flyttbar modus, alle kjøretidsfiler er lagret på ett sted."
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Blankt GTK+ vindu med WebKit, som GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Vis en diagnostikkdialog"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Kjør innenfor gdb og lagre tilbakesporing ved krasj."
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Kjør det spesifiserte filnavnet som javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Lag avbildning av den spesifserte URI'en"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Kjør den spesifiserte kommandoen"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Vis tilgjengelige kjørekommandoer med -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Vis programversjon"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adresser"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blokker URIer som samsvarer med vanlige uttrykks MØNSTER"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "MØNSTER"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Nullstill Midori etter SEKUNDER sekunders inaktivitet"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKUNDER"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Feil:\"gdb\" kan ikke bli funnet\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Vennligst rapportér kommentarer, forslag og feil til:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Sjekk etter nye versjoner på:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "En ukjent feil oppsto"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bokmerker"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Legg til bok_merke"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Utvidelser"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historikk"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Brukerskript"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Bruker_stiler"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Ny _Fane"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Overføringer"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape t_illegg"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Lukkede faner"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nytt _vindu"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Ny _mappe"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Addresser]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Fant ikke fila."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Misformet dokument."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Ukjent bokmerke-format"
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Gå videre til neste side"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Gå til neste underside"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Nettsøk..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Last inn gjeldende side på nytt"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Stopp innlasting av gjeldende side"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Mislykktes i å oppdatere tittel: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Verdien '%s' er ikke gyldig for %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Uventet innstilling '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Uventet handling '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Privat surfing)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Mislykktes i å legge inn nytt historikkinnlegg: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Velg [tekst]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Ny mappe"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Rediger mappe"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nytt bokmerke"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Redigér bokmerke"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Skriv et navn for dette bokmerket, og velg hvor det skal oppbevares."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Skriv et navn for denne mappen, og velg hvor den skal oppbevares."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Vis i bokmerke_verktøylinje"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Legg til _hurtigvalg"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Lagre fil som"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Lagre tilhørende ressurser"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Nytt vindu åpnet"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Ny fane åpnet"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Feil i åpning av bildet!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Kan ikke åpne valgt bilde i standardviseren."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Feil i nedlastning av bilde!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Kan ikke laste ned valgt bilde."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Lagre fil"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Last inn side på nytt uten mellomlagring"
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: ../midori/midori-browser.c:2692
+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 ""
+"For å bruke URI'en over, åpne en nyhetssamler. Det er vanligvis en meny "
+"eller knap \"Nytt abonnement\", \"Ny nyhetsstrøm\" eller lignende.\n"
+"\vAlternativt gå til Innstillinger, Programmer i Midori og velg Nyhetssamler. "
+"Neste gang du velger en nyhetsstrøm fra ikon, blir det lagt til automatisk."
+
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Ny strøm."
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Legg til et nytt bokmerke"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Tom"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Velg tekstmarkørnavigering"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Trykk F7 for å starte markørsurfing. Når det er skrudd på, vil en "
+"tekstmarkør dukke opp på alle nettsider."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "Skru på markørsurfing"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Åpne i _faner"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Åpne i nytt _vindu"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Importér bokmerker…"
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "_Importér bokmerker"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Program:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Importér fra XBEL- eller HTML-fil"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Importér fra en fil"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Mislyktes i å importére bokmerker"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "XBEL Bookmerker"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Netscape bokmerker"
+
+#: ../midori/midori-browser.c:4546
+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:4558
+msgid "Failed to export bookmarks"
+msgstr "Mislyktes i å eksportere bokmerker"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "En lettvektig nettleser."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "See about:version for versjonsinfo"
+
+#: ../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 ""
+"Dette biblioteket er fri programvare; man kan redistribuere det og/eller "
+"modifisere det under vilkårene i GNU Lesser General Public License som "
+"publisert av the Free Software Foundation; enten versjon 2.1 av lisensen, "
+"eller (ved ditt valg) en hvilken som helst senere versjon."
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Magnus Meyer Hustveit https://launchpad.net/~dizzi90\n"
+"  Neethan Puvanendran https://launchpad.net/~neethan98\n"
+"  kingu https://launchpad.net/~comradekingu\n"
+"  messo https://launchpad.net/~rsolvang"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplisér nåværende fane"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Fil"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Åpne et nytt vindu"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Åpne en ny fane"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Nytt privatsurfing vindu"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Åpne en fil"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Lagre side som..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Lagre til fil"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Legg til i hurtigvalg"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Abonnér på nyhets_strøm"
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Lukk fane"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Lukk nåværende fane"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "L_ukk vindu"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Skriv ut den nåværende siden"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr "Lukk alle vinduer"
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "Redigér"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Finn..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Finn et ord eller en frase på siden"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Finn _neste"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Finn _forrige"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr "Konfigurér programinnstillingene"
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Vis"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Verktøylinjer"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr "Øk zoomnivå"
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr "Mink zoomnivå"
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Koding"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Se ki_lde"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Se _DOM-kidle"
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr "Mar­kørsurving"
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Skru på/av fullskjermvisning"
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr "Skroll _venstre"
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr "Skroll _ned"
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr "Skroll _opp"
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr "Skroll _høyre"
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Leslig"
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr "_Gå"
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr "Gå tilbake til forrige side"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr "Gå tilbake til forrige under-side"
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Neste eller videre"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Gå til neste under-side eller neste side i historikk"
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Hjemmeside"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr "Gå til hjemmesiden din"
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Tøm søppel"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr "Angre lukking av fane"
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Legg til ny _mappe"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importér bokmerker..."
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Eksportér bokmerker..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Behandle søkemotorer"
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Rens private data..."
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr "_Undersøk side"
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Forrige fane"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Neste fane"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Flytt fane til _førsteplass"
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr "Flytt fane _bakover"
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr "_Flytt fane forover"
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Flytt Fane til _sisteplass"
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr "Fokusér _nåværende fane"
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr "Fokusér _neste visning"
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr "Vis kun ikon for _nåværende fane"
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr "Lukk an_dre faner"
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "Åpne forrige _økt"
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Ofte stilte spørsmål"
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr "_Rapportér et problem"
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Verktøy"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr "_Menylinje"
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr "_Navigasjonslinje"
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr "Side_panel"
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr "Sidepanel"
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr "_Bokmerkelinje"
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "_Statuslinje"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Automatisk"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Tradisjonell kinesisk (BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Forenklet kinesisk (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japansk (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Koreansk (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Russisk (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Vestlig (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Tilpasset..."
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Mislyktes i å inisialisere historikk: %s"
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Skilleark"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr "_Lokasjon..."
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr "Åpne en spesifik lokasjon"
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr "_Nettsøk..."
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr "Kjør et nettsøk"
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr "Gjenåpne en tidligere lukket fane eller vindu"
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr "Vis de lagrede bokmerkene"
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Faner"
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr "Vis en liste over alle åpne faner"
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Meny"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Meny"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr "Konfigurasjonen av programtillegget '%s' kunne ikke lastes inn: %s\n"
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Konfigurasjonen av programtillegget '%s' kunne ikke lagres: %s\n"
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr "Eksportér sertifikat"
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Sertifikatautoritetens signatur er ukjent."
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Sertifikatet stemmer ikke overens med forventet identited for siden det er "
+"hentet fra."
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Sertifikatets aktiveringsøyeblikk er fortsatt fremtidig."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Sertifikatet er utgått"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Sertifikatet har blitt inndratt ifølge GTIsConnections "
+"sertifikatinndragelsesliste."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Sertifikatets algoritme er ansett som usikker."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "En annen feil oppsto i validering av sertifikatet."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Eksportér sertifikat"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Selvsignert"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Sikkerhetsdetaljer"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr "Lim inn og f_ortsett"
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Ikke bekreftet"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Bekreftet og kryptert tilkobling"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Åpen, ukryptert tilkobling"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr "Justér sidepanel til høyre"
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Lukk panel"
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr "Juster sidepanel til venstre"
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr "Vis hurtigvalg"
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr "Vis hjemmeside"
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Vis sist åpnede faner"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Vis de forrige fanene uten å starte innlasting"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Vis blank side"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Vis standardsøkemotor"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Vis tilpasset side"
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japansk (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Ny fane"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Nytt vindu"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "Nåværende fane"
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Standard"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikoner"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Små ikoner"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Tekst"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Ikoner og tekst"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Tekst utenom ikoner"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatis (GNOME eller miljø)"
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr "HTTP proxytjener"
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr "Ingen proxytjener"
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Verktøylinjestil"
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Alltid bruk skrifttypevalgene mine"
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Overskriv skrifttype valgt av nettsider med brukervalg"
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Innstillingen kunne ikke lastes inn: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Ugyldig verdi for innstillingen '%s'"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr "Mislyktes i å injesere stilark: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Vis fane _merkelapp"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Vis fane kun _ikon"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Lukk fane til høyre"
+msgstr[1] "Lukk faner til høyre"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Lukk andre fane"
+msgstr[1] "Lukk andre faner"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Stol på denne nettsiden"
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Sikkerhet ukjent"
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s vil lagre en HTML5-database."
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Nekt"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Tillat"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s vil vite hvor du er."
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' kan ikke finnes"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Siden '%s' kunne ikke lastes inn:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Sjekk adressen for skrivefeil"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "Sjekk at nettkabelen står i eller at trådløskortet er aktivert"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Sjekk at nettverksinnstillingene er korrekte"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Forsøk igjen"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr "Oisann - %s"
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr "Noe gikk galt med '%s'."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Forsøk igjen"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Send en melding til %s"
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Legg til _søkemotor..."
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Åpne _lenke"
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Åpne lenke i ny _fane"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Åpne lenke i _forgrunnsfane"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Åpne lenke i _bakgrunnsfane"
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Åpne lenke i nytt vindu"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Åpne lenkem_ål"
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Lagre _som..."
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Åpne _bilde i nytt vindu"
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Åpne _bilde i ny fane"
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Kopiér bi_lde"
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Lagre b_ilde"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Åpne i bildevisningsprogram"
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopiér video_addresse"
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Last ned _video"
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Åpne addresse i ny _fane"
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Søk _med"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Søk på nettet"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Åpne _ramme i ny fane"
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Undersøk _element"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Åpne eller last ned fil fra %s"
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Filnavn: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Filtype: '%s'"
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Filtype: %s ('%s')"
+
+#: ../midori/midori-view.c:2778
+#, 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:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Åpne %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Undersøk side - %s"
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori samler ikke noen personlige data:"
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Ingen historikk eller informasjonskapsler blir lagret."
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Programtilleg er skrudd av."
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"HTML5lagring, lokal database og applikasjonsmellomlagere er skrudd av."
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori forhindrer nettsider i å spore brukeren:"
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Vidresender-URL'er blir redusert til vertnavnet."
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS-forhenting er skrudd av."
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Språk og tidssone blir ikke oppgitt til nettsider."
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "Flash og andre Netscape-tillegg kan ikke vises av nettsider."
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr "Versjonnummer i paranteser viser versjon brukt ved kjøring."
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Sidelasting utsatt:"
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+"Lasting utsatt enten på grunn av et nylig krasj eller oppstartsinnstillinger."
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Last side"
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Blank side"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "forrige"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "neste"
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Skriv ut bakgrundsbilder"
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Hvorvidt bakgrunnsbilder burde skrives ut"
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Funksjoner"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s av %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutt"
+msgstr[1] "%d minutter"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s gjenstår"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Den nedlastede filen er gal."
+
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Sjekksummen oppgitt med lenken stemte ikke overens. Dette betyr antagelig at "
+"filen er ukomplett eller ble modifisert etterpå."
+
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Filen \"%s\" kan ikke lagres i denne mappen."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Du har ikke skriverettigheter til dette området."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Det er ikke nok plass ledig for å laste ned \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Denne filen krever %s men kun %s gjenstår."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr "Hurtigvalg"
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr "Trykk for å legge til en snarvei"
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr "Legg inn snarveiens adresse"
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr "Legg inn snarveiens tittel"
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Er du sikker på at du vil gjerne denne snarveien?"
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Oppstart"
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Når Midori starter:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr "Bruk _nåværende side"
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr "Bruk nåværende side som hjemmeside"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Skrifttype"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr "Propsjonal skriftypefamilie"
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr "Bruk standard-skrifttypefamilien for å vise tekst"
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr "Bruk standard-skriftstørrelse for å vise tekst"
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr "Fast-bredde skrifttypefamilie"
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr "Bruk standard-skrifttypefamilie for å vise fast-breddetekst"
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr "Skriftstørrelse brukt for å vise fast-breddetekst"
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Minimum skriftstørrelse"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr "Minimum skriftstørrelse brukt for å vise tekst"
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Foretrukken koding"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Oppførsel"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Last inn bilder automatisk"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Aktivér stavekontroll"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Aktivér skript"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Aktivér WebGL-støtte"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom tekst og bilder"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr "Tillat at skript åpner sprettoppdialoger"
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Hvorvidt skript tillates å åpne sprettoppvinduer automatisk"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Standard zoomnivå"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Opprinnelig faktor å øke størrelsen til nyåpnede faner med"
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Foretrukkene språk"
+
+#: ../midori/midori-preferences.c:426
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"En kommaseparert liste over foretrukkene språk for gjengivning av "
+"flerspråklige nettsider, for eksempel: \"de\", \"ru,nl\" or \"en-us;q=1.0, "
+"fr-fr;q=0.667\""
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Lagre nedlastede filer til:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Surfing"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Utseende:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Verktøylinjestil:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Åpne nye sider i:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Ny faneoppførsel:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Lukkeknapper på faner"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Åpne faner ved siden av nåværende"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Hvorvidt å åpne nye faner ved siden av den nåværende fanen eller etter den "
+"siste"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Åpne faner i bakgrunnen"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Tekstredigerer"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Nyhetssamler"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxytjener"
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Støttede proxy-typer:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Webmellomlager"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Maksimal størrelse på mellomlagrede sider på disk"
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identifisér som"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Personvern"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Slett gamle informasjonskapsler etter:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Maksimalt antall dager å lagre informasjonskapsler"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Akseptér informasjonskapsler kunne fra sider du besøker"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokkér informasjonskapsler fra tredjepartsnettsider"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Infokapsler lagrer f.eks innlogginsdetaljer, spilløkter eller brukerprofiler "
+"i reklameøyenmed."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Skru på avkoblet nettapplikasjon mellomlager"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Skru på støtte for lokal HTML5-lagring"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr "Fjern vidresenderdetaljer sendt til nettsider"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Hvorvidt \"Vidresender\" toppteksten skal forkortes til vertnavn"
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Slett sider fra historikk etter:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Maksimalt antall dager å lagre historikk"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Utvidelser"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Behandle søkemotorer"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Legg til søkemotor"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr "Redigér søkemotor"
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "_Pollett:"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr "Behandle søkemotorer"
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "Bruke som standard"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Søkemotoren kunne ikke lastes inn. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Søkemotoren kunne ikke lagres. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bokmerker og historikk"
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Søk etter %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Mislyktes i å velge fra historikk: %s"
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Søk med..."
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Søk med %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Åpne med"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Velg en applikasjon eller kommand for å åpne \"%s\":"
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Kunne ikke kjøre eksternt program."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Ugyldig URI"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Innlinje find:"
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Neste"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "skill mellom små og store bokstaver"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Lukk finnelinje"
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d bokmerke"
+msgstr[1] "%d bokmerker"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d undermappe"
+msgstr[1] "%d undermapper"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Tøm mappe"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Mappe som inneholder %s og ingen bokmerker"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Mappe som inneholder %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Mappe som inneholder %s og %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bokmerke som leder til: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s og ingen bokmerker"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s og %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr "Redigér det valgte bokmerket"
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr "Slett det valgte bokmerket"
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Legg til en ny mappe"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Separatør</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Åpne i ny _fane"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Søk i bokmerker"
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historikk"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Idag"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "I går"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dag siden"
+msgstr[1] "%d dager siden"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "En uke siden"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Mislyktes å fjerne historikkinnlegg: %s\n"
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "Er du sikker på at du vil fjerne alle historikkinnlegg?"
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Bokmérk det valgte historikkinnlegget"
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Slett det valgte historikkinnlegget"
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Rens hele historikken"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Søk i historikk"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Autentisering påkreves"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"Et brukernavn og passord er påkrevd\n"
+"for å åpne dette området:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "Brukernavn"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Passord"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Husk passord"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ingen"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "Egenskap '%s' er ugyldig for %s"
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Velg fil"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Velg mappe"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 time"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 dag"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 uke"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 måned"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 år"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Innstillinger for %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-sjekksum:"
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-sjekksum:"
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Denne siden ser ut til å inneholde et brukerskript. Ønsker du å installére "
+"det?"
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Installér brukerskript"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+"Denne siden ser ut til å inneholde en brukerstil. Vil du installére den?"
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr "_Installér brukerstil"
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Ikke installér"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Brukerskript"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Brukerstiler"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Feil"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Vil du slette '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Slett brukerskript"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Slett brukerstil"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file <b>%s</b> will be permanently deleted."
+msgstr "Filen <b>%s</b> vil bli permanent slettet."
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr "Åpne i tekstbehandler"
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr "Åpne målmappe"
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr "Legg til nytt brukertillegg"
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr "Fjern valgt tillegg"
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr "Brukertillegg"
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Kan ikke overvåke mappe '%s': %s"
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr "Støtte for brukerskript og brukerstiler"
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Fargerike faner"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Fargekoding for faner"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Informasjonskapselbehandler"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Slett alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Slette alle viste informasjonskapsler. Dersom et filter er satt, vil kun de "
+"informasjonskapslene slettes som stemmer overens med filteret."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Ekspandér alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Kollaps alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Vil du virkelig slette alle informasjonskapsler?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Spørsmål"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+"Kune informasjonskapsler som stemmer overns med filteret vil slettes."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr "Ved øktens ende"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+"<b>Vert</b>: %s\n"
+"<b>Navn</b>: %s\n"
+"<b>Verdi</b>: %s\n"
+"<b>Sti</b>: %s\n"
+"<b>Sikker</b>: %s\n"
+"<b>Utløper</b>: %s"
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Ja"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Nei"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+"<b>Domene</b>: %s\n"
+"<b>Informasjonskapsler</b>: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Navn"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Ekspandér alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Kollaps alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Søk i informasjonskapsler etter Navn eller Domene"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "Overse, vis og slett informasjonskapsler"
+
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr "Kopiér fane_addresser"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr "Kopiér faners addresser"
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr "Kopiér addressene til alle faner til utklippstavle"
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr "Forsinket innlasting"
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr "Forsink sideinnlasting til du faktisk bruker fanen."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dobbeltklikk for mer informasjon"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Dette programtillegget viser glib feilmeldinger i systemtrau."
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+"En feil oppsto i forsøket av å laste ned en fil med det følgende "
+"programtillegget:\n"
+"\v%s\n"
+"\v\n"
+"\vFeil:\n"
+"\v%s\n"
+"\v\n"
+"\vFortsett uten dette programtillegget."
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr "Ekstern nedlastningsbehandler - Aria2"
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr "Last ned filer med Aria2"
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr "Ekstern nedlastningsbehandler - SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr "Last ned filer med SteadyFlow"
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr "Kommando:"
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr "Last ned filer med \"%s\" eller en tilpasset kommando"
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr "Ekstern nedlastningsbehandler - Kommandolinje"
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "Mislyktes å finne påkrevd Atom \"entry\"-elementer i XML-data."
+
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr "Mislyktes å finne påkrevd Atom \"feed\"-elementer i XML-data."
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Sist oppdater: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Kanaler"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr "Legg til ny kanal"
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr "Slett kanal"
+
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "_Kanaler"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Mislyktes å finne rotelement i kanal-XML-data."
+
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Ustøttet kanalformat."
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "Mislyktes å lese XML-kanal. %s"
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "Mislyktes i å finne \"channel\" element i RSS XML data."
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr "Fant ustøttet RSS-versjon."
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "Mislyktes i å finne påkrevde RSS \"item\"-elementer i XML-data."
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "Mislyktes i å finne påkrevde RSS \"channel\"-elementer i XML-data."
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Kanal '%s' eksisterer allerede"
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Feil i lasting av kanal '%s'"
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "Kanalpanel"
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr "Les Atom/RSS-kanaler"
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Mislyktes i å legge til skjemaverdi: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Skjemahistorikk"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Superpassord kreves\n"
+"for å åpne passorddatabase"
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "Huske passord på denne siden?"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Husk"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ikke nå"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "Aldri for denne siden"
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr "Skru av/på historikktilstand"
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Aktiver eller deaktiver skjemahistorikk for denne fanen."
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr "Aktivér skjemahistorikk kunne via hurtigtast (Ctrl+Shift+F) per fane"
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr "Skjermhistorikk utfyller"
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr "Lagrer historikk over inntastet skjemadata"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Mislyktes i å velge forslag\n"
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr "Det er ingen ubesøkte faner"
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr "Historikk-liste"
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr "Oppførsel for fanelukking"
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Gjør ingenting"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr "Bytt til sist viste fane"
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr "Bytt til nyeste fane"
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Blink vinduer på bakgrunnsfaner"
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr "Neste nye fane (historikkliste)"
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr "Neste nye fane fra historikk"
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr "Forrige nye fane (historikkliste)"
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr "Forrige nye fane fra historikk"
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr "Vis fane i bakgrunn (historikkliste)"
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr "Vis den nå valgte fanen i bakgrunnen"
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr "Historikkliste"
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr "Flytt til sist brukte fane ved skifte eller lukking av faner"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL mislykkes: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Akseptér"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Akseptér for økt"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokkér"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Kunne ikke åpne database for programtillegg: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Mislyktes i å utføre database-utsagn: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Vil du virkelig slette alle JavaScript-tilganger?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Slette alle JavaScript-tilganger?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Denne handlingen vil slette alle JavaScript-tilganger. Du blir bedt om "
+"tilganger igjen for hver side du besøker."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Behandlerinstans"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instans til global NoJS-behandler"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Konfigurér NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Nedenfor er en liste over alle nettsider og tilhørende regelsett. Du kan "
+"slette regler ved å markere innlegg og trykke på <i>Slett</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domene"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Regel"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Slett alle"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "T_illat skript på alle sider"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blok_kér skript ved ukjente domener som standard"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "S_ett tilganger på andre-nivå domene"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Nekt %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Tillat %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Tillat %s for denne økten"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Nettleservindu"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Midori-nettleser instansen som denne visningen tilhører"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Visning"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Midorivisningsinstansen denne visingen tilhører"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Menyikontilstand"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Tilstand for menyikon i statuslinjen"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Ukjent"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Tillat"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Blandet"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Nektet"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"En feil  oppsto som forhindrer NoJS-tillegget i å fortsette. Du bør skru det "
+"av."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Feil i NoJS-tillegg"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Grunn"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Kunne ikke skape konfigurasjonsmappe for tillegg: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Kunne ikke skape konfigurasjonsmappe for tillegg."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Kunne ikke åpne tilleggets database."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Kunne ikke sette opp databasestruktur for tillegg."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Tillegginstans"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Midoritillegginstans for dette tillegget"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Applikasjonsinstans"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Midoriapplikasjonsinstansen dette tillegget tilhører"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Databaseinstans"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Peker til sqlite databaseinstans brukt av dette tillegget"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Databasesti"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Sti til sqlite databaseinstans brukt av dette tillegget"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Tillat alle sider"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Hvis sann vil dette tillegget ikke sjekke regler for hver side, men tillate "
+"dem."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Kun andre nivå"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Hvis satt, vil dette tillegget redusere hvert domene til domenenivå, "
+"subdomene bortfaller. (www.eksempel.no reduseres til eksempel.no)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Ukjent domenepraksis"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Praksis for bruk av ukjente domener."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Godta midlertidig"
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Musebevegelser"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Kontroller midori med musebevegelser"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Gjenninnlast side eller stopp lasting"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Tilpass tastatursnarveier"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Tilpass tasta_tursnarveier"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Hurtigtaster"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Se over og behandle tastatursnarveier"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Statuslinje-klokke"
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Vis tid og dato i statuslinje"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Bilder"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skript"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape-tillegg"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Skru på Netscape-tillegg"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Statuslinje-funksjoner"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Veksle enkelt funksjoner på nettsider av og på"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Fanepanel"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "F_anepanel"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Vis faner i et loddrett panel"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Bare ikoner og faner som standard"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Nye faner har ingen tittel som standard"
+
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Tilpass verktøylinje"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Velg elementer som skal vises på verktøylinjen. Elementer kan omplasseres "
+"med dra-og-slipp."
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Tilgjengelige elementer"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Viste objekter"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Tilpass verktøylinje..."
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Redigering av verktøylinjer"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Rediger enkelt verktøylinjeoppsettet"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Slett private data"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Vask ut private data"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Vask ut følgende data:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Sist åpne _faner"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Vask ut private data ved _avslutting av Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Lagret innloggingsinformasjon og _passord"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Informasjonskapsler og nettstadsdata"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Nettstedsikoner"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr "Åpme famer"
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr "Flere åpne faner..."
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Klarer ikke å nullstille loggen: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Klarte ikke å fjerne netthistorikken: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Klarte ikke å legge til som bokmerke.%s\n"
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr "Klarte ikke å oppdatere bokmerke: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Klarte ikke å fjerne bokmerke:  %s\n"
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Ingen rot-sertifikasjonfil er tilgjengelig. SSL-sertifikatet kan ikke "
+"verifiseres."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Innstillingene kunne ikke lagres. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Papirkurven kunne ikke lagres. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+"Midori kjæsjet sist det ble åpnet. Du kan innrapportere problemet til %s."
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Endre _preferences"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Skru av all_extensions"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Vis dialog etter Midori-kræsj"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Glem eldre faner"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "Vis siste kræsj_logg"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Kjør i feilsøkingsprogram"
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "En annen instans av midori kjører allerede, men svarer ikke.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Fant ikke bokmerkene dine: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Økten kan ikke lastes inn. %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Fant ikke papirkurven din: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Fant ikke historikken din: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Følgande problem oppstod:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorér"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Kunne ikke åpne database over tillegg: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Vil du virkelig slette alle informasjonskapsels-rettigheter?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Slett alle infomasjonskapsels-rettigheter?"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Dette tiltaket vil slette alle informasjonskapsels-rettigheter. Du vil bli "
+"spurt om tilgang igjen for hver side som blir besøkt."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Behandling av informasjonskapsler"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instans av gjeldende informasjonskapselsbehandler"
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Sett opp informasjonskapselsrettigheter"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Nedenfor er alle besøkte nettsider opplistet med gjeldende praksis anført. "
+"Du kan slette praksis ved å markere oppføringene og trykke på <i>Slett</i>. "
+"Du kan også legge til en praksis for et domene manuelt ved å skrive inn "
+"ønsket domene nedenfor, velge praksis og trykke på  <i>Legg til</i>."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Praksis for informasjonskapsler fra domener som ikke er opplistet: "
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Spør om avgjørelse"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"En fatal feil inntraff, hvilket forhindrer informasjonskapselsbehandleren "
+"fra å fortsette. Du bør skru den av."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Feil i informasjonslapselsbehandler-tillegget"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+"Kunne ikke fastsette global praksis for informasjonskapsler for domenet: %s"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Til øktens ende"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Nettsiden %s ønsker å lagre %d informasjonskapsler."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Nettsiden %s ønsker å lagre en informasjonskapsel."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Flerfloldige nettsider vil tilsammen lagre %d informasjonskapsler."
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Godta"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Godta før denne _økta"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "Ne_kt"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Nekt _denne gang"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Sti"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Verdi"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Utløpsdato"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"Ingen individuelt fastsatt praksis for bruk av domener. Dette begrenser "
+"ytterligere den globale informasjonskapsels-praksisen satt i Midoris "
+"innstillinger."
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Informasjonskapsels-behandler"
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Behandle informasjonskapsler på side-for-side -basis"
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Kunne ikke innhente applikasjonsikon i %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Klarte ikke å opprette ny oppstarter (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Oppstarter opprettet"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Du kan nå kjøre <b>%s</b> fra oppstarteren din, eller menyen"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Feil ved opprettelse av oppstarter"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Applikasjoner"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Ny _profil"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Lager ny, individuell profil og oppstarter"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Ny _app"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Lager en ny app for angitt side"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Oppstartsfeil"
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Lag _oppstarter"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Behandling av nettapp-er"
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Behandle installerte nettsider som applikasjoner"
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Overføringer"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Fjern alle"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Klarte ikke å laste ned: %s"
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Åpne mål_mappe"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopier lenke_plassering"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Filen '<b>%s</b>'  har blitt lastet ned."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' og %d andre filer har blitt lastet ned."
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Overføring ferdig"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Noen filer er på vei ned"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Avslutt Midori"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Overføringene vil bli kansellert om Midori avsluttes."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Overførings-benahdler"
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Se nedlastede filer"
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Klarte ikke å oppdatere database: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Kunne ikke utføre utvalg fra database: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Klarte ikke å importere gammel økt: %s"
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Fane og økt-behandling"
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Dette tillegget gir sjekkliste for oppdateringsjobber eller gjentagende "
+"hendleser."
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Klarte ikke å legge til notat i database: %s\n"
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Klarte ikke å fjerne notat fra database: %s\n"
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Klarte ikke å omdøpe notat: %s\n"
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Klarte ikke å oppdatere notat: %s\n"
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notater"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nytt notat"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Lager nytt notat, uten relasjon til åpnede sider"
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nytt notat"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Klarte ikke å velge notater fra database: %s\n"
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Omdøp notat"
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Kopier notat til utklippstavle"
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Fjern notat"
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Kopier utvalg til notat"
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Lagre tekstutklipp fra nettsider som notater"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklame-blokkerer"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokker reklame i hendhold til filtreringsliste"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfigurer reklameblokkeringsfilter"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_okker bilde"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_okker lenke"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Rediger regel"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regel:"
index 43d96686b1c487d74d1c7f6757bd9f0a68fd5852..154f98aa737f871e290d038fcc319dddd65abd11 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
 # This file is distributed under the same license as the midori package.
 # Vincent Tunru <projects@vinnl.nl> 2008
 # Emmo, 2011-2013 (assisted by Pjotr), pjotrvertaalt@gmail.com.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-24 06:30+0000\n"
-"PO-Revision-Date: 2012-07-25 12:02+0200\n"
-"Last-Translator: Emmo (assisted by Pjotr), pjotrvertaalt@gmail.com\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:46+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Dutch (Flemish)\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-Launchpad-Export-Date: 2014-11-27 05:46+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "Language: nl (Dutch)\n"
-"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:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Verkenner"
+msgid "Web Browser"
+msgstr "Webbrowser"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori webbrowser"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "Webbrowser Midori"
+msgid "Browse the Web"
+msgstr "Surfen op het web"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nieuw privé-surfvenster"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Verkenner"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nieuw tabblad"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nieuw venster"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Webbrowser"
+msgid "New Private Browsing Window"
+msgstr "Nieuw privé-surfvenster"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori Privé-surfen"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Open een nieuw privé-surfvenster"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Privé-surfen"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Open een nieuw privé-surfvenster"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Momentopname opgeslagen in: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADRES uitvoeren als een webtoepassing"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRES"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Gebruik MAP als configuratiemap"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "MAP"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privé-surfen, veranderingen worden niet opgeslagen."
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 "Draagbare modus, alle uitvoeringsbestanden worden opgeslagen op één plek"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Standaardvenster van GTK+ met WebKit, lijkend op GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Toon een diagnostisch venster"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Draai binnen gdb en bewaar achtergrondinformatie bij een vastloper"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Voer de opgegeven bestandnaam uit als javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Maak een momentopname van de opgegeven URI"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Voer de opgegeven opdracht uit"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Lijst beschikbare opdrachten uit te voeren met -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Versie-informatie weergeven"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adressen"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blokkeer URIs die overeenstemmen met reguliere expressie PATROON"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATROON"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr ""
 "Zet Midori na SECONDEN seconden van inactiviteit, terug op de "
 "standaardwaarden"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDEN"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Fout: 'gdb' kan niet worden gevonden\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Gelieve commentaar, suggesties en fouten te melden bij:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Controleer op nieuwe versies op:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Er is een onbekende fout opgetreden"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Bladwijzers"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Bladwijzer _toevoegen"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensies"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Gebruikers_scripts"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Gebruikers_stijlen"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nieuw _tabblad"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "Bestand_overdrachten"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape-invoegtoepassingen"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Ge_sloten tabbladen"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nieuw _venster"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nieuwe _map"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adressen]"
 
@@ -232,135 +233,147 @@ msgstr "Misvormd document."
 msgid "Unrecognized bookmark format."
 msgstr "Onbekende bladwijzeropmaak."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ga naar de volgende subpagina"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Zoeken op het web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "De huidige pagina opnieuw laden"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stop met het laden van de huidige pagina"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Kon titel niet aanpassen: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Waarde '%s' is ongeldig voor %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Onverwachte configuratie-optie '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Onverwachte actie '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Privé-surfen)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nieuwe map"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Map bewerken"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Bewerk map"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nieuwe bladwijzer"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Bladwijzer bewerken"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Bewerk bladwijzer"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
+#: ../midori/midori-browser.c:1119
+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."
+"Type een naam voor de bladwijzer, en geef aan waar u hem wilt bewaren."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Toevoegen aan _snelkiezen"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Type een naam voor deze map, en kies waar je hem wilt bewaren."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Laat in de werk_balk zien"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Geef weer in bladwijzerbalk"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Uitvoeren als _webtoepassing"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Toevoegen aan _snelkiezen"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Bestand opslaan als"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Geassocieerde hulpbronnen opslaan"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Er is een nieuw venster geopend"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Er is een nieuw tabblad geopend"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Fout bij het openen van de afbeelding."
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Kan de gekozen afbeelding niet openen in een standaardkijker."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Fout bij het binnenhalen van de afbeelding."
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Kan de gekozen afbeelding niet binnenhalen."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Bestand opslaan"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Vernieuw de pagina zonder gegevensopslag"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -375,31 +388,24 @@ msgstr ""
 "Nieuwsaggregator kiezen. De volgende keer dat u het pictogram van "
 "nieuwsvoeding aanklikt, zal dit automatisch worden toegevoegd."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nieuwe voeding"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Nieuwe bladwijzer toevoegen"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Deel deze pagina"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Leeg"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Schakel tekstaanwijzer-navigatie"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -407,109 +413,99 @@ msgstr ""
 "Het indrukken van F7 schakelt de cursormodus om. Wanneer deze actief is, "
 "verschijnt er op alle websites een tekstcursor."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Cursormodus inschakelen"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Alles openen in _tabbladen"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "In nieuw _tabblad openen"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "In nieuw _venster openen"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Bladwijzers invoeren…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "Bladwijzers _invoeren"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Toepassing:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Invoeren vanuit een XBEL- of HTML-bestand"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Invoeren vanuit een bestand"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Bladwijzers invoeren mislukt"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL-bladwijzers"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape-bladwijzers"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Bladwijzers uitvoeren mislukt"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Een lichtgewicht-webbrowser."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Ga naar about:version voor informatie over de versie."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -521,369 +517,404 @@ 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:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Timo Verbeek <timoverbeek10@hotmail.com>\n"
 "Pascal De Vuyst <pascal.devuyst@gmail.com>\n"
-"Emmo / Pjotr pjotrvertaalt@gmail.com"
+"Emmo / Pjotr pjotrvertaalt@gmail.com\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Chris https://launchpad.net/~z-info-t\n"
+"  Cody Garver https://launchpad.net/~codygarver\n"
+"  Dolores Verbraeken https://launchpad.net/~barbara-verbraeken\n"
+"  Jaap Broekhuizen https://launchpad.net/~jaapz-b\n"
+"  Jaap K https://launchpad.net/~jaapkoornstra\n"
+"  Jeroen https://launchpad.net/~jjeroen\n"
+"  Kim Boram https://launchpad.net/~boramism\n"
+"  Leo https://launchpad.net/~thebrain2807\n"
+"  Leon Renkema https://launchpad.net/~leonrenkema\n"
+"  Michael Moroni https://launchpad.net/~airon90\n"
+"  Niels Avonds https://launchpad.net/~niels-avonds\n"
+"  Peter Nijssen https://launchpad.net/~ptnijssen\n"
+"  Quinten Schelfhout https://launchpad.net/~quintenschelfhout\n"
+"  Rafael Ferreira https://launchpad.net/~rafael-f-f1\n"
+"  René https://launchpad.net/~r-groothedde\n"
+"  Steven Roose https://launchpad.net/~stevenroose\n"
+"  Thomas Berends https://launchpad.net/~thomasberends\n"
+"  Tim v Herpen https://launchpad.net/~timvherpen\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  jc1 https://launchpad.net/~jc1-quebecos"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Huidig tabblad _dupliceren"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Open een nieuw venster"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Open een nieuw tabblad"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nieuw p_rivé-surfvenster"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Open een bestand"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Sla pagina op als…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Opslaan naar bestand"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Toevoegen aan _snelkiezen"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Abonneren op nieuws_voeding"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Tabblad _sluiten"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Huidig tabblad sluiten"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Venster _sluiten"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "Delen"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Huidige pagina afdrukken"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "A_lle Vensters Sluiten"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Zoek…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Zoek naar een woord of zin in deze pagina"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Vo_lgende zoeken"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Vo_rige zoeken"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Toepassingsvoorkeuren instellen"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Beeld"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Werkbalken"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Vernieuw de pagina zonder gegevensopslag"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Zoomniveau verhogen"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Zoomniveau verlagen"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codering"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "_Bron bekijken"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Cursor-surfen"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Schakel volledig-scherm-weergave"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Naar _links bladeren"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Naar _beneden bladeren"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Naar _omhoog bladeren"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Naar _rechts bladeren"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Leesbaar"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ga"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ga terug naar de vorige pagina"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ga naar de vorige subpagina"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Thuispagina"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ga naar de thuispagina"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Prullenbak leegmaken"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Tabblad _sluiten ongedaan maken"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Nieuwe _map toevoegen"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "Bladwijzers _exporteren"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importeer bladwijzers..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Zoekmachines beheren"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exporteer bladwijzers..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Beheer zoekmachines"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "Privé-gegevens _Wissen"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Wis privé data..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Pagina _inspecteren"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Vo_rig tabblad"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Vo_lgend tabblad"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Verplaats tabblad naar eerste positie"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Verplaats tabblad naar _achteren"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Verplaats tabblad naar voren"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Verplaats tabblad naar laatste positie"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Focus _huidig tabblad"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Focus _volgende weergave"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Toon alleen het Pictogram van het _Huidige Tabblad"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "Huidig tabblad _dupliceren"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "An_dere tabbladen sluiten"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Open laatste _sessie"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Veelgestelde vragen"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Meld een probleem…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Hulpmiddelen"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menubalk"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigatiebalk"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Zijbalk"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Zijbalk"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Bladwijzerbalk"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusbalk"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chinees traditioneel (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chinees vereenvoudigd (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japans (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russisch (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Westers (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Aangepast…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Kon geschiedenis niet initialiseren: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Scheidingsteken"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Locatie…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Open een specifieke locatie"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Zoeken op het _web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Doorzoek het web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Heropen een eerder gesloten tabblad of venster"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Opgeslagen bladwijzers weergeven"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "Tabbladen"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Geef een lijst van alle open tabbladen weer"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
@@ -892,36 +923,37 @@ msgstr "Menu"
 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:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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"
+msgstr ""
+"De configuratie van de extensie '%s' kon niet worden opgeslagen: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Uitvoercertificaat"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "De ondertekenende certificaatautoriteit is niet bekend."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 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 "
+"Het certificaat komt niet overeen met de verwachte identiteit van de website "
 "waar hij van is opgehaald."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Het certificaat is verlopen"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -929,40 +961,41 @@ msgstr ""
 "Het certificaat is ingetrokken volgens de intrekkingslijst voor certificaten "
 "van GTlsConnection."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Het algoritme van het certificaat wordt beschouwd als onveilig."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
-msgstr "Bij het valideren van het certificaat vond er een andere fout plaats."
+msgstr ""
+"Bij het valideren van het certificaat vond er een andere fout plaats."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Uitvoercertificaat"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Zelf-ondertekend"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Veiligheidsdetails"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Plakken en _doorgaan"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Niet geverifieerd"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Geverifieerde en versleutelde verbinding"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Open, niet-versleutelde verbinding"
 
@@ -979,438 +1012,452 @@ msgstr "Balk sluiten"
 msgid "Align sidepanel to the left"
 msgstr "Zijbalk links plaatsen"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Toon snelkeuzemenu"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Toon startpagina"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Toon laatst geopende tabbladen"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Toon laatste tabbladen zonder te laden"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Toon lege pagina"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Toon standaardzoekmachine"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Toon aangepaste pagina"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japans (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nieuw tabblad"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nieuw venster"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Huidig tabblad"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Standaard"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Kleine pictogrammen"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Pictogrammen en tekst"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekst naast pictogrammen"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatisch (GNOME of omgeving)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP proxy-server"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Geen proxy-server"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "De stijl van de werkbalk"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Altijd mijn lettertypekeuzes gebruiken"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Configuratie kon niet geladen worden: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Ongeldige configuratiewaarde '%s'"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Kon stijlvel niet toevoegen: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Toon tabblad_etiket"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Toon alleen tabblad_pictogram"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Vertrouw deze website"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Veiligheid onbekend"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s wil een HTML5-gegevensbank opslaan."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Toestaan"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s wil uw locatie weten."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Fout - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' kan niet worden gevonden"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "De pagina '%s' kan niet worden geladen"
+msgid "The page '%s' couldn't be loaded:"
+msgstr "De pagina '%s' kon niet worden geladen:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Probeer opnieuw"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Controleer het adres voor typefouten"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Zorg ervoor dat er een ethernet kabel is aangesloten, of dat de draadloze "
+"kaart is geactiveerd."
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Controleer of je netwerkinstellingen kloppen"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Opnieuw proberen"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Oei - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Er is iets fout gegaan met '%s'."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Probeer opnieuw"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Stuur een bericht naar %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Zoekmachine toevoegen"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "_Element inspecteren"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Open _Link"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Koppeling in nieuw _tabblad openen"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Koppeling in nieuw tabblad op _voorgrond openen"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Koppeling in nieuw tabblad op _achtergrond openen"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Koppeling in nieuw _venster Openen"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Koppeling als webt_oepassing openen"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Koppelingbe_stemming kopiëren"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Opslaan als..."
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Open afbeelding in nieuw venster"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Open _afbeelding in nieuw tabblad"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Afbeelding kopiëren"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "A_fbeelding opslaan"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Openen in afbeeldingkijker."
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "_Adres van video kopiëren"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "_Video opslaan"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "_Video binnenhalen"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Adres in nieuw _tabblad openen"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Zoeken _met"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Zoek op internet"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Adres in nieuw _tabblad openen"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Open omlijsting in nieuw tabblad"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "_Element inspecteren"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Bestand openen of binnenhalen vanaf %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Bestandnaam: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Bestandtype: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Bestandtype: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, 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:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Openen %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Pagina analyseren - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Geen documentatie geïnstalleerd"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori slaat geen persoonlijke gegevens op:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
-msgstr "Webgeschiedenis en webkoekjes worden niet opgeslagen."
+msgstr "Webgeschiedenis en cookies worden niet opgeslagen."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Extensies zijn uitgeschakeld."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "HTML5-opslag, plaatselijke gegevensbank en toepassingopslag zijn "
 "uitgeschakeld."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori verhindert websites om de gebruiker te volgen:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Verwijzingskoppelingen worden teruggebracht tot de hostnaam."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Vooraf DNS binnenhalen is uitgeschakeld."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 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:4511
-msgid "Page loading delayed"
-msgstr "Het laden van de pagina is vertraagd"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Pagina laden vertraagd:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Pagina laden"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Blanco pagina"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "Tabblad _dupliceren"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Toon tabblad_etiket"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Toon alleen tabblad_pictogram"
-
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Andere tabblad sluiten"
-msgstr[1] "Andere tabbladen sluiten"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "vorige"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "volgende"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Achtergrondafbeeldingen meenemen in afdrukken"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Of achtergrondafbeeldingen dienen te worden afgedrukt"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Opties"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s van %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1418,27 +1465,27 @@ msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s over"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Het binnengehaalde bestand is foutief."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1447,131 +1494,127 @@ msgstr ""
 "betekent dat het bestand waarschijnlijk incompleet is of achteraf gewijzigd "
 "werd."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
-msgstr " Het bestand '%s' kan niet worden opgeslagen in deze map."
+msgstr "Het bestand '%s' kan niet worden opgeslagen in deze map."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 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:350
+#: ../midori/midori-download.vala:371
 #, 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:352
+#: ../midori/midori-download.vala:373
 #, 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
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Snelkeuze"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klik om een sneltoets toe te voegen"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Voer adres voor sneltoets in"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Voer titel voor sneltoets in"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Opstarten"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Bij starten van Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Startpagina:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Gebruik _huidige pagina"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Gebruik de huidige pagina als startpagina"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Lettertypes"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proportionele lettertypen-familie"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Lettertype-familie met vaste breedte"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:351
 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
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimale lettertypegrootte"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "De minimale lettertypegrootte om tekst weer te geven"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Voorkeurcodering"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Gedrag"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Afbeeldingen automatisch laden"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Spellingscontrole aanzetten"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Scripts aanzetten"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "WebGL-ondersteuning inschakelen"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape-plugins uitvoeren"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Tekst en afbeeldingen zoomen"
@@ -1585,11 +1628,19 @@ 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:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Standaard zoom-niveau"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Level om nieuw geopende tabs te vergroten"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Voorkeurstalen"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1598,242 +1649,241 @@ msgstr ""
 "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:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Bewaar binnengehaalde bestanden in:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Surfen"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Stijl van de werkbalk:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Nieuwe pagina's openen in:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Nieuw tabbladgedrag:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Sluitknoppen op tabbladen"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Balk met tabbladen altijd weergeven"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Tabbladen naast het huidige tabblad openen"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Tabbladen op de achtergrond openen"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Tekstverwerker"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Nieuwsaggregator"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxyserver"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Hostnaam"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Poort"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Ondersteunde proxysoorten:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Webopslag"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identificeren als"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
-msgstr "Verwijder oude koekjes na:"
+msgstr "Verwijder oude cookies na:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
-msgstr "Alleen koekjes aanvaarden van websites die u bezoekt"
+msgstr "Alleen cookies aanvaarden van websites die u bezoekt"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
-msgstr "Blokkeer koekjes verzonden door derden"
+msgstr "Blokkeer cookies verzonden door derden"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr ""
-"Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen "
+"Cookies slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen "
 "op voor adverteerdoeleinden."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Offline webtoepassingsopslag gebruiken"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 lokale opslagondersteuning activeren"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Of de 'Referer'-koptekst moet worden verkort tot de hostnaam"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Verwijder pagina's uit de geschiedenis na:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensies"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Zoekmachines beheren"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Zoekmachine toevoegen"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Zoekmachine bewerken"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Beschrijving:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Trefwoord:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Zoekmachines beheren"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Als _standaard gebruiken"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "De zoekmachines konden niet worden geladen. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "De zoekmachines konden niet opgeslagen worden. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Geschiedenis"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bladwijzers en geschiedenis"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Kon geschiedenis niet initialiseren: %s"
+msgid "Search for %s"
+msgstr "Zoek naar %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Kon niet selecteren uit geschiedenis: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Zoek naar %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Doorzoeken met…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Zoek met %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Openen met"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Kies een toepassing of opdracht om \"%s\" te openen:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Kon extern programma niet uitvoeren."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
@@ -1858,79 +1908,136 @@ msgstr "Hoofdlettergevoelig"
 msgid "Close Findbar"
 msgstr "Zoekbalk sluiten"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Niet gelukt om bladwijzerelement toe te voegen: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d bladwijzer"
+msgstr[1] "%d bladwijzers"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d submap"
+msgstr[1] "%d submappen"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Lege map"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Map met %s en geen bladwijzer"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Map met %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Map met %s en %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bladwijzer gaat naar: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s en geen bladwijzer"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Kon bladwijzer niet bijwerken : %s\n"
+msgid "%s and %s"
+msgstr "%s en %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Geselecteerde bladwijzer bewerken"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Geselecteerde bladwijzer verwijderen"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Een nieuwe map toevoegen"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Scheidingsteken</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "In nieuw _tabblad openen"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Bladwijzers zoeken"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Geschiedenis"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Eén week geleden"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Kon element in geschiedenis niet verwijderen: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Geselecteerde element uit geschiedenis toevoegen als bladwijzer"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Geselecteerde element uit geschiedenis verwijderen"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Volledige geschiedenis wissen"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Zoekgeschiedenis"
 
@@ -1958,120 +2065,69 @@ msgstr "Wachtwoord"
 msgid "_Remember password"
 msgstr "Wachtwoord _onthouden"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Pictogram '%s' kon niet geladen worden"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Standaardpictogram '%s' kon niet geladen worden"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Animatiebeelden zijn gebroken"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Geen"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Eigenschap '%s' is ongeldig voor %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Bestand kiezen"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Map kiezen"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 uur"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dag"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 week"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 maand"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 jaar"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Voorkeuren voor %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Controlesom:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Controlesom:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configureer advertentiefilters"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 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 "
-"beschikbaar op %s."
+"Deze pagina lijkt een gebruikersscript te bevatten. Wilt u het installeren?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Regel bewerken"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regel:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Afbeelding bl_okkeren"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Koppeling bl_okkeren"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Advertentieblokkeerder"
-
-#: ../extensions/adblock.c:1926
-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
-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
-msgid "_Install user script"
-msgstr "Gebruikerscript _installeren"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "Gebruikerscript _installeren"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
@@ -2087,16 +2143,16 @@ msgstr "Gebruikersstijl _installeren"
 msgid "Don't install"
 msgstr "Niet installeren"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Gebruikersscripts"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Gebruikersopmaakprofielen"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Fout"
 
@@ -2118,85 +2174,85 @@ msgstr "Gebruikersstijl verwijderen"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Het bestand <b>'%s'</b> zal blijvend worden verwijderd."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "In tekstbewerker openen"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Bestemmingsmap openen"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Nieuwe extensie toevoegen"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Geselecteerde extensie verwijderen"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Gebruikersextensies"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Kan map '%s': %s niet bewaken"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Ondersteuning voor gebruikersscripts en -stijlen"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Gekleurde tabbladen"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Ieder tabblad verschillend tinten"
 
 #: ../extensions/cookie-manager/cookie-manager-page.c:73
 #: ../extensions/cookie-manager/main.c:35
 msgid "Cookie Manager"
-msgstr "Koekjesbeheerder"
+msgstr "Cookiebeheerder"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Alles wissen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
 msgstr ""
-"Alle weergegeven koekjes wissen. Als een filter is ingesteld zullen enkel de "
-"koekjes die overeenkomen met het filter worden gewist."
+"Alle weergegeven cookies wissen. Als een filter is ingesteld zullen enkel de "
+"cookies die overeenkomen met het filter worden gewist."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Alles uitvouwen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Alles invouwen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
-msgstr "Weet u zeker dat u alle koekjes wil wissen?"
+msgstr "Weet u zeker dat u alle cookies wil wissen?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Vraag"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
-msgstr "Enkel koekjes die overeenkomen met de filter zullen worden gewist."
+msgstr "Enkel cookies die overeenkomen met de filter zullen worden gewist."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Bij het beëindigen van de sessie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2214,43 +2270,43 @@ msgstr ""
 "<b>Vervalt</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nee"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
 "<b>Cookies</b>: %d"
 msgstr ""
 "<b>Domein</b>: %s\n"
-"<b>Koekjes</b>: %d"
+"<b>Cookies/b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Naam"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Alles _uitvouwen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Alles _invouwen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
-msgstr "Zoek koekjes op naam of domein"
+msgstr "Zoek cookies op naam of domein"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
-msgstr "Koekjes tonen en verwijderen"
+msgstr "Cookies tonen en verwijderen"
 
 #: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
@@ -2264,27 +2320,39 @@ msgstr "Kopieer adressen van tabbladen"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopieer de adressen van alle tabbladen naar het klembord"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Vertraagd laden van pagina"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Vertraging in seconden totdat de pagina wordt geladen:"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr ""
 "Vertraagd laden van pagina totdat u het tabblad daadwerkelijk gebruikt."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Er trad een fout op bij het proberen om een bestand binnen te halen met de "
-"volgende invoegtoepassing:\n"
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2324,25 +2392,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Kan vereiste Atom 'feed'-elementen niet vinden in XML-gegevens."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Laatst bijgewerkt: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Voedingen"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Nieuwe voeding toevoegen"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Voeding verwijderen"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Voedingen"
 
@@ -2361,37 +2429,37 @@ msgstr "Niet-ondersteunde voedingsopmaak."
 msgid "Failed to parse XML feed: %s"
 msgstr "Kan XML-voeding niet openen: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Kan 'kanaal'-element in RSS XML-gegevens niet vinden."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Niet-ondersteunde RSS-versie gevonden."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Kan vereiste RSS 'onderdeel'-elementen niet vinden in XML-gegevens."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Kan vereiste RSS 'kanaal'-elementen niet vinden in XML-gegevens."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Voeding '%s' bestaat reeds"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Fout bij het laden van voeding '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Werkbalk voor voedingen"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Lees Atom/RSS-voedingen"
 
@@ -2412,124 +2480,401 @@ msgstr ""
 "Een gebruikernaam en wachtwoord zijn\n"
 "vereist om deze locatie te openen:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Wachtwoord onthouden op deze pagina?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Onthouden"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Niet nu"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nooit voor deze pagina"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Schakel geschiedenis-status van formulier in of uit"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
-msgstr "Activeer of deactiveer formuliergeschiedenis voor het huidige tabblad."
-
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Kon gegevensbank niet openen: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Kan bewering van gegevensbank niet uitvoeren: %s\n"
+msgstr ""
+"Activeer of deactiveer formuliergeschiedenis voor het huidige tabblad."
 
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "Activeer formuliergeschiedenis alleen via sneltoets (Ctrl+Shift+F) per "
 "tabblad"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Formuliergeschiedenis-invuller"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Bewaart geschiedenis van ingegeven formuliergegevens"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Kon geen suggesties kiezen\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Er zijn geen onbezochte tabbladen"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Geschiedenislijst"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Gedrag bij sluiten tabblad"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Doe niets"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Overschakelen naar laatst bekeken tabblad"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Overschakelen naar nieuwste tabblad"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Laat venster op achtergrond-tabbladen opflitsen"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Volgende nieuwe tabblad (Geschiedenislijst)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Volgende nieuwe tabblad vanuit geschiedenis"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Vorige nieuwe tabblad (Geschiedenislijst)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Vorige nieuwe tabblad vanuit geschiedenis"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Toon tabblad in achtergrond (Geschiedenislijst)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Toon het thans gekozen tabblad in achtergrond"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Geschiedenislijst"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Ga naar het laatst gebruikte tabblad bij tabbladwissel of tabbladsluiting"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL mislukt: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Aanvaarden"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Aanvaarden voor sessie"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blokkeren"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Kon bewering van gegevensbank niet uitvoeren: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domein"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Beleid"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "_Alles wissen"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Onbepaald"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Reden"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Kon geen instellingenmap aanmaken voor extensie: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Kon geen instellingenmap aanmaken voor extensie."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Kon gegevensbank van extensie niet openen."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Kon geen gegevensbankstructuur opzetten van extensie."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Exemplaar van extensie"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Het Midori extensie-exemplaar voor deze extensie"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Toepassingexemplaar"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Het Midori toepassingexemplaar waar deze extensie toe behoort"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Gegevensbankexemplaar"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Pad van gegevensbank"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Muisgebaren"
@@ -2558,11 +2903,11 @@ msgstr "Sneltoetsen"
 msgid "View and edit keyboard shortcuts"
 msgstr "Sneltoetsen tonen en bewerken"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Statusbalk-klok"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Datum en tijd in de statusbalk tonen"
 
@@ -2578,6 +2923,10 @@ msgstr "Scripts"
 msgid "Netscape plugins"
 msgstr "Netscape plugins"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape-plugins uitvoeren"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Statusbalkfuncties"
@@ -2586,15 +2935,15 @@ msgstr "Statusbalkfuncties"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Eenvoudig schakelen van gedrag van webpagina's"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Tabbladwerkbalk"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "T_abbladwerkbalk"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Tabbladen in een verticale werkbalk tonen"
 
@@ -2606,11 +2955,11 @@ msgstr "Standaard alleen pictogrammen op tabbladen"
 msgid "New tabs have no label by default"
 msgstr "Nieuwe tabbladen hebben geen standaardetiket"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Werkbalk aanpassen"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2618,67 +2967,58 @@ 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:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Beschikbare elementen"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Weergegeven elementen"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Werkbalk aanpassen…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Werkbalkbewerker"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "De werkbalkvormgeving eenvoudig aanpassen"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP-communicatie op schijf opslaan"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Kon geen koekjes laden\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Wis privégegevens"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "Privégegevens _wissen"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Wis de volgende gegevens:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Laatst openstaande _tabbladen"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Privégegevens wissen bij het _afsluiten van Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Opgeslagen aanmeldingen en _wachtwoorden"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
-msgstr "Koekjes en websitegegevens"
+msgstr "Cookies en websitegegevens"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Website-pictogrammen"
 
@@ -2686,211 +3026,152 @@ msgstr "Website-pictogrammen"
 msgid "Open tabs"
 msgstr "Tabbladen openen"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Meer openstaande tabbladen..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Niet gelukt om geschiedenis te verwijderen: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Kon oude elementen in geschiedenis niet verwijderen: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "kon oude gegevensbank niet vastmaken (ATTACH)"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "kon niet invoeren vanuit oude gegevensbank"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "kon de transactie niet terugdraaien"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "kon niet loskoppelen (DETACH)"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Kon geen bladwijzertabel maken: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Niet gelukt om bladwijzerelement toe te voegen: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Kon niet invoeren vanuit oude gegevensbank: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Bijwerken mislukt van bladwijzer: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "De bladwijzers konden niet opgeslagen worden. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Verwijderen mislukt van bladwijzer: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "Geen root-certificaatbestand aanwezig. SSL-certificaten kunnen niet worden "
 "geverifieerd."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "De instellingen konden niet worden opgeslagen. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "De sessie kon niet geladen worden: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "De sessie kon niet worden opgeslagen. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "De prullenbak kon niet worden opgeslagen. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
-msgstr ""
-"Midori schijnt te zijn vastgelopen, de laatste keer dat hij werd geopend. "
-"Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het "
-"probleem op te lossen."
+msgstr "Midori is de laatste keer vastgelopen. Dit kun je rapporteren op %s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "_Voorkeuren wijzigen"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Schakel alle _extensies uit"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Toon een dialoogvenster nadat Midori is vastgelopen"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Verwijder oude tabbladen"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Toon nieuwste vastloperslogboek"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Draai in foutopsporingsmodus"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Een exemplaar van Midori is al actief maar reageert niet.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "De bladwijzers konden niet worden geladen: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "De sessie kon niet geladen worden: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "De prullenbak kon niet geladen worden: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "De geschiedenis kon niet geladen worden: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "De volgende fouten hebben plaatsgevonden:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Negeren"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL mislukt: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Aanvaarden"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Aanvaarden voor sessie"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Blokkeren"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Kon gegevensbank van extensie niet openen: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Kon bewering van gegevensbank niet uitvoeren: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
-msgstr "Weet u zeker dat u alle koekjespermissies wil verwijderen?"
+msgstr "Weet u zeker dat u alle cookie permissies wil verwijderen?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr "Alle koekjespermissies verwijderen?"
+msgstr "Alle cookie permissies verwijderen?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
-"Deze actie zal alle koekjespermissies verwijderen. U zult opnieuw gevraagd "
-"worden naar permissies bij elke webstek die u bezoekt."
+"Deze actie zal alle cookie permissies verwijderen. U zult opnieuw gevraagd "
+"worden naar permissies bij elke website die u bezoekt."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
-msgstr "Koekjespermissiebeheerder"
+msgstr "Cookie permissiebeheerder"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
-msgstr "Exemplaar van huidige koekjespermissiebeheerder"
+msgstr "Exemplaar van huidige cookie permissiebeheerder"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
-msgstr "Koekjespermissie instellen"
+msgstr "Cookie permissie instellen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2904,1022 +3185,348 @@ msgstr ""
 "voor een domein, door hieronder het domein in te voeren, het beleid te "
 "kiezen en te klikken op <i>Toevoegen</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domein"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Beleid"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "_Alles wissen"
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Vraag naar beleid indien onbekend voor een domein"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
 msgstr ""
-"Er is een fatale fout opgetreden die de koekjespermissiebeheerder verhindert "
+"Er is een fatale fout opgetreden die de cookie permissiebeheerder verhindert "
 "om door te gaan. U zou hem moeten uitschakelen."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
-msgstr "Fout in extensie van koekjespermissiebeheerder"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Reden"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Kon geen instellingenmap aanmaken voor extensie: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Kon geen instellingenmap aanmaken voor extensie."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Kon gegevensbank van extensie niet openen."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Kon geen gegevensbankstructuur opzetten van extensie."
+msgstr "Fout in extensie van cookie permissiebeheerder"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
-"Kon de algemene koekjespolitiek niet bepalen die ingesteld moet worden voor "
-"het domein: %s"
+"Kon de cookie policy niet bepalen die ingesteld moet worden voor het domein: "
+"%s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Tot einde van sessie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
-msgstr "De webstek %s wil %d koekjes opslaan."
+msgstr "De website %s wil %d cookies opslaan"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
-msgstr "De webstek %s wil een koekje opslaan."
+msgstr "De website %s wil een koekje opslaan."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr "Meerdere webstekken willen in totaal %d koekjes opslaan."
+msgstr "Meerdere websites willen in totaal %d cookies opslaan."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Aanvaarden"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Aanvaard voor deze sessie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Weigeren"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Weiger dit keer"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Pad"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Waarde"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Verloopdatum"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Exemplaar van extensie"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Het Midori extensie-exemplaar voor deze extensie"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie veiligheidbeheerder"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Toepassingexemplaar"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Beheer cookie permissie per website"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Het Midori toepassingexemplaar waar deze extensie toe behoort"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Verkrijgen van applicatie-icoon mislukt in %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Gegevensbankexemplaar"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
-"Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Pad van gegevensbank"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Launcher aangemaakt"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-"Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Je kunt nu <b>%s</b> opstarten vanuit je launcher of menu"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Vraag naar onbekend beleid"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Fout tijdens aanmaken launcher"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"Indien waar, zal deze extensie vragen naar beleid voor elk onbekend domein. "
-"Indien onwaar, zal deze extensie het algemene koekjesbeleid hanteren dat is "
-"vastgelegd in de instellingen van Midori."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Toepassingen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Onbepaald"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Nieuw profiel"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Koekjesveiligheidbeheerder"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Maakt een nieuw, zelfstandig profiel en een launcher aan"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "Beheer koekjespermissie per webstek"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nieuwe app"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Toepassingen"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Maakt een nieuwe app voor een bepaalde website"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Opstarten mislukt"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Maak _starter"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Webtoepassingenbeheerder"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Beheer websites die geïnstalleerd zijn als toepassingen"
 
-#: ../extensions/transfers.vala:89
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "Overdrachten"
 
-#: ../extensions/transfers.vala:102 ../extensions/transfers.vala:365
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Alles wissen"
 
-#: ../extensions/transfers.vala:196
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Open bestemmings_map"
 
-#: ../extensions/transfers.vala:203
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Kopieer _koppelingsverwijzing"
 
-#: ../extensions/transfers.vala:428
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Het bestand <b>'%s'</b> is binnengehaald."
 
-#: ../extensions/transfers.vala:429
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' en %d andere bestanden zijn gedownload."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Overdracht compleet"
 
-#: ../extensions/transfers.vala:456 ../extensions/transfers.vala:457
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Sommige bestanden worden binnengehaald"
 
-#: ../extensions/transfers.vala:459
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "Midori _afsluiten"
 
-#: ../extensions/transfers.vala:461
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr ""
 "De bestandoverdrachten zullen worden geannuleerd als Midori wordt afgesloten."
 
-#: ../extensions/transfers.vala:508
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Overdrachtbeheerder"
 
-#: ../extensions/transfers.vala:509
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Toon binnengehaalde bestanden"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Klikken met middelste muisknop opent selectie"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Een adres vanuit de selectie laden met middelste muisknop"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "Kon geen pad verkrijgen naar instellingen van extensie: pad is NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Kon geen pad verkrijgen naar instellingen van extensie"
-
-#~ msgid "Custom..."
-#~ msgstr "Aangepast…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Bevestig opslaan van koekje"
-
-#~ msgid "_Details"
-#~ msgstr "_Details"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Hoe zich te identificeren op webpagina's"
-
-#~ msgid "Writing failed."
-#~ msgstr "Schrijven is mislukt."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Kinetisch bladeren"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid"
-
-#~ msgid "_Window"
-#~ msgstr "_Venster"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Voeg snelkoppeling toe op _bureaublad"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Verwijst terminalwaarschuwingen naar de opgegeven BESTANDNAAM"
-
-#~ msgid "FILENAME"
-#~ msgstr "BESTANDNAAM"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Overeenkomsten markeren"
-
-#~ 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 "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 specified configuration folder is invalid."
-#~ msgstr "De gespecifieerde configuratiemap is ongeldig."
-
-#~ msgid "Cookies"
-#~ msgstr "Koekjes"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'Flits'-koekjes"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 _gegevensbanken"
-
-#~ msgid "Offline Application Cache"
-#~ msgstr "Offline toepassingopslag"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Lichtgewicht webbrowser"
-
-#~ msgid "Not available: %s"
-#~ msgstr "Niet beschikbaar: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Bronbestanden niet geïnstalleerd"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Geen privégegevens opslaan tijdens het surfen"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Voeg snelkoppeling toe aan snelkiezen"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Voeg snelkoppeling toe op bureaublad"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Maak een starter"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Abonneren op deze nieuwsvoeding"
-
-#~ msgid "Close this window"
-#~ msgstr "Dit venster sluiten"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Sluit alle openstaande vensters"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Maak de laatste wijziging ongedaan"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "De laatste wijziging opnieuw uitvoeren"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Geselecteerde tekst knippen"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Geselecteerde tekst kopiëren"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Tekst van het klembord plakken"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Geselecteerde tekst verwijderen"
-
-#~ msgid "Select all text"
-#~ msgstr "Alle tekst selecteren"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Volgende vóórkomen van een woord of zin opzoeken"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Vorige vóórkomen van een woord of zin opzoeken"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Zoomniveau op beginwaarde"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Broncode van deze pagina bekijken"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Naar links bladeren"
-
-#~ msgid "Scroll down"
-#~ msgstr "Naar beneden bladeren"
-
-#~ msgid "Scroll up"
-#~ msgstr "Naar omhoog bladeren"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Naar rechts bladeren"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Verwijder de inhoud van de prullenbak"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Open het laatst gesloten tabblad"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Nieuwe bladwijzermap toevoegen"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Privé-gegevens wissen…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Inspecteer paginadetails en gebruik ontwikkelaarsgereedschappen…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Overschakelen naar het vorige tabblad"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Overschakelen naar het volgende tabblad"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Verplaats tabblad achter het vorige tabblad"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Verplaats tabblad voor het volgende tabblad"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Focus op huidig tabblad"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Wissel voortdurend focus tussen weergaven"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Toon alleen het pictogram van het huidige tabblad"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Het huidige tabblad dupliceren"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Sluit alle tabbladen behalve het huidige tabblad"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Open tabbladen die werden bewaard in de laatste sessie"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Veelgestelde vragen weergeven"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Open Midori's foutmelder"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Informatie over dit programma weergeven"
-
-#~ msgid "Show menubar"
-#~ msgstr "Menubalk weergeven"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Navigatiebalk weergeven"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "_Zijbalk weergeven"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Bladwijzerbalk weergeven"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Statusbalk weergeven"
-
-#~ msgid "No filename specified"
-#~ msgstr "Geen bestandnaam opgegeven"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Stel aantal kolommen en rijen in"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Voer aantal kolommen en rijen in:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Ongeldige invoer voor de grootte van de snelkeuze"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Grootte miniatuurafbeelding:"
-
-#~ msgid "Small"
-#~ msgstr "Klein"
-
-#~ msgid "Medium"
-#~ msgstr "Middelmatig"
-
-#~ msgid "Big"
-#~ msgstr "Groot"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configureer _advertentiefilters…"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Niet gevonden - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Het document kan niet worden weergegeven"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Handhaven van 96 dpi"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Een videoresolutie van 96 dpi handhaven"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Wissel tussen tabbladen met Ctrl+Tab gesorteerd op laatste gebruik"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% geladen"
-
-#~ msgid "Quit the application"
-#~ msgstr "Toepassing afsluiten"
-
-#~ msgid "_Contents"
-#~ msgstr "_Inhoud"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Documentatie weergeven"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Bestandsoverdrachten-balk weergeven"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Recent bezochte pagina's"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Eerder bezochte pagina's heropenen"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Kon bewering van gegevensbank niet uitvoeren:\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Gekozen werkbalk losmaken van venster"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Bedieningselementen verbergen"
-
-#~ msgid "All cookies"
-#~ msgstr "Alle koekjes"
-
-#~ msgid "Session cookies"
-#~ msgstr "Sessiekoekjes"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Bestandsoverdrachten-balk weergeven"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Of de statusbalk dient te worden weergeven"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Toon voortgang in locatieveld"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Of laadvoortgang getoond dient te worden in het locatieveld"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Zoekmachines tonen bij ingave in locatieveld"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr ""
-#~ "Of zoekmachines bij de locatieveld-aanvulling dienen te worden getoond"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Toon bedieningselementen van de werkbalk"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Of bedieningselementen van de werkbalk moeten worden weergegeven"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Toon snelkiezen in nieuwe tabbladen"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Toon snelkiezen in nieuw geopende tabbladen"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Vraag naar de doelmap"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr ""
-#~ "Of naar de doelmap moet worden gevraagd bij het binnenhalen van een "
-#~ "bestand"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr ""
-#~ "Of een melding dient te worden getoond als een overdracht is voltooid"
-
-#~ msgid "Download Manager"
-#~ msgstr "Downloadbeheerder"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Externe pagina's openen in:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Waar externe pagina's geopend moeten worden"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Welke soorten koekies aanvaard moeten worden"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Alleen oorspronkelijke koekjes"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maximale leeftijd van koekjes"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Laatst bezochte pagina's onthouden"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Laatst bezochte pagina's onthouden"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Dagen in geschiedenis"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Laatst binnengehaalde bestanden onthouden"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Of de laatst binnengehaalde bestanden opgeslagen zijn"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "De proxyserver automatisch detecteren"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr ""
-#~ "Of de proxyserver automatisch gedetecteerd moet worden vanuit de omgeving"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Koppelingslocatie opslaan"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "Koppelingsbestemming _binnenhalen"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Binnenhalen met downloadbeheerder"
-
-#~ msgid "Download I_mage"
-#~ msgstr "A_fbeelding binnenhalen"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "Tabblad _herstellen"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "Tabblad _minimaliseren"
-
-#~ msgid "General"
-#~ msgstr "Algemeen"
-
-#~ msgid "Appearance"
-#~ msgstr "Weergave"
-
-#~ msgid "Font settings"
-#~ msgstr "Lettertype instellingen"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Spellingcontrole"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Spellingswoordenboeken:"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Een door komma's gescheiden lijst van talen voor spellingscontrole, "
-#~ "bijvoorbeeld \"en_GB,de_DE\""
-
-#~ msgid "Interface"
-#~ msgstr "Gebruikersomgeving"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Navigatiebalk"
-
-#~ msgid "External applications"
-#~ msgstr "Externe toepassingen"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Koekjes"
-
-#~ msgid "Console"
-#~ msgstr "Terminalvenster"
-
-#~ msgid "Copy _All"
-#~ msgstr "Kopieer _alle"
-
-#~ msgid "Copy All"
-#~ msgstr "Kopieer alle"
-
-#~ msgid "Erroneous clock time"
-#~ msgstr "Foutieve kloktijd"
-
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr ""
-#~ "De kloktijd ligt in het verleden. Controleer a.u.b. de huidige datum en "
-#~ "tijd."
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Kopieer %s naar de map %s."
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Koekjesbeheerder"
-
-#~ msgid "Pageholder"
-#~ msgstr "Paginavak"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Paginavak"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Een of meerdere pagina's open houden parallel met uw tabbladen"
-
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Kan de tijd niet verkrijgen: %s\n"
-
-#~ msgid "Open _Link"
-#~ msgstr "_Koppeling openen"
-
-#~ msgid "_Quick Find"
-#~ msgstr "_Snelzoeken"
-
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Snel naar een woord of zin springen"
-
-#~ msgid "View Selection Source"
-#~ msgstr "Bron van selectie bekijken"
-
-#~ msgid "Both"
-#~ msgstr "Beide"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Beide horizontaal"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Laden bij opstarten"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Laatst ingevoerde gegevens in formulieren onthouden"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Of de laatst ingevoerde gegevens in formulieren worden onthouden"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Opslaggrootte"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Toegestane grootte voor de opslag"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Source"
-#~ msgstr "Bron"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "De tekencodering om standaard te gebruiken"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Afbeeldingen automatisch verkleinen"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Schaalbare tekstvlakken"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Laatst bezochte pagina's onthouden"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Ontwikkelaargereedschappen aanzetten"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Pictogram (naam of bestand):"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Manage search engines"
-#~ msgstr "Zoekmachines beheren"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Waarschuwing: u bent ingelogd als beheerder (root)!"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s heeft geen eigenschap '%s'"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s kan niet toegewezen worden aan %s.%s"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s is niet toegankelijk"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "_Disable"
-#~ msgstr "_Uitschakelen"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Plugins"
-#~ msgstr "Plugins"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Root"
-#~ msgstr "Hoofdmap"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Advertentieblokkeerder"
 
-#~ msgid "[URIs]"
-#~ msgstr "[URI's]"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokkeer advertenties volgens filterlijst"
 
-#~ msgid "URIs"
-#~ msgstr "URI's"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configureer advertentiefilters"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Afbeelding bl_okkeren"
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "URL in nieuw _tabblad openen"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Koppeling bl_okkeren"
 
-#~ msgid "Last pageholder URI"
-#~ msgstr "Laatst gebruikte URI in het paginavak"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Regel bewerken"
 
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "Laatst gebruikte URI in het paginavak"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regel:"
diff --git a/po/nn.po b/po/nn.po
new file mode 100644 (file)
index 0000000..f8dd01c
--- /dev/null
+++ b/po/nn.po
@@ -0,0 +1,3429 @@
+# Norwegian Nynorsk translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-05-21 09:38+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Norwegian Nynorsk <nn@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Nettlesar"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Nettlesar"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Surf på nettet"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internett;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Ny fane"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nytt vindauge"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nytt vindauge i privatmodus"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Privatmodus"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privatmodus"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Åpne eit nytt vindauge i privatmodus"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Stilbilde lagra i: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Køyr ADRESSE som nettapplikasjon"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADDRESSE"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Bruk MAPPE som konfigurasjonsmappe"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "MAPPE"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Privatmodus, ingen ting vert lagra"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Vis ein diagnostisk dialog"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Køyr eit bestemt filnamn som javascript"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Ta ein skjermdump av denne URLen"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Køyr ein bestemt kommando"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Vis dei tilgjengelige kommandoane som kan køyrast med -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Vis programversjon"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adresser"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Steng URLar i følge det vanlege utrykket MØNSTER"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "MØNSTER"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Reset Midori etter SECONDS sekund utan bruk"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKUNDAR"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Rapporter problem som du støter på til:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Leit etter ein ny versjon på:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Ein ukjend feil oppstod"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bokmerke"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Legg til eit bok_merke"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Utvidelsar"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historikk"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Brukarscript"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Brukar_stil"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Ny _fane"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Overføringar"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Utvidel_sar for Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Lukka faner"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nytt _vindauge"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Ny _mappe"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresser]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Fann ikkje fil."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Dokumentet kjem frå ein mal."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Gjenkjente ikkje formatet for dette bokmerket."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Last denne sida inn på nytt"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Stopp å laste denne sida"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Klarte ikkje å oppdatere tittelen: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Verdien '%s' er invalid for %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Uventa handling '%s'"
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Privatmodus)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bokmerke"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Legg til i _Hurtigval"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Lagra fila som"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Lagra dei _ressursane som liknar"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Eit nytt vindauge har blitt opna"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Ei ny fane har blitt opna."
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Eit problem oppsto under opninga av biletet."
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Kunne ikkje opne dette biletet i framvisaren."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Eit problem oppsto under nedlastinga av biletet!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Kan ikkje lasta ned dette biletet."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Lagra fil"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Opna fil"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Martin Myrvold https://launchpad.net/~myrvold-martin\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Vis dei siste opne fanane"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Vis dei siste fanane utan å laste dei"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Konfigurasjonen kunne ikkje opnast: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Konfigurasjonsverdien '%s' er invalid"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Kunne ikkje lagra fila \"%s\" i denne mappa."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Du har ikkje rettigheitar til å endre på denne plassen."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Det er ikkje nok ledig plass til å laste ned \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Fila treng %s men det er kun att %s."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Mellomlager for nett"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Personvern"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Cookies lagrar innloggingsdata, spel eller brukarprofilar for "
+"annonseringsformål."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Utvidingar"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Søkemotorane kunne ikkje opnast. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Kunne ikkje lagra søkemotorane. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Lagra innloggingsinformasjon og _passord"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies og nettstadsdata"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Nettstadsikon"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Klarte ikkje å fjerne netthistorien: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Klarte ikkje å fjerne netthistorikken: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Rootserfikatet er ikkje tilgjengelig. Kunne ikkje bekrefta SSL sertifikatet."
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Kunne ikkje lagra konfigurasjonsfila. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Kunne ikkje lagra innhaldet i papirkurven. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Endre _innstillingar"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Slå sv alle_utvidingar"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Kast gamle faner"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Eit anna vindauge av Midori køyrer allereie, utan å fungere.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Fann ikkje bokmerkene dine: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Kunne ikkje lasta økta: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Fann ikkje papirkorga di: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Fann ikkje historien din: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Dei følgande problema oppstod:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index e19ed81942b4fc04858eda1e4d5623715fcb2783..4c338878fef48214ddea0b588d498740f71bd9f9 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -8,1913 +8,1983 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 23:58+0200\n"
-"PO-Revision-Date: 2009-11-01 20:08+0100\n"
-"Last-Translator: Olav Andreas Lindekleiv <olalinde@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-07-09 16:39+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Norsk Bokmål <olalinde@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Lettvektig nettleser"
-
-#: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1343
-#: ../midori/main.c:1517
-#: ../midori/main.c:1525
-#: ../midori/main.c:1536
-#: ../midori/midori-websettings.c:287
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:2
 msgid "Web Browser"
 msgstr "Nettleser"
 
-#: ../midori/main.c:96
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Innstillingen kunne ikke lastes: %s\n"
-
-#: ../midori/main.c:151
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Verdien '%s' er ikke gyldig for %s"
-
-#: ../midori/main.c:158
-#: ../midori/main.c:238
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Ugyldig innstillingsverdi '%s'"
-
-#: ../midori/main.c:350
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Klarte ikke åpne databasen: %s\n"
-
-#: ../midori/main.c:382
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Klarte ikke kjøre databaseuttrykk: %s\n"
-
-#: ../midori/main.c:436
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Klarte ikke fjerne historikkelementet: %s\n"
-
-#: ../midori/main.c:460
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Klarte ikke tømme historikken: %s\n"
-
-#: ../midori/main.c:483
-#: ../midori/main.c:517
-#: ../midori/main.c:533
-#, c-format
-msgid "Failed to add history item: %s\n"
-msgstr "Klarte ikke legge til historikkelementet: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:712
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Klarte ikke fjerne gamle historikkelementer: %s\n"
-
-#: ../midori/main.c:741
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Innstillingen kan ikke lagres. %s"
-
-#: ../midori/main.c:779
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "Søkemotorene kan ikke lagres. %s"
-
-#: ../midori/main.c:798
-#: ../midori/main.c:826
-#: ../midori/main.c:855
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Bokmerkene kan ikke lagres. %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
 
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:878
-#: ../midori/main.c:901
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Papirkurven kan ikke lagres. %s"
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
 
-#: ../midori/main.c:974
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sesjonen kan ikke lagres. %s"
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+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 "Det ser ut til at Midori kan ha kræsjet forrige gang den kjørte. Hvis dette skjer ofte, prøv en av følgende valg for å løse problemet"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
 
-#: ../midori/main.c:1116
-msgid "Modify _preferences"
-msgstr "Endre _innstillinger"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
 
-#: ../midori/main.c:1120
-msgid "Reset the last _session"
-msgstr "Restart siste _sesjon"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
 
-#: ../midori/main.c:1125
-msgid "Disable all _extensions"
-msgstr "Slå av alle _utvidelser"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1343
-msgid "No filename specified"
-msgstr "Ingen filnavn oppgitt"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1366
-msgid "An unknown error occured."
-msgstr "Det skjedde en ukjent feil."
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
 
-#: ../midori/main.c:1398
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Øyeblikksbilde lagret til: %s\n"
 
-#: ../midori/main.c:1447
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Kjør ADRESSE som et webprogram"
 
-#: ../midori/main.c:1447
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: ../midori/main.c:1449
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Bruk MAPPE som innstillingsmappe"
 
-#: ../midori/main.c:1449
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "MAPPE"
 
-#: ../midori/main.c:1451
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Kjør det anngitte filnavn som javascript"
 
-#: ../midori/main.c:1454
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Ta et øyeblikksbilde av den oppgitte URI"
 
-#: ../midori/main.c:1457
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Kjør den angitte kommandoen"
 
-#: ../midori/main.c:1459
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Vis programversion"
 
-#: ../midori/main.c:1461
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../midori/main.c:1514
-msgid "[Addresses]"
-msgstr "[Adresser]"
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
 
-#: ../midori/main.c:1537
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Vennligst rapporter kommentarer, forslag og feil til:"
 
-#: ../midori/main.c:1539
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Se etter nye versjoner på:"
 
-#: ../midori/main.c:1619
-msgid "The specified configuration folder is invalid."
-msgstr "Den angitte konfigurasjonsmappen er ugyldig."
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
 
-#: ../midori/main.c:1655
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "En instans av Midori kjører allerede, men svarer ikke.\n"
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Bokmerker"
 
-#: ../midori/main.c:1715
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Søkemotorene kan ikke lastes inn. %s\n"
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Legg til bokmer_ke"
 
-#: ../midori/main.c:1727
-#, c-format
-msgid "The bookmarks couldn't be loaded: %s\n"
-msgstr "Bokmerkene kan ikke lastes inn: %s\n"
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Utvidelser"
 
-#: ../midori/main.c:1742
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sesjonen kan ikke lastes inn: %s\n"
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historikk"
 
-#: ../midori/main.c:1755
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Papirkurven kan ikke lastes inn: %s\n"
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Brukerskripts"
 
-#: ../midori/main.c:1768
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Historikken kan ikke lastes inn: %s\n"
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Bruker_stiler"
 
-#: ../midori/main.c:1780
-msgid "The following errors occured:"
-msgstr "Følgende feil oppstod:"
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Ny _fane"
 
-#: ../midori/main.c:1796
-msgid "_Ignore"
-msgstr "_Ignorer"
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Nedlastinger"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape-u_tvidelser"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Lukk fane"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Nytt _vindu"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresser]"
 
-#: ../midori/midori-array.c:250
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Fil ble ikke funnet."
 
-#: ../midori/midori-array.c:258
-#: ../midori/midori-array.c:267
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Feil med dokument."
 
-#: ../midori/midori-array.c:429
-#: ../midori/sokoke.c:694
-#, c-format
-msgid "Writing failed."
-msgstr "Skriving feilet."
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Gå til neste side"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
 
-#: ../midori/midori-browser.c:307
-#: ../midori/midori-browser.c:4229
-#: ../midori/midori-browser.c:4235
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Oppdater denne siden"
 
-#: ../midori/midori-browser.c:318
-#: ../midori/midori-browser.c:4232
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stopp innlastingen av denne siden"
 
-#: ../midori/midori-browser.c:409
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Verdien '%s' er ikke gyldig for %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
-msgid "%d%% loaded"
-msgstr "%d%% lastet"
+msgid "Unexpected setting '%s'"
+msgstr "Uventet innstilling '%s'"
 
-#: ../midori/midori-browser.c:434
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Uventet handling '%s'."
 
-#: ../midori/midori-browser.c:616
-msgid "New folder"
-msgstr "Ny mappe"
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:616
-msgid "Edit folder"
-msgstr "Rediger mappe"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:618
-msgid "New bookmark"
-msgstr "Nytt bokmerke"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Bokmerker"
 
-#: ../midori/midori-browser.c:618
-msgid "Edit bookmark"
-msgstr "Rediger bokmerke"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:648
-msgid "_Title:"
-msgstr "_Tittel:"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:661
-#: ../midori/midori-searchaction.c:952
-msgid "_Description:"
-msgstr "_Beskrivelse:"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:680
-#: ../midori/midori-searchaction.c:966
-#: ../extensions/feed-panel/main.c:343
-msgid "_Address:"
-msgstr "_Adresse:"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:699
-msgid "_Folder:"
-msgstr "_Mappe:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:704
-#: ../midori/midori-browser.c:745
-msgid "Toplevel folder"
-msgstr "Øverste mappe"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
 
-#: ../midori/midori-browser.c:821
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Lagre fil som"
 
-#: ../midori/midori-browser.c:1172
-#, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Filen '<b>%s</b>' har blitt lastet ned."
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
 
-#: ../midori/midori-browser.c:1176
-msgid "Transfer completed"
-msgstr "Overføring er ferdig"
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
 
-#: ../midori/midori-browser.c:1317
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Lagre fil"
 
-#: ../midori/midori-browser.c:1984
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../midori/midori-browser.c:3430
-#: ../panels/midori-bookmarks.c:781
-#: ../panels/midori-history.c:812
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Ny nyhetsstrøm"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Legg til nytt bokmerke"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Tom"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Åpne alt i _faner"
 
-#: ../midori/midori-browser.c:3437
-#: ../panels/midori-bookmarks.c:787
-#: ../panels/midori-history.c:818
-#: ../extensions/feed-panel/feed-panel.c:542
-msgid "Open in New _Tab"
-msgstr "Åpne i ny _fane"
-
-#: ../midori/midori-browser.c:3440
-#: ../panels/midori-bookmarks.c:789
-#: ../panels/midori-history.c:820
-#: ../extensions/feed-panel/feed-panel.c:544
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
 
-#: ../midori/midori-browser.c:3750
-msgid "Clear Private Data"
-msgstr "Slett private data"
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
 
-#: ../midori/midori-browser.c:3754
-msgid "_Clear private data"
-msgstr "_Slett private data"
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
 
-#: ../midori/midori-browser.c:3767
-msgid "Clear the following data:"
-msgstr "Slett følgende data:"
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
 
-#: ../midori/midori-browser.c:3777
-#: ../midori/midori-preferences.c:671
-#: ../panels/midori-history.c:108
-msgid "History"
-msgstr "Historikk"
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
 
-#: ../midori/midori-browser.c:3782
-msgid "Cookies"
-msgstr "Cookies"
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
 
-#: ../midori/midori-browser.c:3787
-msgid "'Flash' Cookies"
-msgstr "'Flash' cookies"
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
 
-#: ../midori/midori-browser.c:3792
-msgid "Website icons"
-msgstr "Nettsideikoner"
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
 
-#: ../midori/midori-browser.c:3797
-#: ../midori/sokoke.c:868
-msgid "_Closed Tabs"
-msgstr "_Lukk fane"
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3805
-msgid "Clear private data when _quitting Midori"
-msgstr "_Slett private data når Midori _avsluttes"
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
 
-#: ../midori/midori-browser.c:3889
-msgid "A lightweight web browser."
-msgstr "En lettvektig nettleser"
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
 
-#: ../midori/midori-browser.c:3897
-msgid "translator-credits"
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
 msgstr ""
-"Olav Andreas Lindekleiv <olalinde@gmail.com>\n"
-"\n"
-"Kontakt og mer info: http://lindekleiv.com/"
 
-#: ../midori/midori-browser.c:4163
-msgid "_File"
-msgstr "_Fil"
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
 
-#: ../midori/midori-browser.c:4165
-#: ../midori/sokoke.c:869
-msgid "New _Window"
-msgstr "Nytt _vindu"
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "En lettvektig nettleser"
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Olav Andreas Lindekleiv <olalinde@gmail.com>\n"
+"\n"
+"Kontakt og mer info: http://lindekleiv.com/\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Olav Andreas Lindekleiv https://launchpad.net/~lindekleiv\n"
+"  Olav Andreas Lindekleiv https://launchpad.net/~olalinde\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
 
-#: ../midori/midori-browser.c:4166
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Fil"
+
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Åpne nytt vindu"
 
-#: ../midori/midori-browser.c:4169
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Åpne ny fane"
 
-#: ../midori/midori-browser.c:4172
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ../midori/midori-browser.c:4175
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Lagre til fil"
 
-#: ../midori/midori-browser.c:4177
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Legg til Speed _dial"
 
-#: ../midori/midori-browser.c:4178
-msgid "Add shortcut to speed dial"
-msgstr "Legg til snarvei på Speed dial"
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
 
-#: ../midori/midori-browser.c:4180
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Lukk fane"
 
-#: ../midori/midori-browser.c:4181
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Lukk denne fanen"
 
-#: ../midori/midori-browser.c:4183
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Lu_kk vindu"
 
-#: ../midori/midori-browser.c:4184
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ../midori/midori-browser.c:4187
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Skriv ut denne siden"
 
-#: ../midori/midori-browser.c:4190
-msgid "Quit the application"
-msgstr "Avslutt programmet"
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
 
-#: ../midori/midori-browser.c:4192
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../midori/midori-browser.c:4195
-msgid "Cut the selected text"
-msgstr "Klipp ut markert tekst"
-
-#: ../midori/midori-browser.c:4198
-#: ../midori/midori-browser.c:4201
-msgid "Copy the selected text"
-msgstr "Kopier markert tekst"
-
-#: ../midori/midori-browser.c:4204
-msgid "Paste text from the clipboard"
-msgstr "Lim inn"
-
-#: ../midori/midori-browser.c:4207
-msgid "Delete the selected text"
-msgstr "Slett markert tekst"
-
-#: ../midori/midori-browser.c:4210
-msgid "Select all text"
-msgstr "Marker hele teksten"
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
 
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Finn et ord eller en frase fra siden"
 
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Finn _neste"
 
-#: ../midori/midori-browser.c:4216
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Finn neste forekomst av et ord eller frase"
-
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Finn _forrige"
 
-#: ../midori/midori-browser.c:4219
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Finn forrige forekomst av et ord eller frase"
-
-#: ../midori/midori-browser.c:4223
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Endre programvalg"
 
-#: ../midori/midori-browser.c:4225
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Vis"
 
-#: ../midori/midori-browser.c:4226
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Verktøymenyer"
 
-#: ../midori/midori-browser.c:4238
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Mer zoom"
 
-#: ../midori/midori-browser.c:4241
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Mindre zoom"
 
-#: ../midori/midori-browser.c:4244
-msgid "Reset the zoom level"
-msgstr "Nullstill zoom"
-
-#: ../midori/midori-browser.c:4245
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodning"
 
-#: ../midori/midori-browser.c:4247
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Vis _kilde"
 
-#: ../midori/midori-browser.c:4248
-msgid "View the source code of the page"
-msgstr "Vis kildekode for siden"
-
-#: ../midori/midori-browser.c:4250
-msgid "View Selection Source"
-msgstr "Vis kilde for markert område"
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
 
-#: ../midori/midori-browser.c:4251
-msgid "View the source code of the selection"
-msgstr "Vis kildekode for markert område"
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
 
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Slå av/på fullskjermvisning"
 
-#: ../midori/midori-browser.c:4257
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../midori/midori-browser.c:4260
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Gå til forrige side"
 
-#: ../midori/midori-browser.c:4263
-msgid "Go forward to the next page"
-msgstr "Gå til neste side"
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Hjemmeside"
 
-#: ../midori/midori-browser.c:4266
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Gå til hjemmesiden din"
 
-#: ../midori/midori-browser.c:4268
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: ../midori/midori-browser.c:4269
-msgid "Delete the contents of the trash"
-msgstr "Slett innhold i papirkurven"
-
-#: ../midori/midori-browser.c:4271
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Angre _lukking av fane"
 
-#: ../midori/midori-browser.c:4272
-msgid "Open the last closed tab"
-msgstr "Åpne forrige fane du lukket"
-
-#: ../midori/midori-browser.c:4276
-#: ../panels/midori-bookmarks.c:231
-msgid "Add a new bookmark"
-msgstr "Legg til nytt bokmerke"
-
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Legg til ny _mappe"
 
-#: ../midori/midori-browser.c:4279
-msgid "Add a new bookmark folder"
-msgstr "Legg til ny bokmerkemappe"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:4281
-#: ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Håndter søkemotorer"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:4282
-msgid "Add, edit and remove search engines…"
-msgstr "Legg til, endre og fjern søkemotorer…"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:4285
-msgid "_Clear Private Data"
-msgstr "_Slett private data"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:4286
-msgid "Clear private data…"
-msgstr "Slett private data…"
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
 
-#: ../midori/midori-browser.c:4290
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Forrige fane"
 
-#: ../midori/midori-browser.c:4291
-msgid "Switch to the previous tab"
-msgstr "Bytt til forrige fane"
-
-#: ../midori/midori-browser.c:4293
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: ../midori/midori-browser.c:4294
-msgid "Switch to the next tab"
-msgstr "Bytt til neste fane"
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
 
-#: ../midori/midori-browser.c:4296
-msgid "_Help"
-msgstr "_Hjelp"
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
 
-#: ../midori/midori-browser.c:4298
-msgid "_Contents"
-msgstr "_Innhold"
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
 
-#: ../midori/midori-browser.c:4299
-msgid "Show the documentation"
-msgstr "Vis dokumentasjon"
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:4301
-msgid "_Frequent Questions"
-msgstr "_Ofte stilte spørsmål"
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:4302
-msgid "Show the Frequently Asked Questions"
-msgstr "Vis ofte stilte spørsmål"
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:4304
-msgid "_Report a Bug"
-msgstr "_Rapporter en feil"
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
 
-#: ../midori/midori-browser.c:4305
-msgid "Open Midori's bug tracker"
-msgstr "Åpne Midoris feilsystem"
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../midori/midori-browser.c:4308
-msgid "Show information about the program"
-msgstr "Vis informasjon om programmet"
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Ofte stilte spørsmål"
 
-#: ../midori/midori-browser.c:4315
-msgid "P_rivate Browsing"
-msgstr "P_rivat surfing"
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
 
-#: ../midori/midori-browser.c:4316
-msgid "Don't save any private data while browsing"
-msgstr "Ikke lagre noe privat data under surfingen"
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "Verk_tøy"
 
-#: ../midori/midori-browser.c:4321
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menylinje"
 
-#: ../midori/midori-browser.c:4322
-msgid "Show menubar"
-msgstr "Vis menylinje"
-
-#: ../midori/midori-browser.c:4325
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigasjonslinje"
 
-#: ../midori/midori-browser.c:4326
-msgid "Show navigationbar"
-msgstr "Vis navigasjonslinje"
-
-#: ../midori/midori-browser.c:4329
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Side_panel"
 
-#: ../midori/midori-browser.c:4330
-msgid "Show sidepanel"
-msgstr "Vis sidepanel"
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
 
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Bokmerkelinje"
 
-#: ../midori/midori-browser.c:4334
-msgid "Show bookmarkbar"
-msgstr "Vis bokmerkelinje"
-
-#: ../midori/midori-browser.c:4337
-msgid "_Transferbar"
-msgstr "_Overføringer"
-
-#: ../midori/midori-browser.c:4338
-msgid "Show transferbar"
-msgstr "Vis overføringer"
-
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statuslinje"
 
-#: ../midori/midori-browser.c:4342
-msgid "Show statusbar"
-msgstr "Vis statuslinje"
-
-#: ../midori/midori-browser.c:4349
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: ../midori/midori-browser.c:4352
-#: ../midori/midori-websettings.c:214
-msgid "Chinese (BIG5)"
-msgstr "Kinesisk (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
 
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:4356
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japansk (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:4359
-#: ../midori/midori-websettings.c:216
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russisk (KOI8-R)"
 
-#: ../midori/midori-browser.c:4362
-#: ../midori/midori-websettings.c:217
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:4365
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Vestlig (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:4368
-#: ../midori/midori-websettings.c:219
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Tilpasset…"
 
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separator"
 
-#: ../midori/midori-browser.c:4813
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Sted…"
 
-#: ../midori/midori-browser.c:4815
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Åpne et gitt sted"
 
-#: ../midori/midori-browser.c:4839
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Nettsøk…"
 
-#: ../midori/midori-browser.c:4841
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Kjør et nettsøk"
 
-#: ../midori/midori-browser.c:4862
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Gjenåpne en tidligere lukket fane eller vindu"
 
-#: ../midori/midori-browser.c:4877
-msgid "_Recently visited pages"
-msgstr "_Nylig besøkte nettsider"
-
-#: ../midori/midori-browser.c:4879
-msgid "Reopen pages that you visited earlier"
-msgstr "Gjenåpne sider du har besøkt tidligere"
-
-#: ../midori/midori-browser.c:4894
-#: ../midori/sokoke.c:857
-msgid "_Bookmarks"
-msgstr "_Bokmerker"
-
-#: ../midori/midori-browser.c:4896
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Vis lagrede bokmerker"
 
-#: ../midori/midori-browser.c:4911
-msgid "_Tools"
-msgstr "Verk_tøy"
-
-#: ../midori/midori-browser.c:4923
-msgid "_Window"
-msgstr "_Vindu"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:4925
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Vis en liste med alle åpne faner"
 
-#: ../midori/midori-browser.c:4939
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Meny"
 
-#: ../midori/midori-browser.c:4941
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Meny"
 
-#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:5127
-msgid "_Inline Find:"
-msgstr "_Inlinesøk:"
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:5152
-msgid "Previous"
-msgstr "Forrige"
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:5157
-msgid "Next"
-msgstr "Neste"
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
 
-#: ../midori/midori-browser.c:5162
-msgid "Match Case"
-msgstr "Skill mellom store og små bokstaver"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
 
-#: ../midori/midori-browser.c:5170
-msgid "Highlight Matches"
-msgstr "Fremhev treff"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../midori/midori-browser.c:5180
-msgid "Close Findbar"
-msgstr "Lukk søkelinje"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
 
-#: ../midori/midori-browser.c:5215
-#: ../extensions/cookie-manager/cookie-manager-page.c:109
-msgid "Delete All"
-msgstr "Slett alle"
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
 
-#: ../midori/midori-browser.c:5552
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Uventet innstilling '%s'"
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
 
-#: ../midori/midori-locationaction.c:901
-#, c-format
-msgid "Search with %s"
-msgstr "Søk med %s"
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
 
-#: ../midori/midori-panel.c:382
-#: ../midori/midori-panel.c:384
-msgid "Detach chosen panel from the window"
-msgstr "Frigjør valgt panel fra vinduet"
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
 
-#: ../midori/midori-panel.c:394
-#: ../midori/midori-panel.c:396
-#: ../midori/midori-panel.c:577
-#: ../midori/midori-panel.c:580
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Flytt sidepanel til høyre"
 
-#: ../midori/midori-panel.c:406
-#: ../midori/midori-panel.c:407
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Lukk panel"
 
-#: ../midori/midori-panel.c:578
-#: ../midori/midori-panel.c:581
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Flytt sidepanel til venstre"
 
-#: ../midori/midori-panel.c:704
-msgid "Show panel _titles"
-msgstr "Vis panel_titler"
-
-#: ../midori/midori-panel.c:712
-msgid "Show operating _controls"
-msgstr "Vis handlings_kontroller"
-
-#: ../midori/midori-panel.c:783
-msgid "Options"
-msgstr "Innstillinger"
-
-#: ../midori/midori-websettings.c:197
-msgid "Show Blank page"
-msgstr "Vis tom side"
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
 
-#: ../midori/midori-websettings.c:198
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Vis hjemmeside"
 
-#: ../midori/midori-websettings.c:199
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Vis sist brukte faner"
 
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japansk (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:234
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../midori/midori-websettings.c:235
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nytt vindu"
 
-#: ../midori/midori-websettings.c:236
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Nåværende fane"
 
-#: ../midori/midori-websettings.c:251
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Standard"
 
-#: ../midori/midori-websettings.c:252
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikoner og tekst"
 
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Tekst ved siden av ikoner"
 
-#: ../midori/midori-websettings.c:270
-msgid "All cookies"
-msgstr "Alle cookies"
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
 
-#: ../midori/midori-websettings.c:271
-msgid "Session cookies"
-msgstr "Session-cookies"
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
 
-#: ../midori/midori-websettings.c:272
-#: ../panels/midori-addons.c:94
-#: ../extensions/shortcuts.c:93
-msgid "None"
-msgstr "Ingen"
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
 
-#: ../midori/midori-websettings.c:288
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:289
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:343
-msgid "Remember last window size"
-msgstr "Husk forrige vindustørrelse"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Stil for verktøylinjen"
 
-#: ../midori/midori-websettings.c:344
-msgid "Whether to save the last window size"
-msgstr "Lagre forrige vindustørrelse eller ikke"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
 
-#: ../midori/midori-websettings.c:352
-msgid "Last window width"
-msgstr "Siste vinduesbredde"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
 
-#: ../midori/midori-websettings.c:353
-msgid "The last saved window width"
-msgstr "Siste lagrede vindusbredde"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Innstillingen kunne ikke lastes: %s\n"
 
-#: ../midori/midori-websettings.c:361
-msgid "Last window height"
-msgstr "Siste vindushøyde"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Ugyldig innstillingsverdi '%s'"
 
-#: ../midori/midori-websettings.c:362
-msgid "The last saved window height"
-msgstr "Siste lagrede vindushøyde"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:387
-msgid "Last panel position"
-msgstr "Siste panelplassering"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
 
-#: ../midori/midori-websettings.c:388
-msgid "The last saved panel position"
-msgstr "Siste huskede panelplassering"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:397
-msgid "Last panel page"
-msgstr "Siste panelside"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:398
-msgid "The last saved panel page"
-msgstr "Siste lagrede panelside"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:406
-msgid "Last Web search"
-msgstr "Siste nettsøk"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
 
-#: ../midori/midori-websettings.c:407
-msgid "The last saved Web search"
-msgstr "Ditt siste nettsøk"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
 
-#: ../midori/midori-websettings.c:416
-msgid "Show Menubar"
-msgstr "Vis menylinje"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
 
-#: ../midori/midori-websettings.c:417
-msgid "Whether to show the menubar"
-msgstr "Om menylinjen vises eller ikke"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
 
-#: ../midori/midori-websettings.c:425
-msgid "Show Navigationbar"
-msgstr "Vis navigasjonslinje"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
 
-#: ../midori/midori-websettings.c:426
-msgid "Whether to show the navigationbar"
-msgstr "Om navigasjonslinjen vises eller ikke"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
 
-#: ../midori/midori-websettings.c:434
-msgid "Show Bookmarkbar"
-msgstr "Vis bokmerkelinje"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:435
-msgid "Whether to show the bookmarkbar"
-msgstr "Om bokmerkelinjen vises eller ikke"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:443
-msgid "Show Panel"
-msgstr "Vis panel"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:444
-msgid "Whether to show the panel"
-msgstr "Om panel vises eller ikke"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:459
-msgid "Show Transferbar"
-msgstr "Vis overføringsstatus"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:460
-msgid "Whether to show the transferbar"
-msgstr "Om overføringsstatus vises eller ikke"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:468
-msgid "Show Statusbar"
-msgstr "Vis statuslinje"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:469
-msgid "Whether to show the statusbar"
-msgstr "Om statuslinjen vises eller ikke"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:478
-msgid "Toolbar Style:"
-msgstr "Verktøylinjestil:"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Prøv igjen"
 
-#: ../midori/midori-websettings.c:479
-msgid "The style of the toolbar"
-msgstr "Stil for verktøylinjen"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:495
-msgid "Show progress in location entry"
-msgstr "Vis fremgang i adresselinjen"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
 
-#: ../midori/midori-websettings.c:496
-msgid "Whether to show loading progress in the location entry"
-msgstr "Vise sidelasting i adressefeltet"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-websettings.c:511
-msgid "Search engines in location completion"
-msgstr "Søkemotorer i adressutfyllingen"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Åpne lenke i ny _fane"
 
-#: ../midori/midori-websettings.c:512
-msgid "Whether to show search engines in the location completion"
-msgstr "Om søkemotorer skal vises i adresseutfyllingen"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:520
-msgid "Toolbar Items"
-msgstr "Verktøylinjeelementer"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:521
-msgid "The items to show on the toolbar"
-msgstr "Elementer som vises på verktøylinjen"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Åpne lenke i nytt _vindu"
 
-#: ../midori/midori-websettings.c:529
-msgid "Compact Sidepanel"
-msgstr "Kompakt sidepanel"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
 
-#: ../midori/midori-websettings.c:530
-msgid "Whether to make the sidepanel compact"
-msgstr "Om sidepanelet skal være kompakt eller ikke"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
 
-#: ../midori/midori-websettings.c:545
-msgid "Show operating controls of the panel"
-msgstr "Vis handlingskontroller til panelet"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
 
-#: ../midori/midori-websettings.c:546
-msgid "Whether to show the operating controls of the panel"
-msgstr "Om handlingskontroller til panelet skal vises eller ikke"
-
-#: ../midori/midori-websettings.c:561
-msgid "Align sidepanel on the right"
-msgstr "Flytt sidepanelet til høyre"
-
-#: ../midori/midori-websettings.c:562
-msgid "Whether to align the sidepanel on the right"
-msgstr "Om sidepanelet skal vise på høyre side"
-
-#: ../midori/midori-websettings.c:571
-msgid "When Midori starts:"
-msgstr "Når Midori starter:"
-
-#: ../midori/midori-websettings.c:572
-msgid "What to do when Midori starts"
-msgstr "Hva som skal skje når Midori starter"
-
-#: ../midori/midori-websettings.c:581
-msgid "Homepage:"
-msgstr "Hjemmeside:"
-
-#: ../midori/midori-websettings.c:582
-msgid "The homepage"
-msgstr "Hjemmesiden"
-
-#: ../midori/midori-websettings.c:597
-msgid "Show crash dialog"
-msgstr "Vis kræsjboks"
-
-#: ../midori/midori-websettings.c:598
-msgid "Show a dialog after Midori crashed"
-msgstr "Vis en bok etter at Midori har kræsjet"
-
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:614
-msgid "Show speed dial in new tabs"
-msgstr "Vis speed dial i nye faner"
-
-#: ../midori/midori-websettings.c:615
-msgid "Show speed dial in newly opened tabs"
-msgstr "Vis speed dial i nylig åpnede faner"
-
-#: ../midori/midori-websettings.c:623
-msgid "Save downloaded files to:"
-msgstr "Lagre filer i:"
-
-#: ../midori/midori-websettings.c:624
-msgid "The folder downloaded files are saved to"
-msgstr "Mappen hvor filene lagres"
-
-#: ../midori/midori-websettings.c:643
-msgid "Ask for the destination folder"
-msgstr "Spør etter målmappe"
-
-#: ../midori/midori-websettings.c:644
-msgid "Whether to ask for the destination folder when downloading a file"
-msgstr "Om du skal spørres om målmappe ved nedlasting av filer"
-
-#: ../midori/midori-websettings.c:663
-msgid "Notify when a transfer has been completed"
-msgstr "Beskjed når en overføring er ferdig"
-
-#: ../midori/midori-websettings.c:664
-msgid "Whether to show a notification when a transfer has been completed"
-msgstr "Om du skal motta en beskjed når en overføring er ferdig"
-
-#: ../midori/midori-websettings.c:676
-msgid "Download Manager"
-msgstr "Nedlastingsprogram"
-
-#: ../midori/midori-websettings.c:677
-msgid "An external download manager"
-msgstr "Et eksternt nedlastingsprogram"
-
-#: ../midori/midori-websettings.c:685
-msgid "Text Editor"
-msgstr "Tekstbehandler"
-
-#: ../midori/midori-websettings.c:686
-msgid "An external text editor"
-msgstr "En ekstern tekstbehandler"
-
-#: ../midori/midori-websettings.c:701
-msgid "News Aggregator"
-msgstr "Nyhetssamler"
-
-#: ../midori/midori-websettings.c:702
-msgid "An external news aggregator"
-msgstr "En ekstern nyhetssamler"
-
-#: ../midori/midori-websettings.c:710
-msgid "Location entry Search"
-msgstr "Søk for adressefeltet"
-
-#: ../midori/midori-websettings.c:711
-msgid "The search to perform inside the location entry"
-msgstr "Søk som utføres i adressefeltet"
-
-#: ../midori/midori-websettings.c:719
-msgid "Preferred Encoding"
-msgstr "Foretrukket tegnsett"
-
-#: ../midori/midori-websettings.c:720
-msgid "The preferred character encoding"
-msgstr "Ditt foretrukne tegnsett"
-
-#: ../midori/midori-websettings.c:730
-msgid "Always Show Tabbar"
-msgstr "Vis alltid fanelinje"
-
-#: ../midori/midori-websettings.c:731
-msgid "Always show the tabbar"
-msgstr "Vis alltid fanelinjen"
-
-#: ../midori/midori-websettings.c:739
-msgid "Close Buttons on Tabs"
-msgstr "Lukkeknapper på faner"
-
-#: ../midori/midori-websettings.c:740
-msgid "Whether tabs have close buttons"
-msgstr "Om alle faner skal ha lukkeknapper"
-
-#: ../midori/midori-websettings.c:748
-msgid "Open new pages in:"
-msgstr "Åpne nye sider i:"
-
-#: ../midori/midori-websettings.c:749
-msgid "Where to open new pages"
-msgstr "Hvor nye sider skal åpnes"
-
-#: ../midori/midori-websettings.c:758
-msgid "Open external pages in:"
-msgstr "Åpne eksterne sider i:"
-
-#: ../midori/midori-websettings.c:759
-msgid "Where to open externally opened pages"
-msgstr "Hvor eksterne sider skal åpnes"
-
-#: ../midori/midori-websettings.c:768
-msgid "Middle click opens Selection"
-msgstr "Midtklikk åpner valgt lenke"
-
-#: ../midori/midori-websettings.c:769
-msgid "Load an address from the selection via middle click"
-msgstr "Last inn valgt adresse med den midterste museknappen"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:777
-msgid "Open tabs in the background"
-msgstr "Åpne faner i bakgrunnen"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
 
-#: ../midori/midori-websettings.c:778
-msgid "Whether to open new tabs in the background"
-msgstr "Om nye faner skal åpnes i bakgrunnen"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
 
-#: ../midori/midori-websettings.c:786
-msgid "Open Tabs next to Current"
-msgstr "Åpne nye faner ved siden av den nåværende"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
 
-#: ../midori/midori-websettings.c:787
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Om nye faner skal åpnes ved siden av den nåværende fanen"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
 
-#: ../midori/midori-websettings.c:795
-msgid "Open popups in tabs"
-msgstr "Åpne popups i faner"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
 
-#: ../midori/midori-websettings.c:796
-msgid "Whether to open popup windows in tabs"
-msgstr "Om popups skal åpnes i faner"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Åpne adresse i ny _fane"
 
-#: ../midori/midori-websettings.c:812
-msgid "Zoom Text and Images"
-msgstr "Zoom tekst og bilder"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Søk _med"
 
-#: ../midori/midori-websettings.c:813
-msgid "Whether to zoom text and images"
-msgstr "Om tekst og bilder skal zoomes"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Søk på internett"
 
-#: ../midori/midori-websettings.c:828
-msgid "Find inline while typing"
-msgstr "Finn mens du skriver"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:829
-msgid "Whether to automatically find inline while typing"
-msgstr "Om du vil søke på siden mens du skriver"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
 
-#: ../midori/midori-websettings.c:837
-msgid "Accept cookies"
-msgstr "Tillat cookies"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:838
-msgid "What type of cookies to accept"
-msgstr "Hvilke typer cookies som skal tillates"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:847
-msgid "Original cookies only"
-msgstr "Kun originale cookies"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Filtype: '%s'"
 
-#: ../midori/midori-websettings.c:848
-msgid "Accept cookies from the original website only"
-msgstr "Kun tillat originale cookies"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Filtype: %s ('%s')"
 
-#: ../midori/midori-websettings.c:856
-msgid "Maximum cookie age"
-msgstr "Maksimal cookie-levetid"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:857
-msgid "The maximum number of days to save cookies for"
-msgstr "Hvor lenge cookies får lov å leve"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Åpne %s"
 
-#: ../midori/midori-websettings.c:867
-msgid "Remember last visited pages"
-msgstr "Husk sist besøkte sider"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Undersøk side - %s"
 
-#: ../midori/midori-websettings.c:868
-msgid "Whether the last visited pages are saved"
-msgstr "Om de siste sidene du har besøkt skal huskes"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:876
-msgid "Maximum history age"
-msgstr "Maksimal alder for historikk"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
 
-#: ../midori/midori-websettings.c:877
-msgid "The maximum number of days to save the history for"
-msgstr "Det maksimale antall dager historikken vil lagres"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:885
-msgid "Remember last form inputs"
-msgstr "Husk siste skjemautfyllinger"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:886
-msgid "Whether the last form inputs are saved"
-msgstr "Om siste skjemautfyllinger skal huskes"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:894
-msgid "Remember last downloaded files"
-msgstr "Husk siste nedlastede filer"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
 
-#: ../midori/midori-websettings.c:895
-msgid "Whether the last downloaded files are saved"
-msgstr "Om siste nedlastede filer skal huskes"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:905
-msgid "Proxy Server"
-msgstr "Proxyserver"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
 
-#: ../midori/midori-websettings.c:906
-msgid "The proxy server used for HTTP connections"
-msgstr "Proxyserveren som brukes til HTTP-forbindelser"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
 
-#: ../midori/midori-websettings.c:921
-msgid "Detect proxy server automatically"
-msgstr "Gjenkjenn automatisk proxyserver"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
 
-#: ../midori/midori-websettings.c:922
-msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "Om proxyserveren skal finnes automatisk fra datamaskinen"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:938
-msgid "Identify as"
-msgstr "Identifiser som"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
 
-#: ../midori/midori-websettings.c:939
-msgid "What to identify as to web pages"
-msgstr "Hva nettleseren identifiseres som"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
 
-#: ../midori/midori-websettings.c:955
-msgid "Identification string"
-msgstr "Identifikationsstreng"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Tom side"
 
-#: ../midori/midori-websettings.c:956
-msgid "The application identification string"
-msgstr "Programmets identifikationsstreng"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
 
-#: ../midori/midori-websettings.c:964
-msgid "Cache size"
-msgstr "Størrelse av mellomlager"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
 
-#: ../midori/midori-websettings.c:965
-msgid "The allowed size of the cache"
-msgstr "Den tillatte størrelsen på mellomlageret"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Skriv ut bakgrunnsbilder"
 
-#: ../midori/midori-websettings.c:980
-msgid "Clear private data"
-msgstr "Slett private data"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Om bakgrunnsbilder skal printes eller ikke"
 
-#: ../midori/midori-websettings.c:981
-msgid "The private data selected for deletion"
-msgstr "De private data valgt for sletting"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Funksjonalitet"
 
-#: ../midori/midori-view.c:781
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Siden '%s' kunne ikke lastes inn."
-
-#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
-#. so reloading via Javascript works but not via API calls.
-#: ../midori/midori-view.c:783
-#: ../midori/midori-view.c:3013
-#: ../extensions/feed-panel/main.c:112
-msgid "Error"
-msgstr "Feil"
-
-#: ../midori/midori-view.c:786
-msgid "Try again"
-msgstr "Prøv igjen"
+msgid "%s of %s"
+msgstr "%s av %s"
 
-#. i18n: The title of the 404 - Not found error page
-#. Error pages are special, we want to try loading the destination
-#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:818
-#: ../midori/midori-view.c:3017
+#: ../midori/midori-download.vala:75
 #, c-format
-msgid "Not found - %s"
-msgstr "Ikke funnet - %s"
-
-#: ../midori/midori-view.c:1205
-msgid "Open _Link"
-msgstr "Åpne _lenke"
-
-#: ../midori/midori-view.c:1207
-msgid "Open Link in New _Tab"
-msgstr "Åpne lenke i ny _fane"
-
-#: ../midori/midori-view.c:1224
-msgid "Open Link in New _Window"
-msgstr "Åpne lenke i nytt _vindu"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1230
-msgid "_Download Link destination"
-msgstr "_Last ned lenkemål"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1236
-msgid "_Save Link destination"
-msgstr "_Lagre lenkemål"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1245
-msgid "Download with Download _Manager"
-msgstr "Hent med _nedlastingsprogram"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
 
-#: ../midori/midori-view.c:1274
-msgid "Search _with"
-msgstr "Søk _med"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
 
-#: ../midori/midori-view.c:1306
-msgid "_Search the Web"
-msgstr "_Søk på internett"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
 
-#: ../midori/midori-view.c:1316
-msgid "Open Address in New _Tab"
-msgstr "Åpne adresse i ny _fane"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
 
-#: ../midori/midori-view.c:1494
-msgid "Open or download file"
-msgstr "Åpne eller last ned fil"
+#: ../midori/midori-download.vala:221
+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:1511
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "File Type: '%s'"
-msgstr "Filtype: '%s'"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
 
-#: ../midori/midori-view.c:1514
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Filtype: %s ('%s')"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:1518
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "Åpne %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
 
-#: ../midori/midori-view.c:1957
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Undersøk side - %s"
+msgid "The file needs %s but only %s are left."
+msgstr ""
 
-#: ../midori/midori-view.c:2147
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Snarveier (Speed dial)"
 
-#: ../midori/midori-view.c:2148
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klikk for å legge til snarvei"
 
-#: ../midori/midori-view.c:2149
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Skriv inn snarveiens adresse"
 
-#: ../midori/midori-view.c:2150
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Skriv inn snarveiens tittel"
 
-#: ../midori/midori-view.c:2151
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Er du sikker på at du vil slette denne snarveien?"
 
-#: ../midori/midori-view.c:2181
-#, c-format
-msgid "Document cannot be displayed"
-msgstr "Dokumentet kan ikke vises"
-
-#: ../midori/midori-view.c:2198
-#, c-format
-msgid "No documentation installed"
-msgstr "Ingen dokumentasjon installert"
-
-#: ../midori/midori-view.c:2323
-msgid "Blank page"
-msgstr "Tom side"
-
-#: ../midori/midori-view.c:2551
-#: ../midori/sokoke.c:865
-msgid "New _Tab"
-msgstr "Ny _fane"
-
-#: ../midori/midori-view.c:2565
-msgid "_Duplicate Tab"
-msgstr "_Kopier fane"
-
-#: ../midori/midori-view.c:2570
-msgid "_Restore Tab"
-msgstr "_Gjenopprett fane"
-
-#: ../midori/midori-view.c:2570
-msgid "_Minimize Tab"
-msgstr "_Minimer fane"
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Oppstart"
 
-#: ../midori/midori-preferences.c:91
-#, c-format
-msgid "Preferences for %s"
-msgstr "Innstillinger for %s"
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Når Midori starter:"
 
-#. Page "General"
-#: ../midori/midori-preferences.c:398
-msgid "General"
-msgstr "Generelt"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Hjemmeside:"
 
-#: ../midori/midori-preferences.c:399
-msgid "Startup"
-msgstr "Oppstart"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
 
-#: ../midori/midori-preferences.c:415
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Bruk åpnet side som hjemmeside"
 
-#: ../midori/midori-preferences.c:425
-#: ../panels/midori-transfers.c:88
-msgid "Transfers"
-msgstr "Nedlastinger"
-
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:440
-msgid "Appearance"
-msgstr "Utseende"
-
-#: ../midori/midori-preferences.c:441
-msgid "Font settings"
-msgstr "Innstillinger for skrifttyper"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
 
-#: ../midori/midori-preferences.c:443
-msgid "Default Font Family"
-msgstr "Standard for skrifttypefamilie"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Standard skrifttype til visning av tekst"
 
-#: ../midori/midori-preferences.c:450
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Størrelse av standardskriftstype brukes til å vise tekst"
 
-#: ../midori/midori-preferences.c:453
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Skrifttype med fast bredde"
 
-#: ../midori/midori-preferences.c:457
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Skrifttypen som brukes for tekst med fast bredde"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Skriftstørrelsen som brukes til å vise tekst med fast bredde"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimal skriftstørrelse"
 
-#: ../midori/midori-preferences.c:466
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Minimum størrelse på tekst"
 
-#: ../midori/midori-preferences.c:473
-msgid "Encoding"
-msgstr "Tegnkoding"
-
-#: ../midori/midori-preferences.c:476
-msgid "The character encoding to use by default"
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
 msgstr "Foretrukket tegnsett"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:483
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: ../midori/midori-preferences.c:484
-msgid "Features"
-msgstr "Funksjonalitet"
-
-#: ../midori/midori-preferences.c:487
-#: ../extensions/statusbar-features.c:88
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Last bilder automatisk"
 
-#: ../midori/midori-preferences.c:488
-msgid "Load and display images automatically"
-msgstr "Last inn og vis bilder automatisk"
-
-#: ../midori/midori-preferences.c:491
-msgid "Shrink images automatically"
-msgstr "Forminsk bilder automatisk"
-
-#: ../midori/midori-preferences.c:492
-msgid "Automatically shrink standalone images to fit"
-msgstr "Forminsk enkeltstående bilder for å passe inn"
-
-#: ../midori/midori-preferences.c:495
-msgid "Print background images"
-msgstr "Skriv ut bakgrunnsbilder"
-
-#: ../midori/midori-preferences.c:496
-msgid "Whether background images should be printed"
-msgstr "Om bakgrunnsbilder skal printes eller ikke"
-
-#: ../midori/midori-preferences.c:499
-msgid "Resizable text areas"
-msgstr "Justerbare tekstområder"
-
-#: ../midori/midori-preferences.c:500
-msgid "Whether text areas are resizable"
-msgstr "Om tekstområder skal kunne endre størrelse"
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Slå på stavekontroll"
 
-#: ../midori/midori-preferences.c:503
-#: ../extensions/statusbar-features.c:100
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Slå på skripts"
 
-#: ../midori/midori-preferences.c:504
-msgid "Enable embedded scripting languages"
-msgstr "Slå på bruk av skriptespråk"
-
-#: ../midori/midori-preferences.c:507
-#: ../extensions/statusbar-features.c:112
-msgid "Enable Netscape plugins"
-msgstr "Slå på Netscape-utvidelser"
-
-#: ../midori/midori-preferences.c:508
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Slå på objekter med Netscape-utvidelser"
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
 
-#: ../midori/midori-preferences.c:511
-msgid "Enforce 96 dots per inch"
-msgstr "Tving bruk av 96 dpi"
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zoom tekst og bilder"
 
-#: ../midori/midori-preferences.c:512
-msgid "Enforce a video dot density of 96 DPI"
-msgstr "Bruk alltid punkttetthet på 96 dpi"
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
 
-#: ../midori/midori-preferences.c:515
-msgid "Enable developer tools"
-msgstr "Slå på utviklerverktøy"
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
 
-#: ../midori/midori-preferences.c:516
-msgid "Enable special extensions for developers"
-msgstr "Slå på spesielle utvidelser for utviklere"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
 
-#: ../midori/midori-preferences.c:523
-msgid "Spell Checking"
-msgstr "Stavekontroll"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-preferences.c:526
-msgid "Enable Spell Checking"
-msgstr "Slå på stavekontroll"
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
 
-#: ../midori/midori-preferences.c:527
-msgid "Enable spell checking while typing"
-msgstr "Slå på stavekontroll mens du skriver"
+#: ../midori/midori-preferences.c:426
+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 ""
 
-#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:531
-msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
-msgstr "En kommadelt liste med språk som skal brukes for stavekontroll, for eksempel \"en_GB,de_DE\""
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Lagre filer i:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:536
-msgid "Interface"
-msgstr "Grensesnitt"
-
-#: ../midori/midori-preferences.c:537
-msgid "Navigationbar"
-msgstr "Navigasjonslinje"
-
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Surfing"
 
-#. Page "Applications"
-#: ../midori/midori-preferences.c:574
-msgid "Applications"
-msgstr "Programmer"
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:575
-msgid "External applications"
-msgstr "Eksterne programmer"
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Verktøylinjestil:"
 
-#. Page "Network"
-#: ../midori/midori-preferences.c:621
-#: ../midori/midori-preferences.c:622
-msgid "Network"
-msgstr "Nettverk"
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Åpne nye sider i:"
 
-#: ../midori/midori-preferences.c:649
-msgid "MB"
-msgstr "MB"
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
 
-#. Page "Privacy"
-#: ../midori/midori-preferences.c:654
-msgid "Privacy"
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Lukkeknapper på faner"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Åpne nye faner ved siden av den nåværende"
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "Om nye faner skal åpnes ved siden av den nåværende fanen"
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Åpne faner i bakgrunnen"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Tekstbehandler"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Nyhetssamler"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identifiser som"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
 msgstr "Beskyttelse av privatliv"
 
-#: ../midori/midori-preferences.c:655
-msgid "Web Cookies"
-msgstr "Nett-cookies"
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Hvor lenge cookies får lov å leve"
 
-#: ../midori/midori-preferences.c:668
-#: ../midori/midori-preferences.c:678
-msgid "days"
-msgstr "dager"
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
 
-#: ../midori/midori-searchaction.c:488
-#: ../katze/katze-arrayaction.c:335
-msgid "Empty"
-msgstr "Tom"
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Det maksimale antall dager historikken vil lagres"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Utvidelser"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Håndter søkemotorer"
 
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Legg til søkemotor"
 
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Rediger søkemotor"
 
-#: ../midori/midori-searchaction.c:936
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../midori/midori-searchaction.c:980
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresse:"
 
-#: ../midori/midori-searchaction.c:994
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Symbol:"
 
-#: ../midori/midori-searchaction.c:1213
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Håndter søkemotorer"
 
-#: ../midori/midori-searchaction.c:1312
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Bruk som _standard"
 
-#: ../midori/sokoke.c:162
-#: ../midori/sokoke.c:174
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Søkemotorene kan ikke lastes inn. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Søkemotorene kan ikke lagres. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Søk med %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Klarte ikke kjøre eksternt program"
 
-#: ../midori/sokoke.c:856
-msgid "_Bookmark"
-msgstr "_Bokmerke"
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
 
-#: ../midori/sokoke.c:858
-msgid "Add Boo_kmark"
-msgstr "Legg til bokmer_ke"
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Inlinesøk:"
 
-#: ../midori/sokoke.c:859
-msgid "_Console"
-msgstr "_Konsoll"
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Forrige"
 
-#: ../midori/sokoke.c:860
-msgid "_Extensions"
-msgstr "_Utvidelser"
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Neste"
 
-#: ../midori/sokoke.c:861
-msgid "_History"
-msgstr "_Historikk"
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Skill mellom store og små bokstaver"
 
-#: ../midori/sokoke.c:862
-msgid "_Homepage"
-msgstr "_Hjemmeside"
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Lukk søkelinje"
 
-#: ../midori/sokoke.c:863
-msgid "_Userscripts"
-msgstr "_Brukerskripts"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/sokoke.c:864
-msgid "User_styles"
-msgstr "Bruker_stiler"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/sokoke.c:866
-msgid "_Transfers"
-msgstr "_Nedlastinger"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
 
-#: ../midori/sokoke.c:867
-msgid "Netscape p_lugins"
-msgstr "Netscape-u_tvidelser"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-addons.c:95
-#: ../panels/midori-addons.c:141
-msgid "Userscripts"
-msgstr "Brukerskripts"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../panels/midori-addons.c:96
-#: ../panels/midori-addons.c:143
-msgid "Userstyles"
-msgstr "Brukerstiler"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:108
-msgid "Bookmarks"
-msgstr "Bokmerker"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:239
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Rediger valgt bokmerke"
 
-#: ../panels/midori-bookmarks.c:247
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Slett det valgte bokmerket"
 
-#: ../panels/midori-bookmarks.c:260
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Ny mappe"
 
-#: ../panels/midori-bookmarks.c:592
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
-#: ../panels/midori-console.c:87
-msgid "Console"
-msgstr "Konsoll"
-
-#: ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "Utvidelser"
-
-#: ../panels/midori-history.c:162
-msgid "Are you sure you want to remove all history items?"
-msgstr "Er du sikker på at du vil fjerne alle historieelementer?"
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Åpne i ny _fane"
 
-#: ../panels/midori-history.c:217
-msgid "Bookmark the selected history item"
-msgstr "Bokmerk det valgte historieelementet"
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
 
-#: ../panels/midori-history.c:226
-msgid "Delete the selected history item"
-msgstr "Slett det valgte historieelementet"
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historikk"
 
-#: ../panels/midori-history.c:234
-msgid "Clear the entire history"
-msgstr "Slett hele historikken"
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "I dag"
 
-#: ../panels/midori-history.c:601
-msgid "A week ago"
-msgstr "En uke siden"
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "I går"
 
-#: ../panels/midori-history.c:606
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../panels/midori-history.c:614
-msgid "Today"
-msgstr "I dag"
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "En uke siden"
 
-#: ../panels/midori-history.c:616
-msgid "Yesterday"
-msgstr "I går"
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Klarte ikke fjerne historikkelementet: %s\n"
 
-#: ../panels/midori-plugins.c:87
-#: ../extensions/statusbar-features.c:108
-msgid "Netscape plugins"
-msgstr "Netscape-utvidelser"
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "Er du sikker på at du vil fjerne alle historieelementer?"
 
-#: ../panels/midori-transfers.c:271
-#, c-format
-msgid "%s of %s"
-msgstr "%s av %s"
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Bokmerk det valgte historieelementet"
 
-#: ../panels/midori-transfers.c:479
-msgid "Open Destination _Folder"
-msgstr "Åpne mål_mappen"
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Slett det valgte historieelementet"
 
-#: ../panels/midori-transfers.c:482
-msgid "Copy Link Loc_ation"
-msgstr "Kopier _lenkemål"
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Slett hele historikken"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
 
-#: ../katze/katze-http-auth.c:97
+#: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Innlogging påkrevd"
 
-#: ../katze/katze-http-auth.c:113
+#: ../katze/katze-http-auth.c:226
 msgid ""
 "A username and a password are required\n"
 "to open this location:"
@@ -1922,105 +1992,204 @@ msgstr ""
 "Et brukernavn og passord er påkrevd\n"
 "for å åpne denne siden:"
 
-#: ../katze/katze-http-auth.c:127
+#: ../katze/katze-http-auth.c:240
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../katze/katze-http-auth.c:138
+#: ../katze/katze-http-auth.c:253
 msgid "Password"
 msgstr "Passord"
 
-#: ../katze/katze-throbber.c:828
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Angitt ikon '%s' kunne ikke lastes inn"
-
-#: ../katze/katze-throbber.c:841
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Lagerikon '%s' kunne ikke lastes inn"
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr ""
 
-#: ../katze/katze-throbber.c:907
-msgid "Animation frames are broken"
-msgstr "Bilder i animasjonen er ødelagte"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ingen"
 
-#: ../katze/katze-utils.c:200
-#: ../katze/katze-utils.c:407
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Egenskap '%s' er feil for %s"
 
-#: ../katze/katze-utils.c:235
-#: ../katze/katze-utils.c:264
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Velg fil"
 
-#: ../katze/katze-utils.c:250
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Velg mappe"
 
-#: ../extensions/adblock.c:167
-msgid "Configure Advertisement filters"
-msgstr "Konfiguer annonsefiltre"
-
-#: ../extensions/adblock.c:304
-msgid "Configure _Advertisement filters…"
-msgstr "Konfiguer _annonsefiltre"
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
 
-#: ../extensions/adblock.c:562
-msgid "Advertisement blocker"
-msgstr "Blokkering av reklame"
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
 
-#: ../extensions/adblock.c:563
-msgid "Block advertisements according to a filter list"
-msgstr "Blokker reklame i henhold til en filterliste"
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
 
-#: ../extensions/colorful-tabs.c:115
-msgid "Tint tabs distinctly"
-msgstr "Farge faner tydelig"
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
 
-#: ../extensions/colorful-tabs.c:151
-msgid "Colorful Tabs"
-msgstr "Fargede faner"
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
 
-#: ../extensions/colorful-tabs.c:152
-msgid "Tint each tab distinctly"
-msgstr "Gi hver fane en egen farge"
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Innstillinger for %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:79
-#: ../extensions/cookie-manager/main.c:56
-msgid "Cookie Manager"
-msgstr "Cookiehåndtering"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:111
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Slett alle cookies. Hvis et filter er valgt blir kun filtrerte cookies slettet."
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:126
-msgid "Expand All"
-msgstr "Åpne alle"
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:133
-msgid "Collapse All"
-msgstr "Lukk alle"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:460
-msgid "Do you really want to delete all cookies?"
-msgstr "Er du sikker på at du vil slette alle cookies?"
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:462
-msgid "Question"
-msgstr "Spørsmål"
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:471
-msgid "Only cookies which match the filter will be deleted."
-msgstr "Kun cookies som ble filtrert ut vil bli slettet."
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:539
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Brukerskripts"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Brukerstiler"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Feil"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Fargede faner"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Gi hver fane en egen farge"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Cookiehåndtering"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Slett alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Slett alle cookies. Hvis et filter er valgt blir kun filtrerte cookies "
+"slettet."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Åpne alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Lukk alle"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Er du sikker på at du vil slette alle cookies?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Spørsmål"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Kun cookies som ble filtrert ut vil bli slettet."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Ved avslutning av sesjonen"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:542
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2037,259 +2206,1239 @@ msgstr ""
 "<b>Sikker</b>: %s\n"
 "<b>Utløper</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:548
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:548
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nei"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:811
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Navn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:862
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Åpne alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:870
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Lukk alle"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:923
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:928
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "Skriv inn en filterstreng for å vise hvilke cookies som blir filtrert ut"
-
-#: ../extensions/cookie-manager/main.c:40
-msgid "_Cookie Manager"
-msgstr "_Cookiehåndtering"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr ""
 
-#: ../extensions/cookie-manager/main.c:57
+#: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
 msgstr "List, vis og slett cookies"
 
-#: ../extensions/feed-panel/feed-atom.c:242
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Klarte ikke å finne nødvendige Atom \"post\"-elementer i XML-data."
 
-#: ../extensions/feed-panel/feed-atom.c:348
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Klarte ikke å finne nødvendige Atom \"feed\"-elementer i XML-data."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:399
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Sist oppdatert: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:664
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: ../extensions/feed-panel/feed-panel.c:717
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Ny nyhetsstrøm"
 
-#: ../extensions/feed-panel/feed-panel.c:724
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Slett nyhetsstrøm"
 
-#: ../extensions/feed-panel/feed-panel.c:807
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Nyhetsstrømmer"
 
-#: ../extensions/feed-panel/feed-parse.c:185
+#: ../extensions/feed-panel/feed-parse.c:195
 #, c-format
 msgid "Failed to find root element in feed XML data."
 msgstr "Klarte ikke å finne rot-element i nyhetsstrømmens XML-data."
 
-#: ../extensions/feed-panel/feed-parse.c:225
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Ustøttet format for nyhetsstrøm."
 
-#: ../extensions/feed-panel/feed-parse.c:255
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Klarte ikke å tolke XML-strøm: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Klarte ikke å finne \"kanal\"-element i RSS-XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Ustøttet RSS-versjon funnet."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Klarte ikke å finne nødvendige RSS \"punkt\"-elementer i XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Klarte ikke å finne nødvendige RSS \"kanal\"-elementer i XML-data."
 
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Nyhetsstrømmen '%s' finnes allerede"
 
-#: ../extensions/feed-panel/main.c:191
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Feil ved lastinv av nyhetsstrøm '%s'"
 
-#: ../extensions/feed-panel/main.c:331
-msgid "New feed"
-msgstr "Ny nyhetsstrøm"
-
-#: ../extensions/feed-panel/main.c:489
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel for nyhetsstrømmer"
 
-#: ../extensions/feed-panel/main.c:490
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Les Atom- og RSS-strømmer"
 
-#: ../extensions/mouse-gestures/main.c:236
-msgid "Mouse Gestures"
-msgstr "Musebevegelser"
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
 
-#: ../extensions/mouse-gestures/main.c:237
-msgid "Control Midori by moving the mouse"
-msgstr "Styr Midori ved å bevege musen"
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
 
-#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129
-#: ../extensions/page-holder.c:177
-msgid "Pageholder"
-msgstr "Sideholder"
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
 
-#: ../extensions/page-holder.c:161
-msgid "_Pageholder"
-msgstr "_Sideholder"
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
 
-#: ../extensions/shortcuts.c:172
-msgid "Customize Keyboard shortcuts"
-msgstr "Tilpass tastatursnarveier"
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
 
-#: ../extensions/shortcuts.c:264
-msgid "Customize Sh_ortcuts…"
-msgstr "Tilpass tastat_ursnarveier"
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
 
-#: ../extensions/shortcuts.c:303
-msgid "Shortcuts"
-msgstr "Snarveier"
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
 
-#: ../extensions/shortcuts.c:304
-msgid "View and edit keyboard shortcuts"
-msgstr "Vis og rediger tastatursnarveier"
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:84
-msgid "Images"
-msgstr "Bilder"
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:96
-msgid "Scripts"
-msgstr "Skripts"
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:149
-msgid "Statusbar Features"
-msgstr "Statuslinjefunksjoner"
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:150
-msgid "Easily toggle features on web pages on and off"
-msgstr "Enkelt slå av og på funksjonalitet for nettsider"
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
 
-#: ../extensions/tab-panel.c:383
-#: ../extensions/tab-panel.c:443
-msgid "Tab Panel"
-msgstr "Fanepanel"
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
 
-#: ../extensions/tab-panel.c:427
-msgid "T_ab Panel"
-msgstr "F_anepanel"
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
 
-#: ../extensions/tab-panel.c:444
-msgid "Show tabs in a vertical panel"
-msgstr "Vis faner i et vertikalt panel"
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:391
-msgid "Customize Toolbar"
-msgstr "Tilpass verktøylinje"
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:407
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
-msgstr "Velg elementer som skal vises på verktøylinjen. Elementer kan flyttes ved å dra og slippe."
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:423
-msgid "Available Items"
-msgstr "Tilgjengelige elementer"
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:444
-msgid "Displayed Items"
-msgstr "Viste elementer"
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:579
-msgid "Customize _Toolbar…"
-msgstr "Tilpass _verktøylinje"
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:611
-msgid "Toolbar Editor"
-msgstr "Redigering av verktøylinje"
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:612
-msgid "Easily edit the toolbar layout"
-msgstr "Enkel redigering av verktøylinjens utseende"
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Find hurtigt"
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Hop hurtigt til et ord eller sætning"
-#~ msgid "Whether to detach the chosen panel from the window"
-#~ msgstr "Om det valgte panel skal frigøres fra vinduet"
-#~ msgid "Last open pages"
-#~ msgstr "Sidste åbne sider"
-#~ msgid "Both"
-#~ msgstr "Begge"
-#~ msgid "Both horizontal"
-#~ msgstr "Begge vandrette"
-#~ msgid "Load on Startup"
-#~ msgstr "Indlæs ved opstart"
-#~ msgid "Download Folder"
-#~ msgstr "Nedhentning-mappen"
-#~ msgid "Search"
-#~ msgstr "Søg"
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Advarsel: Du bruger en superbruger-konto!"
-#~ msgid "_Closed Tabs and Windows"
-#~ msgstr "_Lukkede faneblade og vinduer"
-#~ msgid "_Enable"
-#~ msgstr "_Slå til"
-#~ msgid "Enable"
-#~ msgstr "Slå til"
-#~ msgid "_Disable"
-#~ msgstr "_Slå fra"
-#~ msgid "Disable"
-#~ msgstr "Slå fra"
-#~ msgid "%d days ago"
-#~ msgstr "For %d dage siden"
-#~ msgid "P_lugins"
-#~ msgstr "Udvidelses_moduler"
-#~ msgid "Plugins"
-#~ msgstr "Udvidelsesmoduler"
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s har ingen egenskab '%s'"
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s kan ikke blive tildelt til %s.%s"
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s kan ikke tilgås"
-#~ msgid "Source"
-#~ msgstr "Kilde"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
 
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Musebevegelser"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Styr Midori ved å bevege musen"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Tilpass tastatursnarveier"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Tilpass tastat_ursnarveier"
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Snarveier"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Vis og rediger tastatursnarveier"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Bilder"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skripts"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape-utvidelser"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Slå på Netscape-utvidelser"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Statuslinjefunksjoner"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Enkelt slå av og på funksjonalitet for nettsider"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Fanepanel"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "F_anepanel"
+
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Vis faner i et vertikalt panel"
+
+#: ../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:401
+msgid "Customize Toolbar"
+msgstr "Tilpass verktøylinje"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Velg elementer som skal vises på verktøylinjen. Elementer kan flyttes ved å "
+"dra og slippe."
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Tilgjengelige elementer"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Viste elementer"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Redigering av verktøylinje"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Enkel redigering av verktøylinjens utseende"
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Slett private data"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Slett private data"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Slett følgende data:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "_Slett private data når Midori _avsluttes"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Nettsideikoner"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Klarte ikke tømme historikken: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Klarte ikke fjerne gamle historikkelementer: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Innstillingen kan ikke lagres. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Papirkurven kan ikke lagres. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Endre _innstillinger"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Slå av alle _utvidelser"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Vis en bok etter at Midori har kræsjet"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "En instans av Midori kjører allerede, men svarer ikke.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sesjonen kan ikke lastes inn: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Papirkurven kan ikke lastes inn: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Historikken kan ikke lastes inn: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Følgende feil oppstod:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Programmer"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Nedlastinger"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Åpne mål_mappen"
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopier _lenkemål"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Filen '<b>%s</b>' har blitt lastet ned."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Overføring er ferdig"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blokkering av reklame"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokker reklame i henhold til en filterliste"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Konfiguer annonsefiltre"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index e99057b3a3d7cdd3f3f0fe1ad5ddd154d5887a11..71f61f2ede51b29c2066ed9495a2f0f670b4de3c 100644 (file)
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,2572 +6,3423 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 22:07+0000\n"
-"PO-Revision-Date: 2010-04-06 07:57+0530\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-06-02 11:58+0000\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <kde-i18n-doc@kde.org>\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-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ"
-
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1319 ../midori/main.c:1646
-#: ../midori/main.c:1654 ../midori/main.c:1670
-#: ../midori/midori-websettings.c:318
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "ਮੀਡੋਰੀ"
 
-#: ../data/midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:2
 msgid "Web Browser"
 msgstr "ਵੈੱਬ ਬਰਾਊਜ਼ਰ"
 
-#: ../midori/main.c:103
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "ਸੰਰਚਨਾ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s\n"
-
-#: ../midori/main.c:152
-#, c-format
-msgid "Value '%s' is invalid for %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
 msgstr ""
 
-#: ../midori/main.c:159 ../midori/main.c:245
-#, c-format
-msgid "Invalid configuration value '%s'"
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
 msgstr ""
 
-#: ../midori/main.c:371 ../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:426
-#, c-format
-msgid "Failed to remove old history items: %s\n"
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
 msgstr ""
 
-#: ../midori/main.c:446
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "ਸੰਰਚਨਾ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
-
-#: ../midori/main.c:484
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "ਖੋਜ ਇੰਜਣ ਸੰਭਾਲੇ ਨਹੀਂ ਜਾ ਸਕੇ। %s"
-
-#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲੇ ਨਹੀਂ ਜਾ ਸਕੇ। %s"
-
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:603 ../midori/main.c:626
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "ਰੱਦੀ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ। %s"
-
-#: ../midori/main.c:690 ../midori/main.c:907
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "ਸ਼ੈਸ਼ਨ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। %s"
-
-#: ../midori/main.c:941
-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."
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
 msgstr ""
 
-#: ../midori/main.c:956
-msgid "Modify _preferences"
-msgstr "ਪਸੰਦ ਸੋਧ(_p)"
-
-#: ../midori/main.c:960
-msgid "Reset the last _session"
-msgstr "ਪਿਛਲਾ ਸ਼ੈਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕਰੋ(_s)"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
 
-#: ../midori/main.c:965
-msgid "Disable all _extensions"
-msgstr "ਸਭ ਇਕਸਟੈਨਸ਼ਨ ਬੰਦ ਕਰੋ(_e)"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
 
-#: ../midori/main.c:1200 ../midori/main.c:1919
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "ਸ਼ੈਸ਼ਨ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s\n"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1319
-msgid "No filename specified"
-msgstr "ਫਾਇਲ ਨਾਂ ਨਹੀਂ ਦਿੱਤਾ"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1338
-msgid "An unknown error occured."
-msgstr "ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ।"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
 
-#: ../midori/main.c:1369
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1540
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr ""
 
-#: ../midori/main.c:1540
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../midori/main.c:1543
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr ""
 
-#: ../midori/main.c:1543
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ਫੋਲਡਰ"
 
-#: ../midori/main.c:1546
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "ਪੜਤਾਲ ਡਾਈਲਾਗ ਵੇਖੋ"
 
-#: ../midori/main.c:1548
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr ""
 
-#: ../midori/main.c:1551
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr ""
 
-#: ../midori/main.c:1554
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr ""
 
-#: ../midori/main.c:1556
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "ਪਰੋਗਰਾਮ ਵਰਜਨ ਵੇਖੋ"
 
-#: ../midori/main.c:1558
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../midori/main.c:1560
-msgid "Block URIs according to regular expression REGEX"
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
 msgstr ""
 
-#: ../midori/main.c:1560
-msgid "REGEX"
+#: ../midori/main.c:107
+msgid "PATTERN"
 msgstr ""
 
-#: ../midori/main.c:1563
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr ""
 
-#: ../midori/main.c:1563
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr ""
 
-#: ../midori/main.c:1643
-msgid "[Addresses]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
 msgstr ""
 
-#: ../midori/main.c:1671
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../midori/main.c:1673
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr ""
 
-#: ../midori/main.c:1770
-msgid "The specified configuration folder is invalid."
+#: ../midori/main.c:358
+msgid "An unknown error occured"
 msgstr ""
 
-#: ../midori/main.c:1818
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr ""
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "ਬੁੱਕਮਾਰਕ(_B)"
 
-#: ../midori/main.c:1873
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
 msgstr ""
 
-#: ../midori/main.c:1902
-#, c-format
-msgid "The bookmarks couldn't be loaded: %s\n"
-msgstr ""
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "ਇਕਸਟੈਨਸ਼ਨ(_E)"
 
-#: ../midori/main.c:1934
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "ਅਤੀਤ(_H)"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "ਯੂਜ਼ਰ-ਸਕ੍ਰਿਪਟ(_U)"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
 msgstr ""
 
-#: ../midori/main.c:1948
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "ਨਵੀਂ ਟੈਬ(_T)"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "ਟਰਾਂਸਫਰ(_T)"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
 msgstr ""
 
-#: ../midori/main.c:1962
-msgid "The following errors occured:"
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "ਬੰਦ ਕੀਤੀਆਂ ਟੈਬਾਂ(_C)"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
 msgstr ""
 
-#: ../midori/main.c:1978
-msgid "_Ignore"
-msgstr "ਅਣਡਿੱਠਾ(_I)"
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
 
-#: ../midori/midori-array.c:428
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ।"
 
-#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
-#: ../midori/midori-array.c:495
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "ਨਿਕਾਰਾ ਡੌਕੂਮੈਂਟ"
 
-#: ../midori/midori-array.c:504
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr ""
 
-#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120
-#, c-format
-msgid "Writing failed."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
 msgstr ""
 
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5426
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "ਮੌਜੂਦਾ ਪੇਜ਼ ਮੁੜ-ਲੋਡ ਕਰੋ"
 
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:452
+#: ../midori/midori-browser.c:514
 #, c-format
-msgid "%d%% loaded"
-msgstr "%d%% ਲੋਡ ਕੀਤਾ"
+msgid "Failed to update title: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:490
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
-msgid "Failed to update title: %s\n"
+msgid "Value '%s' is invalid for %s"
 msgstr ""
 
-#: ../midori/midori-browser.c:504
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr ""
 
-#: ../midori/midori-browser.c:711
-msgid "New folder"
-msgstr "ਨਵਾਂ ਫੋਲਡਰ"
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
 
-#: ../midori/midori-browser.c:711
-msgid "Edit folder"
-msgstr "ਫੋਲਡਰ ਸੋਧ"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:713
-msgid "New bookmark"
-msgstr "ਨਵਾਂ ਬੁੱਕਮਾਰਕ"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:713
-msgid "Edit bookmark"
-msgstr "ਬੁੱਕਮਾਰਕ ਸੋਧ"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "ਬੁੱਕਮਾਰਕ"
 
-#: ../midori/midori-browser.c:744
-msgid "_Title:"
-msgstr "ਟਾਈਟਲ(_T):"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
-msgid "_Description:"
-msgstr "ਵੇਰਵਾ(_D):"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
-#: ../extensions/feed-panel/main.c:376
-msgid "_Address:"
-msgstr "ਐਡਰੈੱਸ(_A):"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4582
-msgid "_Folder:"
-msgstr "ਫੋਲਡਰ(_F):"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4587 ../midori/midori-browser.c:4619
-msgid "Toplevel folder"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
 msgstr ""
 
-#: ../midori/midori-browser.c:845
-msgid "Show in the tool_bar"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
 msgstr ""
 
-#: ../midori/midori-browser.c:860
-msgid "Run as _web application"
-msgstr "ਵੈੱਬ ਐਪਲੀਕੇਸ਼ਨ ਵਜੋਂ ਚਲਾਓ(_w)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
 
-#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4637
-#: ../midori/midori-browser.c:4669
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "ਫਾਇਲ ਇੰਝ ਸੰਭਾਲੋ"
 
-#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
-#, c-format
-msgid "%s of %s"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
 msgstr ""
 
-#: ../midori/midori-browser.c:1386
-#, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
 msgstr ""
 
-#: ../midori/midori-browser.c:1390
-msgid "Transfer completed"
-msgstr "ਟਰਾਂਸਫਰ ਪੂਰਾ ਹੋਇਆ"
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
 
-#: ../midori/midori-browser.c:1530
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲੋ"
 
-#: ../midori/midori-browser.c:2253
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../midori/midori-browser.c:2329 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "ਨਵੀਂ ਫੀਡ"
 
-#: ../midori/midori-browser.c:2370 ../midori/midori-browser.c:5491
-#: ../panels/midori-bookmarks.c:242
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "ਨਵਾਂ ਬੁੱਕਮਾਰਕ ਸ਼ਾਮਲ"
 
-#: ../midori/midori-browser.c:2927 ../panels/midori-history.c:332
-#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr ""
-
-#: ../midori/midori-browser.c:3007 ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "ਖਾਲੀ"
 
-#: ../midori/midori-browser.c:3628 ../midori/sokoke.c:403
-#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467
-#: ../midori/sokoke.c:481
-msgid "Could not run external program."
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
 msgstr ""
 
-#: ../midori/midori-browser.c:3942 ../midori/midori-browser.c:5885
-#, c-format
-msgid "Failed to insert new history item: %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:4275 ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:751
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "ਸਭ ਟੈਬਾਂ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
 
-#: ../midori/midori-browser.c:4282 ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
-msgid "Open in New _Tab"
-msgstr "ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
-
-#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ(_W)"
 
-#: ../midori/midori-browser.c:4508
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "ਅਰੋਰਾ"
 
-#: ../midori/midori-browser.c:4509
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr ""
 
-#: ../midori/midori-browser.c:4510
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "ਓਪੇਰਾ"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "ਕੋਨਿਊਰੋਰ"
 
-#: ../midori/midori-browser.c:4512
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "ਏਪੀਫਨੀ"
 
-#: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ…"
 
-#: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5496
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ(_I)"
 
-#: ../midori/midori-browser.c:4547
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 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 "ਕਸਟਮ…"
-
-#: ../midori/midori-browser.c:4648
-msgid "Failed to import bookmarks"
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
 msgstr ""
 
-#: ../midori/midori-browser.c:4684
-msgid "Failed to export bookmarks"
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
 msgstr ""
 
-#: ../midori/midori-browser.c:4738 ../panels/midori-history.c:141
-#: ../panels/midori-history.c:171
-#, c-format
-msgid "Failed to remove history item: %s\n"
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4844
-msgid "Clear Private Data"
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4848
-msgid "_Clear private data"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ(_C)"
-
-#: ../midori/midori-browser.c:4862
-msgid "Clear the following data:"
-msgstr "ਹੇਠ ਦਿੱਤਾ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ:"
-
-#: ../midori/midori-browser.c:4873 ../midori/midori-preferences.c:530
-#: ../panels/midori-history.c:119
-msgid "History"
-msgstr "ਅਤੀਤ"
-
-#: ../midori/midori-browser.c:4879
-msgid "Cookies"
-msgstr "ਕੂਕੀਜ਼"
-
-#: ../midori/midori-browser.c:4884
-msgid "'Flash' Cookies"
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4889
-msgid "Website icons"
-msgstr "ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ"
-
-#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:1310
-msgid "_Closed Tabs"
-msgstr "ਬੰਦ ਕੀਤੀਆਂ ਟੈਬਾਂ(_C)"
-
-#: ../midori/midori-browser.c:4899 ../extensions/web-cache.c:464
-msgid "Web Cache"
-msgstr "ਵੈੱਬ ਕੈਸ਼"
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
 
-#: ../midori/midori-browser.c:4907
-msgid "Clear private data when _quitting Midori"
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:5015
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "ਹਲਕਾ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਹੈ।"
 
-#: ../midori/midori-browser.c:5031
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੧੦\n"
 "ਪੰਜਾਬੀ ਓਪਨਸੋਰਸ ਟੀਮ (POST)\n"
-"http://www.satuj.com"
+"http://www.satuj.com\n"
+"\n"
+"Launchpad Contributions:\n"
+"  A S Alam https://launchpad.net/~aalam-users"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../midori/midori-browser.c:5341 ../midori/sokoke.c:1311
-msgid "New _Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
-
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "ਨਵੀਂ ਵਿੰਡ ਖੋਲ੍ਹੋ"
 
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "ਨਵੀਂ ਟੈਬ ਖੋਲ੍ਹੋ"
 
-#: ../midori/midori-browser.c:5347
-msgid "P_rivate Browsing"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਬਰਾਊਜ਼ਿੰਗ(_r)"
-
-#: ../midori/midori-browser.c:5348
-msgid "Don't save any private data while browsing"
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
 msgstr ""
 
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../midori/midori-browser.c:5355
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "ਫਾਇਲ 'ਚ ਸੰਭਾਲੋ"
 
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr ""
 
-#: ../midori/midori-browser.c:5358
-msgid "Add shortcut to speed dial"
-msgstr ""
-
-#: ../midori/midori-browser.c:5360
-msgid "Add Shortcut to the _desktop"
-msgstr "ਸ਼ਾਰਟਕੱਟ ਡੈਸਕਟਾਪ ਉੱਤੇ ਜੋੜੋ(_d)"
-
-#: ../midori/midori-browser.c:5361
-msgid "Add shortcut to the desktop"
-msgstr ""
-
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr ""
 
-#: ../midori/midori-browser.c:5364
-msgid "Subscribe to this news feed"
-msgstr ""
-
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "ਟੈਬ ਬੰਦ ਕਰੋ(_C)"
 
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "ਮੌਜੂਦਾ ਟੈਬ ਬੰਦ ਕਰੋ"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)"
 
-#: ../midori/midori-browser.c:5373
-msgid "Close this window"
-msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
-
-#: ../midori/midori-browser.c:5376
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "ਮੌਜੂਦਾ ਪੇਜ਼ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../midori/midori-browser.c:5379
-msgid "Quit the application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰੋ"
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
 
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../midori/midori-browser.c:5385
-msgid "Undo the last modification"
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5388
-msgid "Redo the last modification"
-msgstr ""
-
-#: ../midori/midori-browser.c:5392
-msgid "Cut the selected text"
-msgstr ""
-
-#: ../midori/midori-browser.c:5395 ../midori/midori-browser.c:5398
-msgid "Copy the selected text"
-msgstr ""
-
-#: ../midori/midori-browser.c:5401
-msgid "Paste text from the clipboard"
-msgstr ""
-
-#: ../midori/midori-browser.c:5404
-msgid "Delete the selected text"
-msgstr ""
-
-#: ../midori/midori-browser.c:5407
-msgid "Select all text"
-msgstr ""
-
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr ""
 
-#: ../midori/midori-browser.c:5413
-msgid "Find the next occurrence of a word or phrase"
-msgstr ""
-
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr ""
 
-#: ../midori/midori-browser.c:5416
-msgid "Find the previous occurrence of a word or phrase"
-msgstr ""
-
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr ""
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "ਟੂਲਬਾਰ(_T)"
 
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5438
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:5441
-msgid "Reset the zoom level"
-msgstr ""
-
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "ਇੰਕੋਡਿੰਗ(_E)"
 
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr ""
 
-#: ../midori/midori-browser.c:5445
-msgid "View the source code of the page"
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ ਝਲਕ ਬਦਲੋ"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr ""
 
-#: ../midori/midori-browser.c:5452
-msgid "Scroll to the left"
-msgstr ""
-
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr ""
 
-#: ../midori/midori-browser.c:5455
-msgid "Scroll down"
-msgstr ""
-
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr ""
 
-#: ../midori/midori-browser.c:5458
-msgid "Scroll up"
-msgstr ""
-
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr ""
 
-#: ../midori/midori-browser.c:5461
-msgid "Scroll to the right"
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
 msgstr ""
 
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "ਜਾਓ(_G)"
 
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5470
-msgid "Go forward to the next page"
-msgstr ""
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr ""
 
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5478
-msgid "Go to the next sub-page"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
 msgstr ""
 
-#: ../midori/midori-browser.c:5481
-msgid "Go to your homepage"
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
 msgstr ""
 
-#: ../midori/midori-browser.c:5483
-msgid "Empty Trash"
-msgstr "ਰੱਦà©\80 à¨\96ਾਲà©\80 à¨\95ਰà©\8b"
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "ਹà©\8bਮਪà©\87à¨\9c਼(_H)"
 
-#: ../midori/midori-browser.c:5484
-msgid "Delete the contents of the trash"
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
 msgstr ""
 
-#: ../midori/midori-browser.c:5486
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ"
+
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "ਬੰਦ ਕੀਤੀ ਟੈਬ ਫੇਰ ਖੋਲ੍ਹੋ(_C)"
 
-#: ../midori/midori-browser.c:5487
-msgid "Open the last closed tab"
-msgstr "ਪਿਛਲੀ ਬੰਦ ਕੀਤੀ ਟੈਬ ਖੋਲ੍ਹੋ"
-
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ ਸ਼ਾਮਲ(_f)"
 
-#: ../midori/midori-browser.c:5494
-msgid "Add a new bookmark folder"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5499
-msgid "_Export bookmarks"
-msgstr "ਬੁੱਕਮਾਰਕ ਐਕਸਪੋਰਟ ਕਰੋ(_E)"
-
-#: ../midori/midori-browser.c:5502 ../midori/midori-searchaction.c:493
-msgid "_Manage Search Engines"
-msgstr "ਖੋਜ ਇੰਜਣ ਪਰਬੰਧ(_M)"
-
-#: ../midori/midori-browser.c:5503
-msgid "Add, edit and remove search engines…"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5506
-msgid "_Clear Private Data"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ(_C)"
-
-#: ../midori/midori-browser.c:5507
-msgid "Clear private data…"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ…"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5511
-msgid "_Inspect Page"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5512
-msgid "Inspect page details and access developer tools…"
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
 msgstr ""
 
-#: ../midori/midori-browser.c:5517
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "ਪਿਛਲੀ ਟੈਬ(_P)"
 
-#: ../midori/midori-browser.c:5518
-msgid "Switch to the previous tab"
-msgstr ""
-
-#: ../midori/midori-browser.c:5520
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "ਅਗਲੀ ਟੈਬ(_N)"
 
-#: ../midori/midori-browser.c:5521
-msgid "Switch to the next tab"
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
 msgstr ""
 
-#: ../midori/midori-browser.c:5523
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "ਮੌਜੂਦਾ ਟੈਬ ਉੱਤੇ ਫੋਕਸ(_C)"
 
-#: ../midori/midori-browser.c:5524
-msgid "Focus the current tab"
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
 msgstr ""
 
-#: ../midori/midori-browser.c:5526
-msgid "Open last _session"
-msgstr "ਪਿਛਲਾ ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹੋ(_s)"
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:5527
-msgid "Open the tabs saved in the last session"
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:5529
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr "ਪਿਛਲਾ ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹੋ(_s)"
+
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../midori/midori-browser.c:5531
-msgid "_Contents"
-msgstr "ਸਮੱਗਰੀ(_C)"
-
-#: ../midori/midori-browser.c:5532
-msgid "Show the documentation"
-msgstr "ਡੌਕੂਮੈਂਟੇਸ਼ਨ ਵੇਖੋ"
-
-#: ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "ਸਵਾਲ ਜਵਾਬ(_F)"
 
-#: ../midori/midori-browser.c:5535
-msgid "Show the Frequently Asked Questions"
-msgstr ""
-
-#: ../midori/midori-browser.c:5537
-msgid "_Report a Bug"
-msgstr "ਬੱਗ ਰਿਪੋਰਟ ਕਰੋ(_R)"
-
-#: ../midori/midori-browser.c:5538
-msgid "Open Midori's bug tracker"
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
 msgstr ""
 
-#: ../midori/midori-browser.c:5541
-msgid "Show information about the program"
-msgstr ""
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "ਟੂਲ(_T)"
 
-#: ../midori/midori-browser.c:5549
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "ਮੇਨੂਬਾਰ(_M)"
 
-#: ../midori/midori-browser.c:5550
-msgid "Show menubar"
-msgstr ""
-
-#: ../midori/midori-browser.c:5553
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "ਨੇਵੀਗੇਸ਼ਨ ਬਾਰ(_N)"
 
-#: ../midori/midori-browser.c:5554
-msgid "Show navigationbar"
-msgstr ""
-
-#: ../midori/midori-browser.c:5557
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr ""
 
-#: ../midori/midori-browser.c:5558
-msgid "Show sidepanel"
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
 msgstr ""
 
-#: ../midori/midori-browser.c:5561
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "ਬੁੱਕਮਾਰਕਬਾਰ(_B)"
 
-#: ../midori/midori-browser.c:5562
-msgid "Show bookmarkbar"
-msgstr ""
-
-#: ../midori/midori-browser.c:5565
-msgid "_Transferbar"
-msgstr "ਟਰਾਂਸਫਰਬਾਰ(_T)"
-
-#: ../midori/midori-browser.c:5566
-msgid "Show transferbar"
-msgstr ""
-
-#: ../midori/midori-browser.c:5569
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "ਸਟੇਟਸਬਾਰ(_S)"
 
-#: ../midori/midori-browser.c:5570
-msgid "Show statusbar"
-msgstr ""
-
-#: ../midori/midori-browser.c:5578
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ(_A)"
 
-#: ../midori/midori-browser.c:5581 ../midori/midori-websettings.c:226
-msgid "Chinese (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
 msgstr ""
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5585
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5588 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5591 ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr ""
 
-#: ../midori/midori-browser.c:5594 ../midori/midori-websettings.c:230
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "ਯੂਨੀਕੋਡ (UTF-8)"
 
-#: ../midori/midori-browser.c:5597 ../midori/midori-websettings.c:231
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr ""
 
-#: ../midori/midori-browser.c:6145
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "ਕਸਟਮ…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr ""
 
-#: ../midori/midori-browser.c:6152
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "ਟਿਕਾਣਾ(_L)…"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr ""
 
-#: ../midori/midori-browser.c:6178
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "ਵੈੱਬ ਖੋਜ(_W)…"
 
-#: ../midori/midori-browser.c:6180
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr ""
 
-#: ../midori/midori-browser.c:6201
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr ""
 
-#: ../midori/midori-browser.c:6216
-msgid "_Recently visited pages"
-msgstr "ਤਾਜ਼ਾ ਖੋਲ੍ਹੇ ਪੇਜ਼(_R)"
-
-#: ../midori/midori-browser.c:6218
-msgid "Reopen pages that you visited earlier"
-msgstr ""
-
-#: ../midori/midori-browser.c:6233 ../midori/sokoke.c:1300
-msgid "_Bookmarks"
-msgstr "ਬੁੱਕਮਾਰਕ(_B)"
-
-#: ../midori/midori-browser.c:6235
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:6250
-msgid "_Tools"
-msgstr "ਟੂਲ(_T)"
-
-#: ../midori/midori-browser.c:6263
-msgid "_Window"
-msgstr "ਵਿੰਡੋ(_W)"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:6265
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:6279
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "ਮੇਨੂ(_M)"
 
-#: ../midori/midori-browser.c:6281
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "ਮੇਨੂ"
 
-#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6485
-msgid "_Inline Find:"
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/midori-browser.c:6516
-msgid "Previous"
-msgstr "ਪਿੱਛੇ"
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:6521
-msgid "Next"
-msgstr "ਅੱਗੇ"
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
 
-#: ../midori/midori-browser.c:6526
-msgid "Match Case"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../midori/midori-browser.c:6535
-msgid "Highlight Matches"
-msgstr "ਮਿਲਦੇ ਹਾਈਲਾਈਟ ਕਰੋ"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../midori/midori-browser.c:6547
-msgid "Close Findbar"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../midori/midori-browser.c:6593 ../panels/midori-transfers.c:142
-msgid "Clear All"
-msgstr "ਸਭ ਸਾਫ਼"
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
 
-#: ../midori/midori-browser.c:6951
-#, c-format
-msgid "Unexpected setting '%s'"
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:377
-#, c-format
-msgid "Failed to select from history\n"
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:459
-#, c-format
-msgid "Search for %s"
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
 msgstr ""
 
-#: ../midori/midori-locationaction.c:482
-#, c-format
-msgid "Search with %s"
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
 msgstr ""
 
-#: ../midori/midori-locationaction.c:1197
-#, c-format
-msgid "Failed to execute database statement\n"
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
 msgstr ""
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1254
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr ""
 
-#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
-msgid "Detach chosen panel from the window"
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
 msgstr ""
 
-#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr ""
 
-#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "ਪੈਨਲ ਬੰਦ ਕਰੋ"
 
-#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr ""
 
-#: ../midori/midori-panel.c:798
-msgid "Hide operating controls"
-msgstr ""
-
-#: ../midori/midori-websettings.c:209
-msgid "Show Blank page"
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
 msgstr ""
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr ""
 
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "ਨਵੀਂ ਟੈਬ"
 
-#: ../midori/midori-websettings.c:248
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ"
 
-#: ../midori/midori-websettings.c:249
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "ਮੌਜੂਦਾ ਟੈਬ"
 
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "ਆਈਕਾਨ"
 
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "ਛੋਟੇ ਆਈਕਾਨ"
 
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: ../midori/midori-websettings.c:268
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "ਆਈਕਾਨ ਤੇ ਟੈਕਸਟ"
 
-#: ../midori/midori-websettings.c:269
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr ""
 
-#: ../midori/midori-websettings.c:284
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "ਆਟੋਮੈਟਿਕ (ਗਨੋਮ ਜਾਂ ਇੰਵਾਇਰਨਮੈਂਟ)"
 
-#: ../midori/midori-websettings.c:285
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr ""
 
-#: ../midori/midori-websettings.c:286
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "ਕੋਈ ਪਰਾਕਸੀ ਸਰਵਰ ਨਹੀਂ"
 
-#: ../midori/midori-websettings.c:301
-msgid "All cookies"
-msgstr "ਸਭ ਕੂਕੀਜ਼"
-
-#: ../midori/midori-websettings.c:302
-msgid "Session cookies"
-msgstr "ਸ਼ੈਸ਼ਨ ਕੂਕੀਜ਼"
-
-#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:664
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
 
-#: ../midori/midori-websettings.c:319
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "ਸਫ਼ਾਰੀ"
 
-#: ../midori/midori-websettings.c:320
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:321
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "ਫਾਇਰਫਾਕਸ"
 
-#: ../midori/midori-websettings.c:322
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr ""
 
-#: ../midori/midori-websettings.c:375
-msgid "Remember last window size"
-msgstr "ਪਿਛਲਾ ਵਿੰਡੋ ਸਾਈਜ਼ ਯਾਦ ਰੱਖੋ"
-
-#: ../midori/midori-websettings.c:376
-msgid "Whether to save the last window size"
-msgstr ""
-
-#: ../midori/midori-websettings.c:384
-msgid "Last window width"
-msgstr ""
-
-#: ../midori/midori-websettings.c:385
-msgid "The last saved window width"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:393
-msgid "Last window height"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
 msgstr ""
 
-#: ../midori/midori-websettings.c:394
-msgid "The last saved window height"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 
-#: ../midori/midori-websettings.c:419
-msgid "Last panel position"
-msgstr ""
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "ਸੰਰਚਨਾ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s\n"
 
-#: ../midori/midori-websettings.c:420
-msgid "The last saved panel position"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
 msgstr ""
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:429
-msgid "Last panel page"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:430
-msgid "The last saved panel page"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
 msgstr ""
 
-#: ../midori/midori-websettings.c:438
-msgid "Last Web search"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
 msgstr ""
 
-#: ../midori/midori-websettings.c:439
-msgid "The last saved Web search"
-msgstr ""
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:448
-msgid "Show Menubar"
-msgstr "ਮੇਨੂਬਾਰ ਵੇਖੋ"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:449
-msgid "Whether to show the menubar"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
 msgstr ""
 
-#: ../midori/midori-websettings.c:457
-msgid "Show Navigationbar"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
 msgstr ""
 
-#: ../midori/midori-websettings.c:458
-msgid "Whether to show the navigationbar"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
 msgstr ""
 
-#: ../midori/midori-websettings.c:466
-msgid "Show Bookmarkbar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
 msgstr ""
 
-#: ../midori/midori-websettings.c:467
-msgid "Whether to show the bookmarkbar"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
 msgstr ""
 
-#: ../midori/midori-websettings.c:475
-msgid "Show Panel"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
 msgstr ""
 
-#: ../midori/midori-websettings.c:476
-msgid "Whether to show the panel"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
 msgstr ""
 
-#: ../midori/midori-websettings.c:491
-msgid "Show Transferbar"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the transferbar"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
 msgstr ""
 
-#: ../midori/midori-websettings.c:500
-msgid "Show Statusbar"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
 msgstr ""
 
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the statusbar"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
 msgstr ""
 
-#: ../midori/midori-websettings.c:510
-msgid "Toolbar Style:"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr ""
 
-#: ../midori/midori-websettings.c:511
-msgid "The style of the toolbar"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:527
-msgid "Show progress in location entry"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
 msgstr ""
 
-#: ../midori/midori-websettings.c:528
-msgid "Whether to show loading progress in the location entry"
-msgstr ""
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "ਮੁੜ ਟਰਾਈ"
 
-#: ../midori/midori-websettings.c:543
-msgid "Search engines in location completion"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:544
-msgid "Whether to show search engines in the location completion"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
 msgstr ""
 
-#: ../midori/midori-websettings.c:552
-msgid "Toolbar Items"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
 msgstr ""
 
-#: ../midori/midori-websettings.c:553
-msgid "The items to show on the toolbar"
-msgstr ""
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "ਲਿੰਕ ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
 
-#: ../midori/midori-websettings.c:561
-msgid "Compact Sidepanel"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:562
-msgid "Whether to make the sidepanel compact"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:577
-msgid "Show operating controls of the panel"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
 msgstr ""
 
-#: ../midori/midori-websettings.c:578
-msgid "Whether to show the operating controls of the panel"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
 msgstr ""
 
-#: ../midori/midori-websettings.c:593
-msgid "Align sidepanel on the right"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
 msgstr ""
 
-#: ../midori/midori-websettings.c:594
-msgid "Whether to align the sidepanel on the right"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
 msgstr ""
 
-#: ../midori/midori-websettings.c:609
-msgid "Open panels in separate windows"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:610
-msgid "Whether to always open panels in separate windows"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
 msgstr ""
 
-#: ../midori/midori-websettings.c:619
-msgid "When Midori starts:"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:620
-msgid "What to do when Midori starts"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
 msgstr ""
 
-#: ../midori/midori-websettings.c:629
-msgid "Homepage:"
-msgstr ""
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "ਵਿਡੀਓ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_A)"
 
-#: ../midori/midori-websettings.c:630
-msgid "The homepage"
-msgstr ""
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "ਵਿਡੀਓ ਡਾਊਨਲੋਡ ਕਰੋ(_V)"
 
-#: ../midori/midori-websettings.c:645
-msgid "Show crash dialog"
-msgstr "à¨\95ਰà©\88ਸ਼ à¨¡à¨¾à¨\88ਲਾà¨\97 à¨µà©\87à¨\96à©\8b"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "à¨\90ਡਰà©\88ੱਡ à¨¨à¨µà©\80à¨\82 à¨\9fà©\88ਬ à¨µà¨¿à©±à¨\9a à¨\96à©\8bਲà©\8dਹà©\8b(_T)"
 
-#: ../midori/midori-websettings.c:646
-msgid "Show a dialog after Midori crashed"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
 msgstr ""
 
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:662
-msgid "Show speed dial in new tabs"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
 msgstr ""
 
-#: ../midori/midori-websettings.c:663
-msgid "Show speed dial in newly opened tabs"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:671
-msgid "Save downloaded files to:"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
 msgstr ""
 
-#: ../midori/midori-websettings.c:672
-msgid "The folder downloaded files are saved to"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:693
-msgid "Ask for the destination folder"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:694
-msgid "Whether to ask for the destination folder when downloading a file"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
 msgstr ""
 
-#: ../midori/midori-websettings.c:713
-msgid "Notify when a transfer has been completed"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
 msgstr ""
 
-#: ../midori/midori-websettings.c:714
-msgid "Whether to show a notification when a transfer has been completed"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:726
-msgid "Download Manager"
-msgstr "ਡਾਊਨਲੋਡ ਮੈਨੇਜਰ"
-
-#: ../midori/midori-websettings.c:727
-msgid "An external download manager"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:735
-msgid "Text Editor"
-msgstr "ਟੈਕਸਟ ਐਡੀਟਰ"
-
-#: ../midori/midori-websettings.c:736
-msgid "An external text editor"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:751
-msgid "News Aggregator"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:752
-msgid "An external news aggregator"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
 msgstr ""
 
-#: ../midori/midori-websettings.c:760
-msgid "Location entry Search"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:761
-msgid "The search to perform inside the location entry"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:769
-msgid "Preferred Encoding"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:770
-msgid "The preferred character encoding"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
 msgstr ""
 
-#: ../midori/midori-websettings.c:780
-msgid "Always Show Tabbar"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
 msgstr ""
 
-#: ../midori/midori-websettings.c:781
-msgid "Always show the tabbar"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
 msgstr ""
 
-#: ../midori/midori-websettings.c:789
-msgid "Close Buttons on Tabs"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr ""
 
-#: ../midori/midori-websettings.c:790
-msgid "Whether tabs have close buttons"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 
-#: ../midori/midori-websettings.c:798
-msgid "Open new pages in:"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:799
-msgid "Where to open new pages"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 
-#: ../midori/midori-websettings.c:808
-msgid "Open external pages in:"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:809
-msgid "Where to open externally opened pages"
-msgstr ""
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "ਖਾਲੀ ਪੇਜ਼"
 
-#: ../midori/midori-websettings.c:818
-msgid "Middle click opens Selection"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
 msgstr ""
 
-#: ../midori/midori-websettings.c:819
-msgid "Load an address from the selection via middle click"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
 msgstr ""
 
-#: ../midori/midori-websettings.c:827
-msgid "Open tabs in the background"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
 msgstr ""
 
-#: ../midori/midori-websettings.c:828
-msgid "Whether to open new tabs in the background"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
 msgstr ""
 
-#: ../midori/midori-websettings.c:836
-msgid "Open Tabs next to Current"
-msgstr ""
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "ਫੀਚਰ"
 
-#: ../midori/midori-websettings.c:837
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
 msgstr ""
 
-#: ../midori/midori-websettings.c:845
-msgid "Open popups in tabs"
-msgstr ""
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:846
-msgid "Whether to open popup windows in tabs"
-msgstr ""
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
-msgid "Load images automatically"
-msgstr ""
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:857
-msgid "Load and display images automatically"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
 msgstr ""
 
-#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
-msgid "Enable scripts"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
 msgstr ""
 
-#: ../midori/midori-websettings.c:865
-msgid "Enable embedded scripting languages"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
 msgstr ""
 
-#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
-msgid "Enable Netscape plugins"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
 msgstr ""
 
-#: ../midori/midori-websettings.c:873
-msgid "Enable embedded Netscape plugin objects"
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
 msgstr ""
 
-#: ../midori/midori-websettings.c:889
-msgid "Enable HTML5 database support"
+#: ../midori/midori-download.vala:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
 msgstr ""
 
-#: ../midori/midori-websettings.c:890
-msgid "Whether to enable HTML5 database support"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
 msgstr ""
 
-#: ../midori/midori-websettings.c:896
-msgid "Enable HTML5 local storage support"
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
 msgstr ""
 
-#: ../midori/midori-websettings.c:897
-msgid "Whether to enable HTML5 local storage support"
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
 msgstr ""
 
-#: ../midori/midori-websettings.c:905
-msgid "Enable offline web application cache"
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
 msgstr ""
 
-#: ../midori/midori-websettings.c:906
-msgid "Whether to enable offline web application cache"
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
 msgstr ""
 
-#: ../midori/midori-websettings.c:931
-msgid "Zoom Text and Images"
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
 msgstr ""
 
-#: ../midori/midori-websettings.c:932
-msgid "Whether to zoom text and images"
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
 msgstr ""
 
-#: ../midori/midori-websettings.c:947
-msgid "Find inline while typing"
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
 msgstr ""
 
-#: ../midori/midori-websettings.c:948
-msgid "Whether to automatically find inline while typing"
-msgstr ""
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "ਸ਼ੁਰੂਆਤ"
 
-#: ../midori/midori-websettings.c:963
-msgid "Kinetic scrolling"
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:964
-msgid "Whether scrolling should kinetically move according to speed"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
 msgstr ""
 
-#: ../midori/midori-websettings.c:972
-msgid "Accept cookies"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:973
-msgid "What type of cookies to accept"
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:989
-msgid "Original cookies only"
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
 msgstr ""
 
-#: ../midori/midori-websettings.c:990
-msgid "Accept cookies from the original website only"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
 msgstr ""
 
-#: ../midori/midori-websettings.c:998
-msgid "Maximum cookie age"
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
 msgstr ""
 
-#: ../midori/midori-websettings.c:999
-msgid "The maximum number of days to save cookies for"
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1016
-msgid "Remember last visited pages"
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1017
-msgid "Whether the last visited pages are saved"
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "ਰਵੱਈਆ"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "ਪਸੰਦੀਦਾ ਭਾਸ਼ਾ"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "ਟੈਕਸਟ ਐਡੀਟਰ"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "ਨੈੱਟਵਰਕ"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "ਵੈੱਬ ਕੈਸ਼"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "ਪਰਾਈਵੇਸੀ"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "ਇਕਸਟੈਨਸ਼ਨ"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "ਖੋਜ ਇੰਜਣ ਪਰਬੰਧ(_M)"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "ਨਾਂ(_N):"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "ਵੇਰਵਾ(_D):"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "ਐਡਰੈੱਸ(_A):"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr "ਟੋਕਨ(_T):"
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr "ਡਿਫਾਲਟ ਵਜੋਂ ਵਰਤੋਂ(_d)"
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "ਖੋਜ ਇੰਜਣ ਸੰਭਾਲੇ ਨਹੀਂ ਜਾ ਸਕੇ। %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "ਪਿੱਛੇ"
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "ਅੱਗੇ"
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>ਵੱਖਰੇਵਾਂ</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "ਅਤੀਤ"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "ਅੱਜ"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "ਕੱਲ੍ਹ"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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 "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "ਫਾਇਲ ਚੁਣੋ"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr "ਸਭ ਫੈਲਾਓ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "ਸਭ ਸਮੇਟੋ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "ਸਵਾਲ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "ਹਾਂ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "ਨਹੀਂ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "ਨਾਂ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "ਸਭ ਫੈਲਾਓ(_E)"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "ਸਭ ਸਮੇਟੋ(_C)"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1025
-msgid "Maximum history age"
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1026
-msgid "The maximum number of days to save the history for"
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1034
-msgid "Remember last downloaded files"
+#: ../extensions/feed-panel/feed-atom.c:314
+msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1035
-msgid "Whether the last downloaded files are saved"
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1052
-msgid "Proxy server"
-msgstr ""
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "ਫੀਡ"
 
-#: ../midori/midori-websettings.c:1053
-msgid "The type of proxy server to use"
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1062
-msgid "HTTP Proxy Server"
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1063
-msgid "The proxy server used for HTTP connections"
+#: ../extensions/feed-panel/feed-panel.c:757
+msgid "_Feeds"
+msgstr "ਫੀਡ(_F)"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1078
-msgid "Detect proxy server automatically"
+#: ../extensions/feed-panel/feed-parse.c:237
+#, c-format
+msgid "Unsupported feed format."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1079
-msgid "Whether to detect the proxy server automatically from the environment"
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
 msgstr ""
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1095
-msgid "Identify as"
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1096
-msgid "What to identify as to web pages"
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1112
-msgid "Identification string"
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1113
-msgid "The application identification string"
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
-#: ../midori/midori-websettings.c:1128
-msgid "Preferred languages"
-msgstr "ਪਸੰਦੀਦਾ ਭਾਸ਼ਾ"
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
 
-#: ../midori/midori-websettings.c:1129
-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\""
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
 msgstr ""
 
-#: ../midori/midori-websettings.c:1144
-msgid "Clear private data"
-msgstr "ਪà©\8dਰਾà¨\88ਵà©\87à¨\9f à¨¡à¨¾à¨\9fਾ à¨¸à¨¾à¨«à¨¼ à¨\95ਰà©\8b"
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr "ਫà©\80ਡ à¨ªà©\88ਨਲ"
 
-#: ../midori/midori-websettings.c:1145
-msgid "The private data selected for deletion"
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
 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:1128 ../midori/midori-view.c:4407
-#: ../midori/midori-view.c:4411
+#: ../extensions/formhistory/formhistory.c:38
 #, c-format
-msgid "Error - %s"
-msgstr "ਗਲਤੀ - %s"
+msgid "Failed to add form value: %s\n"
+msgstr ""
 
-#: ../midori/midori-view.c:1129
-#, c-format
-msgid "The page '%s' couldn't be loaded."
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
 msgstr ""
 
-#: ../midori/midori-view.c:1134
-msgid "Try again"
-msgstr "ਮੁੜ ਟਰਾਈ"
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
 
-#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1175
-#, c-format
-msgid "Not found - %s"
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
 msgstr ""
 
-#: ../midori/midori-view.c:1397 ../midori/midori-view.c:2253
-#, c-format
-msgid "Send a message to %s"
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
 msgstr ""
 
-#: ../midori/midori-view.c:2022 ../midori/midori-view.c:2415
-msgid "Inspect _Element"
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
 msgstr ""
 
-#: ../midori/midori-view.c:2074 ../midori/midori-view.c:2152
-msgid "Open _Link"
-msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_L)"
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
 
-#: ../midori/midori-view.c:2077 ../midori/midori-view.c:2154
-msgid "Open Link in New _Tab"
-msgstr "ਲਿੰਕ ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
 
-#: ../midori/midori-view.c:2081
-msgid "Open Link in _Foreground Tab"
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 
-#: ../midori/midori-view.c:2082
-msgid "Open Link in _Background Tab"
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2161
-msgid "Open Link in New _Window"
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
 msgstr ""
 
-#: ../midori/midori-view.c:2088
-msgid "Open Link as Web A_pplication"
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
 msgstr ""
 
-#: ../midori/midori-view.c:2091
-msgid "Copy Link de_stination"
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
 msgstr ""
 
-#: ../midori/midori-view.c:2094 ../midori/midori-view.c:2173
-msgid "_Save Link destination"
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
 msgstr ""
 
-#: ../midori/midori-view.c:2095 ../midori/midori-view.c:2167
-msgid "_Download Link destination"
+#: ../extensions/history-list.vala:289
+msgid "History-List"
 msgstr ""
 
-#: ../midori/midori-view.c:2099 ../midori/midori-view.c:2135
-#: ../midori/midori-view.c:2178
-msgid "Download with Download _Manager"
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
 msgstr ""
 
-#: ../midori/midori-view.c:2111
-msgid "Open _Image in New Tab"
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
 msgstr ""
 
-#: ../midori/midori-view.c:2114
-msgid "Open Image in New Wi_ndow"
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2117
-msgid "Copy Image _Address"
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
 msgstr ""
 
-#: ../midori/midori-view.c:2120
-msgid "Save I_mage"
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
 msgstr ""
 
-#: ../midori/midori-view.c:2121
-msgid "Download I_mage"
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
 msgstr ""
 
-#: ../midori/midori-view.c:2128
-msgid "Copy Video _Address"
-msgstr "ਵਿਡੀਓ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_A)"
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
 
-#: ../midori/midori-view.c:2131
-msgid "Save _Video"
-msgstr "ਵਿਡੀਓ ਸੰਭਾਲੋ(_V)"
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
 
-#: ../midori/midori-view.c:2131
-msgid "Download _Video"
-msgstr "ਵਿਡੀਓ ਡਾਊਨਲੋਡ ਕਰੋ(_V)"
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
 
-#: ../midori/midori-view.c:2198
-msgid "Search _with"
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
 msgstr ""
 
-#: ../midori/midori-view.c:2233 ../midori/midori-view.c:2240
-msgid "_Search the Web"
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
 msgstr ""
 
-#: ../midori/midori-view.c:2261
-msgid "Open Address in New _Tab"
-msgstr "ਐਡਰੈੱਡ ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ(_T)"
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
 
-#: ../midori/midori-view.c:2547
-msgid "Open or download file"
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 
-#: ../midori/midori-view.c:2570
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
 #, c-format
-msgid "File Type: '%s'"
+msgid "SQL fails: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:2573
-#, c-format
-msgid "File Type: %s ('%s')"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
 msgstr ""
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2577
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
 #, c-format
-msgid "Open %s"
+msgid "Could not open database of extension: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:3107
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
 #, c-format
-msgid "Inspect page - %s"
+msgid "Failed to execute database statement: %s"
 msgstr ""
 
-#: ../midori/midori-view.c:3368
-msgid "Speed Dial"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
 msgstr ""
 
-#: ../midori/midori-view.c:3369
-msgid "Click to add a shortcut"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
 msgstr ""
 
-#: ../midori/midori-view.c:3370
-msgid "Enter shortcut address"
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
 msgstr ""
 
-#: ../midori/midori-view.c:3371
-msgid "Enter shortcut title"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
 msgstr ""
 
-#: ../midori/midori-view.c:3372
-msgid "Are you sure you want to delete this shortcut?"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
 msgstr ""
 
-#: ../midori/midori-view.c:3409
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
 #, c-format
-msgid "Document cannot be displayed"
+msgid "Deny %s"
 msgstr ""
 
-#: ../midori/midori-view.c:3432
+#: ../extensions/nojs/nojs-view.c:249
 #, c-format
-msgid "No documentation installed"
+msgid "Allow %s"
 msgstr ""
 
-#: ../midori/midori-view.c:3682
-msgid "Blank page"
-msgstr "ਖਾਲੀ ਪੇਜ਼"
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
 
-#: ../midori/midori-view.c:3942
-msgid "_Duplicate Tab"
-msgstr "ਡੁਪਲੀਕੇਟ ਟੈਬ(_D)"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#: ../midori/midori-view.c:3947
-msgid "_Restore Tab"
-msgstr "ਟੈਬ ਰੀ-ਸਟੋਰ(_R)"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#: ../midori/midori-view.c:3947
-msgid "_Minimize Tab"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
 msgstr ""
 
-#: ../midori/midori-view.c:3953
-msgid "Close ot_her Tabs"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
 msgstr ""
 
-#: ../midori/midori-view.c:4579
-msgid "Print background images"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
 msgstr ""
 
-#: ../midori/midori-view.c:4580
-msgid "Whether background images should be printed"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
 msgstr ""
 
-#: ../midori/midori-view.c:4632 ../midori/midori-preferences.c:381
-msgid "Features"
-msgstr "ਫੀਚਰ"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
 
-#. Page "General"
-#: ../midori/midori-preferences.c:298
-msgid "General"
-msgstr "ਆਮ"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
 
-#: ../midori/midori-preferences.c:299
-msgid "Startup"
-msgstr "ਸ਼ੁਰੂਆਤ"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
 
-#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
-msgid "Use current page as homepage"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
 msgstr ""
 
-#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "ਟਰਾਂਸਫਰ"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
 
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:349
-msgid "Appearance"
-msgstr "ਦਿੱਖ"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
 
-#: ../midori/midori-preferences.c:350
-msgid "Font settings"
-msgstr "ਫੋਂਟ ਸੈਟਿੰਗ"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
 
-#: ../midori/midori-preferences.c:352
-msgid "Default Font Family"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
 msgstr ""
 
-#: ../midori/midori-preferences.c:355
-msgid "The default font family used to display text"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
 msgstr ""
 
-#: ../midori/midori-preferences.c:358
-msgid "The default font size used to display text"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
 msgstr ""
 
-#: ../midori/midori-preferences.c:360
-msgid "Fixed-width Font Family"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
 msgstr ""
 
-#: ../midori/midori-preferences.c:363
-msgid "The font family used to display fixed-width text"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
 msgstr ""
 
-#: ../midori/midori-preferences.c:366
-msgid "The font size used to display fixed-width text"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
 msgstr ""
 
-#: ../midori/midori-preferences.c:368
-msgid "Minimum Font Size"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
 msgstr ""
 
-#: ../midori/midori-preferences.c:371
-msgid "The minimum font size used to display text"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
 msgstr ""
 
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:380
-msgid "Behavior"
-msgstr "ਰਵੱਈਆ"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
 
-#: ../midori/midori-preferences.c:393
-msgid "Enforce 96 dots per inch"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
 msgstr ""
 
-#: ../midori/midori-preferences.c:394
-msgid "Enforce a video dot density of 96 DPI"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
 msgstr ""
 
-#: ../midori/midori-preferences.c:414
-msgid "Allow scripts to open popups"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
 msgstr ""
 
-#: ../midori/midori-preferences.c:415
-msgid "Whether scripts are allowed to open popup windows automatically"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
 msgstr ""
 
-#: ../midori/midori-preferences.c:419
-msgid "Spell Checking"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
 msgstr ""
 
-#: ../midori/midori-preferences.c:422
-msgid "Enable Spell Checking"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
 msgstr ""
 
-#: ../midori/midori-preferences.c:423
-msgid "Enable spell checking while typing"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
 msgstr ""
 
-#: ../midori/midori-preferences.c:425
-msgid "Spelling dictionaries:"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
 msgstr ""
 
-#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:429
-msgid ""
-"A comma separated list of languages to be used for spell checking, for "
-"example \"en_GB,de_DE\""
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
 msgstr ""
 
-#. Page "Interface"
-#: ../midori/midori-preferences.c:435
-msgid "Interface"
-msgstr "ਇੰਟਰਫੇਸ"
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
 
-#: ../midori/midori-preferences.c:436
-msgid "Navigationbar"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
 msgstr ""
 
-#: ../midori/midori-preferences.c:446
-msgid "Browsing"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
 msgstr ""
 
-#. Page "Applications"
-#: ../midori/midori-preferences.c:468
-msgid "Applications"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
 
-#: ../midori/midori-preferences.c:469
-msgid "External applications"
-msgstr "ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
 
-#. Page "Network"
-#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
-msgid "Network"
-msgstr "ਨੈੱਟਵਰਕ"
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "ਸ਼ਾਰਟਕੱਟ"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
 
-#: ../midori/midori-preferences.c:492
-msgid "Hostname"
-msgstr "ਹੋਸਟਨਾਂ"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
 
-#. Page "Privacy"
-#: ../midori/midori-preferences.c:511
-msgid "Privacy"
-msgstr "ਪਰਾਈਵੇਸੀ"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr ""
 
-#: ../midori/midori-preferences.c:512
-msgid "Web Cookies"
-msgstr "ਵà©\88ੱਬ à¨\95à©\82à¨\95à©\80à¨\9c਼"
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "à¨\9aਿੱਤਰ"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
-msgid "days"
-msgstr "ਦਿਨ"
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "ਸà¨\95à©\8dਰਿਪà¨\9f"
 
-#: ../midori/midori-searchaction.c:917
-msgid "Add search engine"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:917
-msgid "Edit search engine"
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:945
-msgid "_Name:"
-msgstr "ਨਾਂ(_N):"
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr ""
 
-#: ../midori/midori-searchaction.c:989
-msgid "_Icon:"
-msgstr "ਆਈਕਾਨ(_I):"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
 
-#: ../midori/midori-searchaction.c:1003
-msgid "_Token:"
-msgstr "à¨\9fà©\8bà¨\95ਨ(_T):"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "à¨\9fà©\88ਬ à¨ªà©\88ਨਲ"
 
-#: ../midori/midori-searchaction.c:1234
-msgid "Manage Search Engines"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1335
-msgid "Use as _default"
-msgstr "ਡਿਫਾਲਟ ਵਜੋਂ ਵਰਤੋਂ(_d)"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr ""
 
-#: ../midori/sokoke.c:1299
-msgid "_Bookmark"
-msgstr "ਬੁੱਕਮਾਰਕ(_B)"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr ""
 
-#: ../midori/sokoke.c:1301
-msgid "Add Boo_kmark"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
 msgstr ""
 
-#: ../midori/sokoke.c:1302
-msgid "_Console"
-msgstr "ਕਨਸੋਲ(_C)"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr ""
 
-#: ../midori/sokoke.c:1303
-msgid "_Extensions"
-msgstr "ਇਕਸਟੈਨਸ਼ਨ(_E)"
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
 
-#: ../midori/sokoke.c:1304
-msgid "_History"
-msgstr "ਅਤੀਤ(_H)"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
 
-#: ../midori/sokoke.c:1305
-msgid "_Homepage"
-msgstr "ਹੋਮਪੇਜ਼(_H)"
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
 
-#: ../midori/sokoke.c:1306
-msgid "_Userscripts"
-msgstr "ਯੂਜ਼ਰ-ਸਕ੍ਰਿਪਟ(_U)"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
 
-#: ../midori/sokoke.c:1307
-msgid "New _Tab"
-msgstr "ਨਵੀਂ ਟੈਬ(_T)"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
 
-#: ../midori/sokoke.c:1308
-msgid "_Transfers"
-msgstr "ਟਰਾਂਸਫਰ(_T)"
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
 
-#: ../midori/sokoke.c:1309
-msgid "Netscape p_lugins"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ(_C)"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "ਹੇਠ ਦਿੱਤਾ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
 msgstr ""
 
-#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
-msgid "Userscripts"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
 msgstr ""
 
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
 msgstr ""
 
-#: ../panels/midori-addons.c:305
+#: ../midori/midori-history.c:27
 #, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+msgid "Failed to clear history: %s\n"
 msgstr ""
 
-#: ../panels/midori-addons.c:911
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
 #, c-format
-msgid "Can't monitor folder '%s': %s"
+msgid "Failed to remove old history items: %s\n"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:111
-msgid "Bookmarks"
-msgstr "ਬੁੱਕਮਾਰਕ"
-
-#: ../panels/midori-bookmarks.c:250
-msgid "Edit the selected bookmark"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:258
-msgid "Delete the selected bookmark"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:278
-msgid "Add a new folder"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:608
-msgid "<i>Separator</i>"
-msgstr "<i>ਵੱਖਰੇਵਾਂ</i>"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
 
-#: ../panels/midori-console.c:87
-msgid "Console"
-msgstr "ਕਨਸੋਲ"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "ਸੰਰਚਨਾ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
 
-#: ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "ਇਕਸਟੈਨਸ਼ਨ"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "ਰੱਦੀ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ। %s"
 
-#: ../panels/midori-history.c:273
-msgid "Erroneous clock time"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
 
-#: ../panels/midori-history.c:274
-msgid ""
-"The clock time lies in the past. Please check the current date and time."
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "ਪਸੰਦ ਸੋਧ(_p)"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "ਸਭ ਇਕਸਟੈਨਸ਼ਨ ਬੰਦ ਕਰੋ(_e)"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
 msgstr ""
 
-#: ../panels/midori-history.c:286
-msgid "A week ago"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
 msgstr ""
 
-#: ../panels/midori-history.c:288
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#: ../panels/midori-history.c:291
-msgid "Today"
-msgstr "ਅੱਜ"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#: ../panels/midori-history.c:293
-msgid "Yesterday"
-msgstr "ਕੱਲ੍ਹ"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
 
-#: ../panels/midori-history.c:378
-msgid "Are you sure you want to remove all history items?"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../panels/midori-history.c:438
-msgid "Bookmark the selected history item"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "ਸ਼ੈਸ਼ਨ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../panels/midori-history.c:447
-msgid "Delete the selected history item"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../panels/midori-history.c:455
-msgid "Clear the entire history"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
 msgstr ""
 
-#: ../panels/midori-history.c:953
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Filter:"
-msgstr "ਫਿਲਟਰ:"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "ਅਣਡਿੱਠਾ(_I)"
 
-#: ../panels/midori-transfers.c:479
-msgid "Open Destination _Folder"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
 msgstr ""
 
-#: ../panels/midori-transfers.c:482
-msgid "Copy Link Loc_ation"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:214
-msgid "Authentication Required"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
 msgstr ""
 
-#: ../katze/katze-http-auth.c:230
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
-"A username and a password are required\n"
-"to open this location:"
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
 msgstr ""
 
-#: ../katze/katze-http-auth.c:244
-msgid "Username"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
-
-#: ../katze/katze-http-auth.c:257
-msgid "Password"
-msgstr "ਪਾਸਵਰਡ"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#: ../katze/katze-http-auth.c:272
-msgid "_Remember password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#: ../katze/katze-throbber.c:842
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
 msgstr ""
 
-#: ../katze/katze-throbber.c:855
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
-msgid "Stock icon '%s' couldn't be loaded"
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../katze/katze-throbber.c:923
-msgid "Animation frames are broken"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
 msgstr ""
 
-#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890
-#, c-format
-msgid "Property '%s' is invalid for %s"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
 msgstr ""
 
-#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570
-msgid "Choose file"
-msgstr "ਫਾਇਲ ਚੁਣੋ"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#: ../katze/katze-utils.c:556
-msgid "Choose folder"
-msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#: ../katze/katze-preferences.c:95
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
-msgid "Preferences for %s"
+msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 
-#: ../extensions/adblock.c:398
-msgid "Configure Advertisement filters"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
 msgstr ""
 
-#: ../extensions/adblock.c:430
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, 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 "The website %s wants to store %d cookies."
 msgstr ""
 
-#: ../extensions/adblock.c:570
-msgid "Configure _Advertisement filters…"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
 msgstr ""
 
-#: ../extensions/adblock.c:818
-msgid "Edit rule"
-msgstr "ਰੂਲ ਸੋਧ"
-
-#: ../extensions/adblock.c:831
-msgid "_Rule:"
-msgstr "ਰੂਲ(_R):"
-
-#: ../extensions/adblock.c:885
-msgid "Bl_ock image"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
 msgstr ""
 
-#: ../extensions/adblock.c:890
-msgid "Bl_ock link"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
 msgstr ""
 
-#: ../extensions/adblock.c:1447
-msgid "Advertisement blocker"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
 msgstr ""
 
-#: ../extensions/adblock.c:1448
-msgid "Block advertisements according to a filter list"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:204
-msgid "Colorful Tabs"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
 msgstr ""
 
-#: ../extensions/colorful-tabs.c:205
-msgid "Tint each tab distinctly"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:82
-#: ../extensions/cookie-manager/main.c:56
-msgid "Cookie Manager"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:112
-msgid "Delete All"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:114
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:129
-msgid "Expand All"
-msgstr "ਸਭ ਫੈਲਾਓ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:136
-msgid "Collapse All"
-msgstr "ਸਭ ਸਮੇਟੋ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:578
-msgid "Do you really want to delete all cookies?"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:580
-msgid "Question"
-msgstr "ਸਵਾਲ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:589
-msgid "Only cookies which match the filter will be deleted."
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
-msgid "At the end of the session"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/apps.vala:100
 #, c-format
-msgid ""
-"<b>Host</b>: %s\n"
-"<b>Name</b>: %s\n"
-"<b>Value</b>: %s\n"
-"<b>Path</b>: %s\n"
-"<b>Secure</b>: %s\n"
-"<b>Expires</b>: %s"
+msgid "Midori (%s)"
 msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
-msgid "Yes"
-msgstr "ਹਾਂ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
-msgid "No"
-msgstr "ਨਹੀਂ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:700
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
 #, c-format
-msgid ""
-"<b>Domain</b>: %s\n"
-"<b>Cookies</b>: %d"
+msgid "Failed to create new launcher (%s): %s"
 msgstr ""
 
-#: ../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/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1091
-msgid "_Collapse All"
-msgstr "ਸਭ ਸਮੇਟੋ(_C)"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1149
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
 msgstr ""
 
-#: ../extensions/cookie-manager/main.c:40
-msgid "_Cookie Manager"
-msgstr "à¨\95à©\82à¨\95à©\80à¨\9c਼ à¨®à©\88ਨà©\87à¨\9cਰ(_C)"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "à¨\90ਪਲà©\80à¨\95à©\87ਸ਼ਨ"
 
-#: ../extensions/cookie-manager/main.c:57
-msgid "List, view and delete cookies"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:209
-msgid "Failed to find required Atom \"entry\" elements in XML data."
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:315
-msgid "Failed to find required Atom \"feed\" elements in XML data."
+#: ../extensions/apps.vala:213
+msgid "New _App"
 msgstr ""
 
-#. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:399
-#, c-format
-msgctxt "Feed"
-msgid "Last updated: %s."
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:671
-msgid "Feeds"
-msgstr "ਫੀਡ"
-
-#: ../extensions/feed-panel/feed-panel.c:724
-msgid "Add new feed"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:731
-msgid "Delete feed"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-panel.c:814
-msgid "_Feeds"
-msgstr "ਫੀਡ(_F)"
-
-#: ../extensions/feed-panel/feed-parse.c:192
-#, c-format
-msgid "Failed to find root element in feed XML data."
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:232
-#, c-format
-msgid "Unsupported feed format."
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:262
-#, c-format
-msgid "Failed to parse XML feed: %s"
-msgstr ""
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "ਟਰਾਂਸਫਰ"
 
-#: ../extensions/feed-panel/feed-rss.c:46
-msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr ""
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "ਸਭ ਸਾਫ਼"
 
-#: ../extensions/feed-panel/feed-rss.c:51
-msgid "Unsupported RSS version found."
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:148
-msgid "Failed to find required RSS \"item\" elements in XML data."
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:248
-msgid "Failed to find required RSS \"channel\" elements in XML data."
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:132
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: ../extensions/feed-panel/main.c:134
+#: ../extensions/transfers.vala:449
 #, c-format
-msgid "Feed '%s' already exists"
+msgid "The file '<b>%s</b>' has been downloaded."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:211
+#: ../extensions/transfers.vala:451
 #, c-format
-msgid "Error loading feed '%s'"
+msgid "'<b>%s</b>' and %d other files have been downloaded."
 msgstr ""
 
-#: ../extensions/feed-panel/main.c:522
-msgid "Feed Panel"
-msgstr "ਫà©\80ਡ à¨ªà©\88ਨਲ"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "à¨\9fਰਾà¨\82ਸਫਰ à¨ªà©\82ਰਾ à¨¹à©\8bà¨\87à¨\86"
 
-#: ../extensions/feed-panel/main.c:523
-msgid "Read Atom/ RSS feeds"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
 msgstr ""
 
-#: ../extensions/formhistory.c:144
-#, c-format
-msgid "Failed to add form value: %s\n"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
 msgstr ""
 
-#: ../extensions/formhistory.c:510
-msgid "Stores history of entered form data"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
 msgstr ""
 
-#: ../extensions/formhistory.c:514
-#, c-format
-msgid "Not available: %s"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
 msgstr ""
 
-#: ../extensions/formhistory.c:515
-msgid "Resource files not installed"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
 msgstr ""
 
-#: ../extensions/formhistory.c:521
-msgid "Form history filler"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
 msgstr ""
 
-#: ../extensions/mouse-gestures.c:288
-msgid "Mouse Gestures"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
 msgstr ""
 
-#: ../extensions/mouse-gestures.c:289
-msgid "Control Midori by moving the mouse"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
 msgstr ""
 
-#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
-msgid "Pageholder"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
 msgstr ""
 
-#: ../extensions/page-holder.c:161
-msgid "_Pageholder"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
 msgstr ""
 
-#: ../extensions/page-holder.c:178
-msgid "Keep one or multiple pages open in parallel to your tabs"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
 msgstr ""
 
-#: ../extensions/shortcuts.c:170
-msgid "Customize Keyboard shortcuts"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
 msgstr ""
 
-#: ../extensions/shortcuts.c:276
-msgid "Customize Sh_ortcuts…"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
 msgstr ""
 
-#: ../extensions/shortcuts.c:315
-msgid "Shortcuts"
-msgstr "ਸ਼ਾਰਟਕੱਟ"
-
-#: ../extensions/shortcuts.c:316
-msgid "View and edit keyboard shortcuts"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:84
-msgid "Images"
-msgstr "ਚਿੱਤਰ"
-
-#: ../extensions/statusbar-features.c:96
-msgid "Scripts"
-msgstr "ਸਕ੍ਰਿਪਟ"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:108
-msgid "Netscape plugins"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:149
-msgid "Statusbar Features"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:150
-msgid "Easily toggle features on web pages on and off"
+#: ../extensions/notes.vala:146
+msgid "New Note"
 msgstr ""
 
-#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
-msgid "Tab Panel"
-msgstr "ਟੈਬ ਪੈਨਲ"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#: ../extensions/tab-panel.c:609
-msgid "T_ab Panel"
+#: ../extensions/notes.vala:153
+msgid "New note"
 msgstr ""
 
-#: ../extensions/tab-panel.c:626
-msgid "Show tabs in a vertical panel"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
 msgstr ""
 
-#: ../extensions/tab-switcher.c:395
-msgid "Tab History List"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
 msgstr ""
 
-#: ../extensions/tab-switcher.c:396
-msgid "Allows to switch tabs by choosing from a list sorted by last usage"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:389
-msgid "Customize Toolbar"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:405
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:421
-msgid "Available Items"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:442
-msgid "Displayed Items"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:577
-msgid "Customize _Toolbar…"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:608
-msgid "Toolbar Editor"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
 msgstr ""
 
-#: ../extensions/toolbar-editor.c:609
-msgid "Easily edit the toolbar layout"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
 msgstr ""
 
-#: ../extensions/web-cache.c:465
-msgid "Cache HTTP communication on disk"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
 msgstr ""
 
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "ਰੂਲ ਸੋਧ"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "ਰੂਲ(_R):"
index c5694341d16c4b59b2e704ff8cb744c507c8c4ed..fc57bea183cb449da8d0fbebacf6e60433aea348 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
 # Polish translations for midori package.
-# Copyright (C) 2011 midori COPYRIGHT HOLDER
+# Copyright (C) 2014 midori COPYRIGHT HOLDER
 # This file is distributed under the same license as the midori package.
 # Przemysław Sitek <el.pescado@gazeta.pl>, 2008.
 # Łukasz Romanowicz <romanowicz88@gmail.com>, 2008.
-# Piotr Sokół <psokol@jabster.pl>, 2010, 2011, 2012, 2013.
-# 
+# Piotr Sokół <psokol@jabster.pl>, 2010, 2011, 2012, 2013, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: midori 0.4.6\n"
+"Project-Id-Version: midori 0.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-06 18:39+0000\n"
-"PO-Revision-Date: 2013-02-21 09:41+0100\n"
-"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-05 09:43+0000\n"
+"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
 "Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2014-12-06 05:54+0000\n"
+"X-Generator: Launchpad (build 17274)\n"
 "Language: pl\n"
-"X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Wyświetla zawartość stron umieszczonych w 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:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4012
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Przeglądarka internetowa"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Przeglądarka internetowa Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Wyświetla zawartość stron umieszczonych w sieci internetowej"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nowe okno prywatne"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1404
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nowa karta"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nowe okno"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Przeglądarka internetowa"
+msgid "New Private Browsing Window"
+msgstr "Nowe okno prywatne"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Tryb prywatny 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:4354
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Przeglądanie w trybie prywatnym"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Otwiera nowe, prywatne okno przeglądarki"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Obraz strony internetowej zapisano do pliku %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Otwiera ADRES jako stronę usługi internetowej"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRES"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Używa KATALOGU do przechowywania konfiguracji programu"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "KATALOG"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr ""
 "Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 "Tryb przenośny, wszystkie uruchomione pliki są przechowywane w jednym miejscu"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Wyświetla czyste okno GTK+ z widżetem WebKit, podobne do GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
-msgstr ""
+msgstr "Uruchamia w ramach gdb i zapisuje szczegóły awarii"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Uruchamia określony plik jako skrypt javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Przechwytuje obraz strony określonej jako ADRES"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Wykonuje wprowadzone polecenie"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Wypisuje polecenia dostępne z opcją -e lub --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Wypisuje wersję programu"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresy"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blokuje adresy URI określone przez WZÓR"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "WZÓR"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Resetuje działanie programu po czasie wyrażonym ilością SEKUND"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDY"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
-msgstr ""
+msgstr "Błąd: nie można odnaleźć „gdb”\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów na adres:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Sprawdź nową wersję na:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Wystąpił nieznany błąd."
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6158
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Zakładki"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Dodaj zakładkę"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Wtyczki"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historia"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Skrypty _użytkownika"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Style użytkownika"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nowa kar_ta"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Pobieranie plików"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Wtyczki _Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Zamknięte karty"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5297
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Nowe okno"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nowy _katalog"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[ADRES…]"
 
-#: ../midori/midori-array.c:551
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Nie odnaleziono pliku."
 
-#: ../midori/midori-array.c:576 ../midori/midori-array.c:615
-#: ../midori/midori-array.c:639 ../midori/midori-array.c:649
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
-msgstr "Niepoprawny dokument."
+msgstr "Uszkodzony dokument."
 
-#: ../midori/midori-array.c:658
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Nierozpoznany format zakładek."
 
-#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Przechodzi do następnej odwiedzonej strony"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5441
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Przechodzi do następnej podstrony"
 
-#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5382
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Wyszukaj w sieci..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Wczytuje ponownie bieżącą stronę"
 
-#: ../midori/midori-browser.c:456 ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Zatrzymuje wczytywanie bieżącej strony"
 
-#: ../midori/midori-browser.c:526
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
-msgstr "Nie udało się zaktualizować tytułu: %s\n"
+msgstr "Nie udało się uaktualnić tytułu: %s\n"
 
-#: ../midori/midori-browser.c:565 ../midori/midori-browser.c:621
-#: ../midori/midori-browser.c:624 ../midori/midori-websettings.c:1455
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Wartość „%s” nie jest prawidłowa dla %s"
 
-#: ../midori/midori-browser.c:573 ../midori/midori-browser.c:644
-#: ../midori/midori-browser.c:6981
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Nieoczekiwane ustawienie „%s”"
 
-#: ../midori/midori-browser.c:581 ../midori/midori-browser.c:654
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Niespodziewana czynność „%s”."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Tryb prywatny)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Nie udało się dodać nowej pozycji historii: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Wybierz [tekst]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nowy katalog"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Edytuj katalog"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Edycja katalogu"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nowa zakładka"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Edytuj zakładkę"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Edycja zakładki"
 
-#: ../midori/midori-browser.c:973
-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:1119
+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."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Dodaj odnośnik _szybkiego wybierania"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Proszę wprowadzić nazwę katalogu i wybrać jego położenie."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
 msgstr "Wyświetlanie na pasku _zakładek"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Otwieranie jako stronę usługi _internetowej"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Dodaj odnośnik _szybkiego wybierania"
 
-#: ../midori/midori-browser.c:1161 ../midori/midori-browser.c:4540
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Wybór pliku"
 
-#: ../midori/midori-browser.c:1171
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Zapisz powiązane _zasoby"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Otwarto nowe okno"
 
-#: ../midori/midori-browser.c:1404
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Otwarto nową kartę"
 
-#: ../midori/midori-browser.c:1422
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Błąd przy otwieraniu obrazka!"
 
-#: ../midori/midori-browser.c:1423
+#: ../midori/midori-browser.c:1630
 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:1429
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
-msgstr "Wystąpił błąd podczas pobierania obrazu!"
+msgstr "Błąd pobierania obrazu!"
 
-#: ../midori/midori-browser.c:1430
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Nie można pobrać wybranego obrazu."
 
-#: ../midori/midori-browser.c:1489
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Wybór pliku"
 
-#: ../midori/midori-browser.c:2461
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Wczytaj ponownie pomijając pamięć podręczną"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Wybór pliku"
 
-#: ../midori/midori-browser.c:2589
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -373,31 +389,24 @@ 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:2595 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nowe źródło wiadomości"
 
-#: ../midori/midori-browser.c:2627 ../midori/midori-browser.c:5457
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Dodaje nową zakładkę"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2676 ../midori/midori-browser.c:5333
-msgid "Share this page"
-msgstr "Udostępnia tę stronę"
-
-#: ../midori/midori-browser.c:3152 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Puste"
 
-#: ../midori/midori-browser.c:3531 ../midori/midori-browser.c:3532
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Przełącza przeglądanie kursorem klawiatury"
 
-#: ../midori/midori-browser.c:3534
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -405,113 +414,103 @@ 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:3537
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Przeglądanie _kursorem klawiatury"
 
-#: ../midori/midori-browser.c:3958 ../midori/midori-browser.c:5905
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Nie udało się dodać nowej pozycji historii: %s\n"
-
-#: ../midori/midori-browser.c:4272 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Otwórz wszystkie w nowych _kartach"
 
-#: ../midori/midori-browser.c:4279 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513
-msgid "Open in New _Tab"
-msgstr "Otwórz w nowej _karcie"
-
-#: ../midori/midori-browser.c:4282 ../midori/midori-view.c:2913
-#: ../midori/midori-view.c:4830 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: ../midori/midori-browser.c:4371
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4372
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4373
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4374
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4376
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4377
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importowanie zakładek"
 
-#: ../midori/midori-browser.c:4398 ../midori/midori-browser.c:5462
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importuj zakładki…"
 
-#: ../midori/midori-browser.c:4409
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Program:"
 
-#: ../midori/midori-browser.c:4474
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Plik XBEL lub HTML"
 
-#: ../midori/midori-browser.c:4502
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Z pliku"
 
-#: ../midori/midori-browser.c:4514
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Nie udało się zaimportować zakładek"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Zakładki XBEL"
 
-#: ../midori/midori-browser.c:4550
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Zakładki Netscape"
 
-#: ../midori/midori-browser.c:4564
+#: ../midori/midori-browser.c:4546
 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)"
+"Program Midori umożliwia tylko eksportowanie zakładek w formatach XBEL "
+"(*.xbel) i Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4579
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Nie udało się wyeksportować zakładek"
 
-#: ../midori/midori-browser.c:4795
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Wyświetla zawartość stron umieszczonych w sieci internetowej."
 
-#: ../midori/midori-browser.c:4796
+#: ../midori/midori-browser.c:4747
 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:4798
+#: ../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 "
@@ -523,374 +522,401 @@ msgstr ""
 "Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub "
 "którejś z późniejszych wersji."
 
-#: ../midori/midori-browser.c:4833
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Przemysław Sitek <el.pescado@gazeta.pl>, 2008.\n"
 "Łukasz Romanowicz <romanowicz88@gmail.com>, 2008.\n"
-"Piotr Sokół <psokol@jabster.pl>, 2010, 2011, 2012, 2013."
+"Piotr Sokół <psokol@jabster.pl>, 2010, 2011, 2012, 2013.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adam Brzęcki https://launchpad.net/~adambrzecki\n"
+"  Adrian Widerski https://launchpad.net/~adrian-widerski\n"
+"  Andrzej Markiewicz https://launchpad.net/~sowizz\n"
+"  Czacha Man https://launchpad.net/~czacha-man\n"
+"  Damian Dygulski https://launchpad.net/~dygulski13\n"
+"  Dellow https://launchpad.net/~gracz-blazej\n"
+"  Dweight https://launchpad.net/~devilsenator\n"
+"  Jacek Spławski https://launchpad.net/~zacol1\n"
+"  Karol Hajda https://launchpad.net/~iker95\n"
+"  Marcin Kaczorek https://launchpad.net/~kaczus\n"
+"  Marcin Wierzbicki https://launchpad.net/~marcin-wierzb\n"
+"  Mateusz Ciszczoń https://launchpad.net/~lugshar\n"
+"  Mateusz Łukasik https://launchpad.net/~mati75\n"
+"  Michał Ziętara https://launchpad.net/~mr.matryc\n"
+"  Piotr Sokół https://launchpad.net/~psokol\n"
+"  Piotr Strębski https://launchpad.net/~strebski\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Powiel bieżącą kartę"
 
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Plik"
 
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Otwiera nowe okno programu"
 
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Otwiera nową kartę"
 
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nowe okno p_rywatne"
 
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Otwiera plik strony"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Zapisz stronę j_ako…"
 
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Zapisuje stronę do pliku"
 
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Utwórz odnośnik _szybkiego wybierania"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5316
-msgid "Create _Launcher"
-msgstr "Utwórz _aktywator"
-
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Zasubskrybuj _kanał wiadomości"
 
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Zamknij kartę"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Zamyka bieżącą kartę"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Za_mknij okno"
 
-#: ../midori/midori-browser.c:5332
-msgid "_Share"
-msgstr "_Udostępnij"
-
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Drukuje bieżącą stronę"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Za_mknij wszystkie okna"
 
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Wyszukaj…"
 
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Wyszukuje słowa lub wyrażenia na stronie"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Wyszukaj _następne"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Wyszukaj p_oprzednie"
 
-#: ../midori/midori-browser.c:5376
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Otwiera okno preferencji programu"
 
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Widok"
 
-#: ../midori/midori-browser.c:5379
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Paski _narzędziowe"
 
-#: ../midori/midori-browser.c:5384
-msgid "Reload page without caching"
-msgstr "Wczytaj ponownie pomijając pamięć podręczną"
-
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Powiększa rozmiar strony"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Zmniejsza rozmiar strony"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodowanie znaków"
 
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Wyświetl ź_ródło"
 
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Wyświetl źródło _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Przeglądanie _kursorem klawiatury"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Przełącza widok trybu pełnoekranowego"
 
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Przewiń w _lewo"
 
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Przewiń w _dół"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Przewiń w gó_rę"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Przewiń w _prawo"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Tryb zwiększonej _czytelności"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../midori/midori-browser.c:5430
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Przechodzi do poprzedniej odwiedzonej strony"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Przechodzi do poprzedniej podstrony"
 
-#: ../midori/midori-browser.c:5446
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Następny lub naprzód"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Przechodzi do następnej podstrony lub następnej odwiedzonej strony"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Strona główna"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Przechodzi do strony głównej"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Wyczyść listę"
 
-#: ../midori/midori-browser.c:5452
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Przywróć _zamkniętą kartę"
 
-#: ../midori/midori-browser.c:5459
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Utwórz _katalog"
 
-#: ../midori/midori-browser.c:5465
-msgid "_Export bookmarks"
-msgstr "_Eksportuj zakładki…"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "Importuj zakładki..."
 
-#: ../midori/midori-browser.c:5468 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Zarządzaj wyszukiwarkami…"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "Eksportuj zakładki..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Zarządzaj wyszukiwarkami"
 
-#: ../midori/midori-browser.c:5471
-msgid "_Clear Private Data"
-msgstr "_Usuń prywatne dane…"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "Usuń prywatne dane"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Zbadaj stronę…"
 
-#: ../midori/midori-browser.c:5478
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Poprzednia karta"
 
-#: ../midori/midori-browser.c:5481
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Następna karta"
 
-#: ../midori/midori-browser.c:5483
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Przesuń kartę na _pierwsze miejsce"
 
-#: ../midori/midori-browser.c:5485
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Przemieść kartę w _lewo"
 
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Przemieść kartę w p_rawo"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Przesuń kartę na _ostatnie miejsce"
 
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Uaktywnij _zawartość"
 
-#: ../midori/midori-browser.c:5495
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Uaktywnij n_astępny element"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Ukryj etykietę _bieżącej karty"
 
-#: ../midori/midori-browser.c:5501
-msgid "_Duplicate Current Tab"
-msgstr "_Powiel bieżącą kartę"
-
-#: ../midori/midori-browser.c:5504
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Zamknij pozo_stałe karty"
 
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Przywróć ostatnią _sesję"
 
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Często zadawane pytania"
 
-#: ../midori/midori-browser.c:5515
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Zgłoś błąd w programie…"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-browser.c:6177
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: ../midori/midori-browser.c:5527
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Pasek _menu"
 
-#: ../midori/midori-browser.c:5531
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Pasek _narzędziowy"
 
-#: ../midori/midori-browser.c:5535
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Panel _boczny"
 
-#: ../midori/midori-browser.c:5536
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panel boczny"
 
-#: ../midori/midori-browser.c:5539
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Pasek _zakładek"
 
-#: ../midori/midori-browser.c:5543
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Pasek _stanu"
 
-#: ../midori/midori-browser.c:5552 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "Wybór _automatyczny"
 
-#: ../midori/midori-browser.c:5555 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chińskie tradycyjne (BIG5)"
 
-#: ../midori/midori-browser.c:5558 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chińskie uproszczone (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5562
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japońskie (SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5565 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreańskie (EUC-KR)"
 
-#: ../midori/midori-browser.c:5568 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rosyjskie (KOI8-R)"
 
-#: ../midori/midori-browser.c:5571 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: ../midori/midori-browser.c:5574 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Zachodnie (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5577 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Dostosuj…"
 
-#: ../midori/midori-browser.c:6083
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Nie udało uruchomić historii: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separator"
 
-#: ../midori/midori-browser.c:6090
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Pasek położenia…"
 
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Wprowadza określone położenie"
 
-#: ../midori/midori-browser.c:6114
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Wyszukiwarka…"
 
-#: ../midori/midori-browser.c:6116
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej"
 
-#: ../midori/midori-browser.c:6143
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Wyświetla listę ostatnio zamkniętych kart i okien"
 
-#: ../midori/midori-browser.c:6160
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Wyświetla zapisane zakładki"
 
-#: ../midori/midori-browser.c:6193
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Karty"
 
-#: ../midori/midori-browser.c:6195
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Wyświetla listę otwartych kart"
 
-#: ../midori/midori-browser.c:6209
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6211
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Wyświetla polecenia paska menu"
 
@@ -899,20 +925,20 @@ msgstr "Wyświetla polecenia paska menu"
 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:897 ../extensions/addons.c:1675
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1330
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Wyeksportuj certyfikat"
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Podpis certyfikatu uwierzytelniającego nie jest znany."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -920,15 +946,15 @@ msgstr ""
 "Certyfikat nie pasuje do oczekiwanej tożsamości strony, z której został "
 "pobrany."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Aktywacja certyfikatu odbędzie się w przyszłości."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -936,47 +962,47 @@ msgstr ""
 "Certyfikat został unieważniony zgodnie z listą unieważnień certyfikatów "
 "GTIsConnection."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Algorytm certyfikatu został oceniony jako niepewny."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Wystąpił błąd podczas próby sprawdzenia certyfikatu"
 
-#: ../midori/midori-locationaction.c:1422
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Wyeksportuj certyfikat"
 
-#: ../midori/midori-locationaction.c:1437
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Podpisany przez siebie"
 
-#: ../midori/midori-locationaction.c:1460
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Szczegóły zabezpieczeń"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1543
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Wklej i p_rzejdź"
 
-#: ../midori/midori-locationaction.c:1775
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Nie zweryfikowane"
 
-#: ../midori/midori-locationaction.c:1783
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Zweryfikowane i szyfrowane połączenie"
 
-#: ../midori/midori-locationaction.c:1790
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Otwarte, nieszyfrowane połączenie"
 
 #: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
 #: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
-msgstr "Przemieszcza panel boczny na prawą stronę okna"
+msgstr "Przemieszcza panel boczny do prawej krawędzi okna"
 
 #: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
@@ -984,431 +1010,446 @@ msgstr "Zamyka panel"
 
 #: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
-msgstr "Przemieszcza panel boczny na lewą stronę okna"
+msgstr "Przemieszcza panel boczny do lewej krawędzi okna"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Wyświetlenie strony szybkiego wybierania"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Wyświetlenie strony głównej"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Wyświetlenie ostatnich kart"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Wyświetlenie ostatnich kart bez wczytywania"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Wyświetlanie pustej strony"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Wyświetlenie strony domyślnej wyszukiwarki"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Wyświetlenie strony głównej"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japońskie (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "W nowej karcie"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "W nowym oknie"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "W bieżącej karcie"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Tylko ikony"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Małe ikony"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Tylko etykiety"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Etykiety poniżej ikon"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Etykiety obok ikon"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Ustawienia środowiska"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Brak"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Określa styl paska narzędzi"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Wymuszenie używania wybranej czcionki"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 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-websettings.c:1400 ../midori/midori-websettings.c:1406
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Nie można wczytać ustawień: %s\n"
 
-#: ../midori/midori-websettings.c:1460 ../midori/midori-websettings.c:1571
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Błędna wartość konfiguracyjna „%s”"
 
-#: ../midori/midori-tab.vala:121
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Nie udało się załadować stylu arkusza: %s"
 
-#: ../midori/midori-view.c:837 ../midori/midori-view.c:967
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Wyświetl _etykietę karty"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Ukryj _etykietę karty"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Zamknij kartę po p_rawej"
+msgstr[1] "Zamknij karty po p_rawej"
+msgstr[2] "Zamknij karty po p_rawej"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Ufaj tej stronie"
 
-#: ../midori/midori-view.c:965
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Nieznany stan zabezpieczeń"
 
-#: ../midori/midori-view.c:1301
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "Strona „%s” chce zapisać bazę danych HTML5."
 
-#: ../midori/midori-view.c:1305 ../midori/midori-view.c:1337
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Odmów"
 
-#: ../midori/midori-view.c:1305 ../midori/midori-view.c:1337
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Zezwól"
 
-#: ../midori/midori-view.c:1333
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "Strona „%s” chce poznać lokalizację użytkownika."
 
-#: ../midori/midori-view.c:1470
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Błąd - %s"
+msgid "'%s' can't be found"
+msgstr "Nie można odnaleźć „%s”"
 
-#: ../midori/midori-view.c:1471
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Nie można wczytać strony „%s”."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Nie można wczytać strony „%s”:"
 
-#: ../midori/midori-view.c:1473 ../midori/midori-view.c:1617
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Proszę sprawdzić pisownie adresu,"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Upewnić się, że kabel sieciowy jest podłączony lub karta sieci "
+"bezprzewodowej jest włączona,"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Sprawdzić, czy ustawienia sieciowe są prawidłowe."
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Wczytaj ponownie"
 
-#: ../midori/midori-view.c:1614
-#, fuzzy, c-format
+#: ../midori/midori-view.c:1346
+#, c-format
 msgid "Oops - %s"
-msgstr "Błąd - %s"
+msgstr "Ups! %s"
 
-#: ../midori/midori-view.c:1615
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
-msgstr ""
+msgstr "Wystąpił problem z „%s”."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Wczytaj ponownie"
 
-#: ../midori/midori-view.c:1762 ../midori/midori-view.c:2854
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Wyślij wiadomość na adres %s"
 
-#: ../midori/midori-view.c:2639
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Dodaj _wyszukiwarkę..."
 
-#: ../midori/midori-view.c:2682 ../midori/midori-view.c:2989
-msgid "Inspect _Element"
-msgstr "Zbadaj _element…"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Otwórz _odnośnik"
 
-#: ../midori/midori-view.c:2734
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Otwórz w nowej _karcie"
 
-#: ../midori/midori-view.c:2738
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Otwórz odnośnik w nowej karcie"
 
-#: ../midori/midori-view.c:2739
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Otwórz w nowej karcie w _tle"
 
-#: ../midori/midori-view.c:2742
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: ../midori/midori-view.c:2745
-msgid "Open Link as Web A_pplication"
-msgstr "Otwórz jako stronę _usługi internetowej"
-
-#: ../midori/midori-view.c:2750
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "_Skopiuj adres odnośnika"
 
-#: ../midori/midori-view.c:2756
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Zapisz j_ako…"
 
-#: ../midori/midori-view.c:2766
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Otwórz _obraz w nowym oknie"
 
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Otwórz obraz w nowej _karcie"
 
-#: ../midori/midori-view.c:2771
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Skopiuj _obraz"
 
-#: ../midori/midori-view.c:2774
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Zapisz _obraz"
 
-#: ../midori/midori-view.c:2777
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Otwórz w przeglądarce obrazów"
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "_Skopiuj adres nagrania wideo"
 
-#: ../midori/midori-view.c:2787
-msgid "Save _Video"
-msgstr "Zapisz nagranie _wideo"
-
-#: ../midori/midori-view.c:2787
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Pobierz nagranie _wideo"
 
-#: ../midori/midori-view.c:2813
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otwórz adres w nowej _karcie"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Wyszukaj _za pomocą"
 
-#: ../midori/midori-view.c:2842
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Wyszukaj w sieci"
 
-#: ../midori/midori-view.c:2862
-msgid "Open Address in New _Tab"
-msgstr "Otwórz adres w nowej _karcie"
-
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Otwórz _ramkę w nowej karcie"
 
-#: ../midori/midori-view.c:3126
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Zbadaj _element…"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Otwórz lub pobierz plik z %s"
 
-#: ../midori/midori-view.c:3139
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../midori/midori-view.c:3144
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Typ pliku: „%s”"
 
-#: ../midori/midori-view.c:3146
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Typ pliku: %s („%s”)"
 
-#: ../midori/midori-view.c:3183
+#: ../midori/midori-view.c:2778
 #, 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:3194
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Otwieranie %s"
 
-#: ../midori/midori-view.c:3723
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Badanie - %s"
 
-#: ../midori/midori-view.c:4279
-#, c-format
-msgid "No documentation installed"
-msgstr "Brak zainstalowanej dokumentacji"
-
-#: ../midori/midori-view.c:4355
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori nie przechowuje żadnych danych osobistych:"
 
-#: ../midori/midori-view.c:4356
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "historia i ciasteczka nie są zapisywane,"
 
-#: ../midori/midori-view.c:4357
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "rozszerzenia są wyłączone,"
 
-#: ../midori/midori-view.c:4358
+#: ../midori/midori-view.c:3901
 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:4359
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori zapobiega śledzeniu użytkownika przez witryny:"
 
-#: ../midori/midori-view.c:4360
+#: ../midori/midori-view.c:3903
 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:4361
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "wczesne pobieranie wpisów DNS jest wyłączone,"
 
-#: ../midori/midori-view.c:4362
+#: ../midori/midori-view.c:3905
 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:4363
+#: ../midori/midori-view.c:3906
 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:4403
+#: ../midori/midori-view.c:3949
 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:4453
-msgid "Page loading delayed"
-msgstr "Wstrzymano wczytywanie strony"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Opóźniono wczytywanie strony:"
 
-#: ../midori/midori-view.c:4454
+#: ../midori/midori-view.c:4000
 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:4455
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Wczytaj stronę"
 
-#: ../midori/midori-view.c:4620
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Pusta strona"
 
-#: ../midori/midori-view.c:4834
-msgid "_Duplicate Tab"
-msgstr "_Powiel kartę"
-
-#: ../midori/midori-view.c:4839
-msgid "Show Tab _Label"
-msgstr "Wyświetl _etykietę karty"
-
-#: ../midori/midori-view.c:4839
-msgid "Show Tab _Icon Only"
-msgstr "Ukryj _etykietę karty"
-
-#: ../midori/midori-view.c:4846
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5540
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "Poprzednie"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5559
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "Następne"
 
-#: ../midori/midori-view.c:5572
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Drukowanie obrazów tła"
 
-#: ../midori/midori-view.c:5573
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Drukuje obrazy tła stron"
 
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Treść"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "Pobrano %s z %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1416,7 +1457,7 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1424,7 +1465,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1433,27 +1474,27 @@ msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - pozostało %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Pobrany plik jest uszkodzony."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1462,136 +1503,132 @@ msgstr ""
 "obliczona. Oznacza to, że prawdopodobnie plik jest niekompletny lub został "
 "zmodyfikowany."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Brak uprawnień do zapisywania we wskazanym położeniu."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, 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-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Szybkie wybieranie"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Proszę kliknąć, aby dodać odnośnik"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Proszę wprowadzić adres URL odnośnika:"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Proszę wprowadzić nazwę odnośnika:"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Usunąć odnośnik?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Domyślna czynność:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Strona główna:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Wprowadza adres bieżącej strony jako adres strony głównej"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Użyj bieżącej strony"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Czcionka o zmiennej szerokości:"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:336
+#: ../midori/midori-preferences.c:342
 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:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Czcionka stałej szerokości:"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:345
+#: ../midori/midori-preferences.c:351
 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:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimalny rozmiar czcionki:"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Określa minimalny rozmiar czcionki używany do wyświetlania tekstu"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Kodowanie znaków:"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Wczytywanie obrazów"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Wykonywanie skryptów"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Obsługa WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Obsługa wtyczek Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Skalowanie tekstu i obrazów"
@@ -1604,11 +1641,19 @@ msgstr "Otwieranie nowych okien przez skrypty"
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Umożliwia skryptom automatyczne otwieranie nowych okien"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Domyślny poziom powiększenia"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Wstępny współczynnik powiększający nowo otwarte karty przez"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Preferowane języki:"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1617,119 +1662,119 @@ msgstr ""
 "wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-"
 "us;q=1.0, fr-fr;q=0.667”."
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Położenie pobierania:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Przeglądanie"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Styl:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Wygląd:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Otwieranie nowych stron:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Zachowanie nowych kart:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Przyciski zamykania kart"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Zawsze widoczny pasek kart"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Wyświetlanie nowych kart obok bieżącej karty"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Otwieranie kart w tle"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Edytor tekstu:"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Czytnik wiadomości:"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Sieć"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Serwer pośredniczący:"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nazwa serwera:"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "Adres URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port:"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
-msgstr ""
+msgstr "Obsługiwane typy proxy:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Pamięć podręczna:"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Określa maksymalny rozmiar pamięci podręcznej stron"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identyfikator:"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Czas przechowywania ciasteczek:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr ""
 "Określa maksymalny czas przechowywania ciasteczek dla stron internetowych"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Akceptowanie ciasteczek pochodzących tylko z odwiedzonych stron"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blokuje ciasteczka wysyłane przez nieodwiedzone strony"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1737,127 +1782,126 @@ msgstr ""
 "Ciasteczka przechowują dane logowania, zapisane stany gier lub profile "
 "użytkownika używane w celach reklamowych."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Pamięć podręczna rozłączonych usług internetowych"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Obsługa lokalnego magazynu HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr ""
 "Skracanie adresów przekierowanych stron internetowych w\n"
 "nagłówkach HTTP"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 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-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Czas przechowywania historii:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Określa maksymalny czas przechowywania historii odwiedzonych stron"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Wtyczki"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Zarządzaj wyszukiwarkami…"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Dodawanie wyszukiwarki"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Edycja  wyszukiwarki"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "Słowo _kluczowe:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Wyszukiwarki"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Ustaw _domyślną"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Nie można zapisać wyszukiwarek internetowych. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historia"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Zakładki i historia"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Nie udało uruchomić historii: %s"
+msgid "Search for %s"
+msgstr "Wyszukaj wyrażenie „%s”"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Nie udało się wybrać z historii: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Wyszukaj wyrażenie „%s”"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Wyszukaj za pomocą…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Wyszukaj za pomocą %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Otwórz za pomocą"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Proszę wprowadzić polecenie służące do otworzenia „%s”:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:309
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Nie można uruchomić zewnętrznego programu."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Nieprawidłowy adres URI"
 
@@ -1882,71 +1926,105 @@ msgstr "Uwzględnianie wielkości liter"
 msgid "Close Findbar"
 msgstr "Zamyka pasek wyszukiwania"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Pobrano plik „<b>%s</b>”."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d zakładka"
+msgstr[1] "%d zakładki"
+msgstr[2] "%d zakładek"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Zakończono pobieranie"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d podkatalog"
+msgstr[1] "%d podkatalogi"
+msgstr[2] "%d podkatalogów"
 
-#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Wyczyść wszystko"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Pusty katalog"
 
-#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Trwa pobieranie plików"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Katalog zawiera %s oraz żadnych zakładek"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "Za_kończ program"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Katalog zawiera %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Pobieranie plików zostanie anulowane wraz z zakończeniem programu."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Katalog zawiera %s i %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Nie udało się dodać zakładki: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Zakładka prowadzi do: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s oraz żadnych zakładek"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Nie udało się uaktualnić zakładki: %s\n"
+msgid "%s and %s"
+msgstr "%s i %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Edytuj wybraną zakładkę"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Usuń wybraną zakładkę"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Tworzy nowy katalog zakładek"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otwórz w nowej _karcie"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Wyszukiwanie zakładek"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historia"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Wczoraj"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1954,51 +2032,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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Tydzień temu"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Nie udało się usunąć pozycji z historii: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Usunąć wszystkie pozycje z historii?"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Dodaje zakładkę do zaznaczonej pozycji z historii"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Usuwa zaznaczoną pozycję z historii"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Czyści całą historię"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Wyszukiwanie historii"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Pobieranie plików"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Otwórz _katalog pobierania"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Skopiuj położ_enie pliku"
-
-#: ../katze/katze-http-auth.c:210
-msgid "Authentication Required"
-msgstr "Wymagane uwierzytelnienie"
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Wymagane uwierzytelnienie"
 
 #: ../katze/katze-http-auth.c:226
 msgid ""
@@ -2018,114 +2084,63 @@ msgstr "Hasło:"
 msgid "_Remember password"
 msgstr "_Pamiętanie hasła"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Nie udało się wczytać nazwanej ikony „%s”"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Nie udało się wczytać standardowej ikony „%s”"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Klatki animacji są uszkodzone"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Brak"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Właściwość „%s” jest niepoprawna dla %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Wybierz plik"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Wybór katalogu"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "Godzina"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "Dzień"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "Tydzień"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "Miesiąc"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "Rok"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferencje %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Suma kontrolna MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Suma kontrolna SHA-1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Filtr reklam"
-
-#: ../extensions/adblock.c:512
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Proszę wpisać w polu adres skonfigurowanej listy filtrów i kliknąć przycisk "
-"„Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod "
-"adresem %s."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Edycja reguły"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Reguła:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Za_blokuj obraz"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Za_blokuj odnośnik"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Filtr reklam"
-
-#: ../extensions/adblock.c:1926
-msgid "Block advertisements according to a filter list"
-msgstr "Blokuje wyświetlanie treści według określonych filtrów"
-
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "Ta strona zawiera skrypt użytkownika. Zainstalować go?"
 
 #: ../extensions/addons.c:223
@@ -2145,16 +2160,16 @@ msgstr "_Zainstaluj styl"
 msgid "Don't install"
 msgstr "Nie instaluj"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Skrypty użytkownika"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Style użytkownika"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Błąd"
 
@@ -2176,40 +2191,40 @@ msgstr "Usuwa styl użytkownika"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Plik „<b>%s</b>” zostanie usunięty."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Otwiera w edytorze tekstu"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Otwiera katalog docelowy"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Dodaje nowy dodatek"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Usuwa zaznaczony dodatek"
 
-#: ../extensions/addons.c:1676 ../extensions/addons.c:1892
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Dodatki użytkownika"
 
-#: ../extensions/addons.c:1806
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Nie można obserwować katalogu „%s”: %s"
 
-#: ../extensions/addons.c:1893
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Obsługuje własne skrypty i style"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Kolorowe karty"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Wyświetla kolorowe nagłówki kart"
 
@@ -2218,43 +2233,43 @@ msgstr "Wyświetla kolorowe nagłówki kart"
 msgid "Cookie Manager"
 msgstr "Menedżer ciasteczek"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Usuń wszystko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 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:116
 msgid "Expand All"
 msgstr "Rozwija wszystkie gałęzie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Zwija wszystkie gałęzie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Usunąć wszystkie ciasteczka?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pytanie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Pod koniec sesji"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2272,15 +2287,15 @@ msgstr ""
 "<b>Data wygaśnięcia</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Tak"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2289,20 +2304,20 @@ msgstr ""
 "<b>Domena</b>: %s\n"
 "<b>Ilość ciasteczek</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nazwa:"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Rozwiń wszystko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Zwiń wszystko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Wyszukiwanie nazw lub domen ciasteczek"
 
@@ -2322,26 +2337,45 @@ msgstr "Kopiowanie adresów"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopiuje do schowka adresy wszystkich kart"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Opóźnione wczytywanie"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Opóźnienie w sekundach przed wczytaniem strony:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Opóźnienie ładowania strony do czasu właściwego użycia zakładki."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Kliknij podwójnie, aby uzyskać więcej informacji"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Wyświetla komunikaty błędów glib w obszarze powiadamiania"
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr ""
-"Wystąpił błąd podczas próby pobrania pliku przy użyciu następującej "
-"wtyczki:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Wystąpił błąd podczas próby pobrania pliku za pomocą następującej wtyczki:\n"
+"%s\n"
+"\n"
+"Błąd:\n"
+"%s\n"
+"\n"
+"Proszę spróbować ponownie po wyłączeniu wtyczki."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2372,34 +2406,34 @@ msgstr "Pobiera pliki przy użyciu programu „%s” lub własnego polecenia"
 msgid "External Download Manager - CommandLine"
 msgstr "Zewnętrzny menedżer pobierania - wiersz poleceń"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Nie udało się odnaleźć wymaganych elementów „entry” w danych XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Nie udało się odnaleźć wymaganych elementów „feed” w danych XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Ostatnio zaktualizowano: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Kanały wiadomości"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Dodaje kanał wiadomości"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Usuwa kanał wiadomości"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "Kanały _wiadomości"
 
@@ -2408,48 +2442,48 @@ msgstr "Kanały _wiadomości"
 msgid "Failed to find root element in feed XML data."
 msgstr "Nie udało się odnaleźć głównego elementu w danych XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Nieobsługiwany format kanału wiadomości."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Nie udało się uzyskać dostępu do bazy danych: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Nie udało się odnaleźć elementu „channel” w danych RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Odnaleziono nieobsługiwaną wersję RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Nie udało się odnaleźć wymaganych elementów „item” w danych RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Nie udało się odnaleźć wymaganych elementów „channel” w danych RSS XML."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Kanał wiadomości „%s” już istnieje."
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
-msgstr "Wystąpił błąd podczas wczytywania kanału wiadomości „%s”."
+msgstr "Błąd wczytywania kanału wiadomości „%s”."
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Kanały wiadomości"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Odczytuje wiadomości z kanałów Atom/RSS"
 
@@ -2470,128 +2504,414 @@ msgstr ""
 "Główne hasło wymagane\n"
 "do otwarcia bazy haseł"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Pamiętać hasła na w tej witrynie?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Nie tym razem"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nie zapamiętuj w tej witrynie"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Przełączenie ze stanu historii"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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) "
+"tylko po wciśnięciu skrótu klawiszowego (Ctrl+Shift+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Historia pól formularzy"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Przechowuje historię uzupełnionych pól formularzy"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Nie udało się wybrać sugestii\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Brak nieodwiedzonych kart"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Historia kart"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Działanie po zamknięciu karty:"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Brak"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Przełączenie do ostatniej używanej karty"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Przełączenie do najnowszej karty"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Miganie okna po otwarciu karty w tle"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Następna otwarta karta"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr ""
 "Przechodzi do następnej karty znajdującej się na liście ostatnio otwartych "
 "kart"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Poprzednia otwarta karta"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr ""
 "Przechodzi do poprzedniej karty znajdującej się na liście ostatnio otwartych "
 "kart"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Wyświetl kartę w tle (Lista historii)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Wyświetl aktualnie wybraną kartę w tle"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Historia kart"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Przełącza do ostatniej używanej karty po przełączeniu lub zamknięciu bieżącej"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Błąd SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Zezwalanie"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Zezwalanie na czas sesji"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Odrzucanie"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Nie można otworzyć bazy danych wtyczki: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Nie udało się wykonać zapytania bazy danych: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Usunąć wszystkie uprawnienia JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Usunąć wszystkie uprawnienia JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"To usunie wszystkie prawa JavaScript. Będziesz pytany o prawa JavaScript na "
+"każdej stronie, którą odwiedzisz."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instancja menedżera"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instancja globalnego menedżera NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Ustawienia NoJs"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Poniżej znajduje się lista wszystkich stron i ich polityka. Możesz je usunąć "
+"poprzez ich zaznaczanie i kliknięcie <i>Usuń</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domena"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Uprawnienia"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Usuń _wszystkie"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Zezwalanie na uruchamianie skryptów ze wszystkich stron"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Domyślne _blokowanie skryptów pochodzących z nieznanych domen"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Ustalanie uprawnień domen dwupoziomowych"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Odrzuć %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Zezwól %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Zezwól %s na czas sesji"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Okno przeglądarki"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Ten podgląd instancji przeglądarki Midori należy do"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Widok"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Ten podgląd instancji Midori należy do"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Stan ikony menu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Ustaw ikonę menu do wyświetlania na pasku stanu"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Nieokreślone"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Zezwolone"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mieszane"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Odrzucone"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Wystąpił krytyczny błąd, który uniemożliwia dalsze działanie wtyczki NoJS. "
+"Należy ją wyłączyć."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Błąd wtyczki NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Powód"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Nie można utworzyć katalogu konfiguracji wtyczki: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Nie można utworzyć katalogu konfiguracji wtyczki."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Nie można otworzyć bazy danych wtyczki."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Nie można skonfigurować struktury bazy danych wtyczki."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Wystąpienie wtyczki"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Instancja dla rozszerzenia Midori"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Wystąpienie programu"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Instancja aplikacji Midori dla tego rozszerzenia należy do"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Wystąpienie bazy danych"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Wskaźnik do instancji bazy danych sqlite wykorzystywany przez to rozszerzenie"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Ścieżka bazy danych"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Ścieżka do instancji bazy danych sqlite wykorzystywana przez to rozszerzenie"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Zezwól wszystkim stronom"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Jeśli prawda, to rozszerzenie nie będzie sprawdzać zasad dla każdej witryny, "
+"lecz wszystkie dopuści."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Tylko drugi poziom"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Jeżeli uruchomione, rozszerzenie to zredukuje każdą domenę do jej drugiego "
+"poziomu (www.example.org będzie zredukowane do example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Nieznane prawa domeny"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Prawa do użycia dla nieznanych domen."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Zaakceptuj tymczasowo"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gesty myszy"
@@ -2620,11 +2940,11 @@ msgstr "Edytor skrótów klawiszowych"
 msgid "View and edit keyboard shortcuts"
 msgstr "Umożliwia wyświetlanie i modyfikowanie skrótów klawiszowych"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Zegar paska stanu"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Wyświetla datę i czas na pasku stanu"
 
@@ -2640,6 +2960,10 @@ msgstr "Skrypty użytkownika"
 msgid "Netscape plugins"
 msgstr "Wtyczki Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Obsługa wtyczek Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Dodatki paska stanu"
@@ -2649,15 +2973,15 @@ 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:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panel kart"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Panel _kart"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Wyświetla karty w panelu bocznym"
 
@@ -2669,11 +2993,11 @@ msgstr "Ikony kart"
 msgid "New tabs have no label by default"
 msgstr "Ukrywa etykiety nowo otwieranych kart"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Modyfikowanie paska narzędziowego"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2682,67 +3006,58 @@ msgstr ""
 "Kolejność elementów można zmieniać przeciągając je na odpowiednie pozycje "
 "listy."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Dostępne elementy"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Wyświetlane elementy"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Dostosuj pasek _narzędziowy..."
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Edytor paska narzędziowego"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Umożliwia modyfikację układu paska narzędziowego"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Przechowuje dane komunikacji HTTP na dysku"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Nie udało się wczytać ciasteczek\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Usuwanie danych"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Usuń prywatne dane"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Prywatne dane:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Ostatnio otwarte _karty"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Usunięcie danych podczas _kończenia programu"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:322
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Zapisane nazwy użytkowników i _hasła"
 
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Ciasteczka i dane witryn"
 
-#: ../midori/midori-privatedata.c:331
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Ikony stron internetowych"
 
@@ -2750,209 +3065,153 @@ msgstr "Ikony stron internetowych"
 msgid "Open tabs"
 msgstr "Otwarte karty"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Więcej otwartych kart..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Nie udało się wyczyścić historii: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Nie udało się usunąć przestarzałych pozycji z historii: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "nie udało się ZAŁĄCZYĆ starej bazy danych"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "nie udało się zaimportować ze starej bazy danych"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "nie udało się cofnąć transakcji"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "nie udało się ODŁĄCZYĆ"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Nie udało się stworzyć tabeli zakładek: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Nie udało się dodać zakładki: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Nie udało się dokonać importu ze starej bazy danych: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Nie udało się zaktualizować zakładki: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Nie można zapisać zakładek. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Nie udało się usunąć zakładki: %s\n"
 
-#: ../midori/midori-session.c:192
+#: ../midori/midori-session.c:217
 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/midori-session.c:361
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Nie można zapisać ustawień. %s"
 
-#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Nie można wczytać sesji: %s\n"
-
-#: ../midori/midori-session.c:412
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Nie można zapisać sesji. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:129
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Nie można zapisać listy ostatnio zamkniętych kart i okien. %s"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 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."
+"Przeglądarka uległa awarii podczas ostatniego uruchomienia. Błąd może zostać "
+"głoszony pod adresem %s."
 
-#: ../midori/midori-frontend.c:347
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Zmodyfikuj p_referencje"
 
-#: ../midori/midori-frontend.c:351
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Wyłącz wszystkie _wtyczki"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii programu"
 
-#: ../midori/midori-frontend.c:365
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Porzucenie ostatnich kart"
 
-#: ../midori/midori-frontend.c:373
-#, fuzzy
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
-msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii"
+msgstr "Pokaż szczegóły ostatniej awarii"
 
-#: ../midori/midori-frontend.c:386
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
-msgstr ""
+msgstr "Uruchom w debuggerze"
 
-#: ../midori/midori-frontend.c:457
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Pogram Midori jest już uruchomiony lecz nie odpowiada.\n"
 
-#: ../midori/midori-frontend.c:490
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Nie można wczytać zakładek: %s\n"
 
-#: ../midori/midori-frontend.c:521
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Nie można wczytać sesji: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, 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/midori-frontend.c:529
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Nie można wczytać historii: %s\n"
 
-#: ../midori/midori-frontend.c:540
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Napotkano błędy:"
 
-#: ../midori/midori-frontend.c:545
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "Z_ignoruj"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Zezwalanie"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Zezwalanie na czas sesji"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Odmawianie"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Nie można otworzyć bazy danych wtyczki: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Nie udało się wykonać zapytania bazy danych: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Usunąć wszystkie uprawnienia ciasteczek?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Usuwanie uprawnień ciasteczek"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
-msgstr "Zostaną usunięte uprawnienia wszystkich witryn. "
+msgstr ""
+"Ta czynność spowoduje usunięcie uprawnień ciasteczek. Zostaniesz poproszony "
+"o ich ponowne określenie dla każdej odwiedzonej strony."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Menedżer uprawnień ciasteczek"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
-msgstr ""
+msgstr "Instancja obecnego managera uprawnień ciasteczek"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
-msgstr ""
+msgstr "Określ uprawnienia ciasteczek"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2966,23 +3225,13 @@ msgstr ""
 "domenie, wpisując w pole jej nazwę, wybierając domyślne działanie i klikając "
 "przycisk <i>Dodaj</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domena"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Uprawnienia"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Usuń _wszystkie"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Prawa dla ciasteczek dla domen, których nie ma na liście: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "_Pytanie o uprawnienia dla nieznanych domen"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Zapytaj o decyzję"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2996,124 +3245,66 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Błąd wtyczki uprawnień ciasteczek"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Powód"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Nie można utworzyć katalogu konfiguracji wtyczki: %s"
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr "Nie można ustalić ogólnych uprawnień ciasteczek dla domeny: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Nie można utworzyć katalogu konfiguracji wtyczki."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Do końca sesji"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Nie można otworzyć bazy danych wtyczki."
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Strona %s prosi o pozwolenie na przechowywanie %d ciasteczek."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Nie można skonfigurować struktury bazy danych wtyczki."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
-#, c-format
-msgid "Could not determine global cookie policy to set for domain: %s"
-msgstr "Nie można ustalić ogólnych uprawnień ciasteczek dla domeny: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
-msgid "Till session end"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
-#, c-format
-msgid "The website %s wants to store %d cookies."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
-msgstr ""
+msgstr "Strona %s prosi o pozwolenie na przechowanie ciasteczka."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr ""
+msgstr "Wiele stron prosi o pozwolenie na przechowanie %d ciasteczek."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Zezwól"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Zezwól na czas _sesji"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Odmów"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
-msgstr ""
+msgstr "Odmów _tym razem"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Ścieżka"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Wartość"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Data wygaśnięcia"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Wystąpienie wtyczki"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Wystąpienie programu"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Wystąpienie bazy danych"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Ścieżka bazy danych"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
+"Zasady dotyczące domen nieskonfigurowanych indywidualnie. Działa tylko na "
+"rzecz dalszego ograniczenia globalnej polityki ciasteczek skonfigurowanych w "
+"ustawieniach Midori."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3121,886 +3312,263 @@ msgstr "Menedżer bezpieczeństwa ciasteczek"
 
 #: ../extensions/cookie-permissions/main.c:63
 msgid "Manage cookie permission per site"
-msgstr ""
-
-#~ msgid "Writing failed."
-#~ msgstr "Nieudane zapisywanie."
-
-#~ msgid "Custom..."
-#~ msgstr "Własne…"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr ""
-#~ "Określa jak przeglądarka ma się identyfikować przed stronami internetowymi"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Kinetyczne przewijanie"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr ""
-#~ "Dopasowuje prędkość przewijania, do prędkości ruchu urządzenia "
-#~ "wskazującego"
-
-#~ msgid "Middle click opens Selection"
-#~ msgstr ""
-#~ "Otwieranie odnośników zaznaczonych adresów URL\n"
-#~ "kliknięciem środkowego przycisku myszy"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Otwiera zaznaczony adres kliknięciem środkowego przycisku myszy"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "Nie można uzyskać ścieżki konfiguracji wtyczki: ścieżka jest pusta"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Nie można uzyskać ścieżki konfiguracji wtyczki."
-
-#~ msgid "_Window"
-#~ msgstr "_Okno"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Przekierowuje ostrzeżenia terminala do określonego PLIKU"
-
-#~ msgid "FILENAME"
-#~ msgstr "PLIK"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Utwórz odnośnik na _pulpicie"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Wyróżnianie"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Pamiętaj ostatni rozmiar okna"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Zapamiętuje ostatni rozmiar okna programu"
-
-#~ msgid "Last window width"
-#~ msgstr "Ostatnia szerokość okna"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Ostatnia zapisana szerokość okna"
-
-#~ msgid "Last window height"
-#~ msgstr "Ostatnia wysokość okna"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Ostatnia zapisana wysokość okna"
-
-#~ msgid "Last panel position"
-#~ msgstr "Ostatnia pozycja panelu"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Ostatnio zapisana pozycja panelu"
-
-#~ msgid "Last panel page"
-#~ msgstr "Ostatni panel strony"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Ostatnio zapamiętany panel strony"
-
-#~ msgid "Last Web search"
-#~ msgstr "Ostatnie wyszukiwanie"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Ostatnio zapisane wyszukiwanie"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Przełącza widoczność paska poleceń"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Przełącza wyświetlanie paska poleceń"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Pokaż pasek nawigacji"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Przełącza wyświetlanie paska nawigacyjnego"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Wyświetlanie paska zakładek"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Przełącza wyświetlanie paska zakładek"
-
-#~ msgid "Show Panel"
-#~ msgstr "Pokaż panel"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Przełącza wyświetlanie panelu bocznego"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Pasek _stanu"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Przełącza wyświetlanie paska stanu"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Elementy paska narzędziowego"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Określa wygląd paska narzędziowego"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Zwarty panel boczny"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Przełącza wyświetlanie panelu bocznego w trybie zwartym"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Przypnij panel boczny do prawej strony"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Otwieranie paneli w oddzielnych oknach"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Otwiera wszystkie panale w oddzielnych oknach"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Określa domyślną czynność wykonywaną po uruchomieniu programu"
-
-#~ msgid "The homepage"
-#~ msgstr "Wprowadza adres strony głównej"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Określa katalog, w którym są zapisywane pobierane pliki"
-
-#~ msgid "An external text editor"
-#~ msgstr "Określa zewnętrzny edytor tekstu"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "Określa zewnętrzny czytnik wiadomości"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Adres domyślnej wyszukiwarki internetowej"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Określa preferowane kodowanie znaków"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Wyświetla pasek kart nawet gdy otwarto tylko jedną kartę"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Wyświetla przyciski zamykania na kartach"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Określa sposób otwierania nowych stron"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Otwiera karty w tle"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Otwieranie wyskakującyh okienek jako karty"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "Czy otwierać wyskakujące okienka jako karty"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Wczytuje i wyświetla obrazy automatycznie"
-
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Wykonuje osadzone skrypty"
-
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Używa wbudowanych wtyczek Netscape"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Sprawdza pisownię podczas wprowadzania tekstu"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Obsługa baz danych HTML5"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Przełącza obsługę baz danych HTML5"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Przełącza obsługę lokalnych magazynów HTML5"
-
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Włącza pamięć podręczną rozłączonych usług internetowych"
-
-#~ msgid "Flash the browser window if a new tab was opened in the background"
-#~ msgstr "Powiadamianie miganiem okna o otwarciu karty w tle"
-
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Umożliwia używanie OpenGL do renderowania stron internetowych"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Umożliwia skalowanie tekstu i obrazów"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Wyszukiwanie inkrementalne podczas wpisywania tekstu"
-
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr ""
-#~ "Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania"
-
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Określa typ używanego serwera pośredniczącego"
-
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "Serwer pośredniczący HTTP:"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Określa serwer pośredniczący w połączeniach HTTP"
-
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "Określa port serwera pośredniczącego w połączeniach HTTP"
-
-#~ msgid "Identification string"
-#~ msgstr "Identyfikacja"
-
-#~ msgid "The application identification string"
-#~ msgstr "Ciąg indentyfikujący przeglądarkę"
-
-#~ msgid "Clear private data"
-#~ msgstr "Usuń prywatne dane"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Prywatne dane zaznaczone do usunięcia"
-
-#~ msgid "Clear data"
-#~ msgstr "Usuń dane"
-
-#~ msgid "The data selected for deletion"
-#~ msgstr "Dane zaznaczone do usunięcia"
-
-#~ msgid "Filter:"
-#~ msgstr "Filtr:"
-
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr ""
-#~ "Wprowadza wyrażenie filtra i wyświetla ciasteczka o nazwie domeny "
-#~ "pasującej do niego"
-
-#~ 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 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"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr ""
-#~ "Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Tworzy odnośnik do strony na ekranie szybkiego wybierania"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Tworzy odnośnik do strony na pulpicie"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Tworzy na pulpicie aktywator z odnośnikiem do bieżącej strony"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Subskrybuje kanał wiadomości"
-
-#~ msgid "Close this window"
-#~ msgstr "Zamyka bieżące okno"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Zamyka wszystkie otwarte okna programu"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Cofa ostatnią czynność"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Powtarza ostatnią czynność"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Wycina zaznaczony tekst"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Kopiuje zaznaczony tekst"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Wkleja tekst ze schowka"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Usuwa zaznaczony tekst"
-
-#~ msgid "Select all text"
-#~ msgstr "Zaznacz w_szystko"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Wyszukuje następne wystąpienie słowa lub wyrażenia"
+msgstr "Określ indywidualne uprawnienia ciasteczek"
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Wyszukuje poprzednie wystąpienie słowa lub wyrażenia"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Przywraca zwykły rozmiar strony"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Wyświetla kod źródłowy strony"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Przewija zawartość strony w lewo"
-
-#~ msgid "Scroll down"
-#~ msgstr "Przewija zawartość strony w dół"
-
-#~ msgid "Scroll up"
-#~ msgstr "Przewija zawartość strony w górę"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Przewija zawartość strony w prawo"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Czyści listę ostatnio zamkniętych kart i okien"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Otwiera ostatnio zamkniętą kartę"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Tworzy nowy katalog zakładek"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Zarządza wyszukiwarkami internetowymi"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Usuwa prywatne dane zapisane przez program…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr ""
-#~ "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia "
-#~ "programistyczne"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Przechodzi do poprzedniej karty"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Przechodzi do następnej karty"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Przemieszcza bieżącą kartę przed poprzednią kartę"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Przemieszcza bieżącą kartę za następną kartę"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Uaktywnia bieżącą kartę przeglądarki"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Wyświetla tylko ikonę bieżącej karty"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Powiela bieżącą kartę"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Zamyka wszystkie karty z wyjątkiem bieżącej"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Otwiera karty zapisane podczas ostatniej sesji"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Wyświetla najczęściej zadawane pytania"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Otwiera stronę systemu zgłaszania i monitorowania błędów"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Wyświetla informacje na temat programu"
-
-#~ msgid "Show menubar"
-#~ msgstr "Przełącza widoczność paska menu"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Przełącza widoczność paska narzędzi nawigacyjnych"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Przełącza widoczność panelu bocznego"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Przełącza widoczność paska zakładek"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Przełącza widoczność paska stanu"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Ustaw ilość kolumn i wierszy"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Proszę wprowadzić ilość kolumn i wierszy:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Wprowadzono nieprawidłowy rozmiar strony szybkiego wybierania."
-
-#~ msgid "Thumb size:"
-#~ msgstr "Rozmiar miniatur:"
-
-#~ msgid "Small"
-#~ msgstr "Mały"
-
-#~ msgid "Medium"
-#~ msgstr "Średni"
-
-#~ msgid "Big"
-#~ msgstr "Duży"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Skonfiguruj filtr _reklam…"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Nie znaleziono - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Nie można wyświetlić dokumentu"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Wymuszenie 96 DPI"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Ustawia rozdzielczość renderowania strony na 96 DPI"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Przełącza za pomocą klawiszy Ctrl+Tab pomiędzy kartami\n"
-#~ "posortowanymi według czasu ostatniego użycia."
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Godzina"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Tydzień"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Rok"
-
-#~ msgid "All cookies"
-#~ msgstr "Wszystkie"
-
-#~ msgid "Session cookies"
-#~ msgstr "Bieżącej sesji"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Pasek pobierania plików"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Przełącza wyświetlanie paska pobierania plików"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Wyszukiwarki na liście paska adresu"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr ""
-#~ "Wyświetla wyszukiwarki na liście automatycznego uzupełniania paska adresu"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Wyświetlanie przycisków konfiguracyjnych panelu"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Wyświetla przyciski konfiguracyjne panelu"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Strona szybkiego wybierania"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Wyświetla stronę szybkiego wybierania w pustych kartach"
-
-#~ msgid "Download Manager"
-#~ msgstr "Menedżer pobierania:"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Otwieranie stron przez inne programy:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Określa sposób otwierania stron przez inne programy"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Określa typy akceptowanych ciasteczek"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maksymalny okres przechowywania ciasteczek:"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Maksymalny okres przechowywania historii:"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Przechowywanie informacji o ostatnio pobranych plikach"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Określa czy będzie przechowywana lista ostatnio pobranych plików"
-
-#~ msgid "Appearance"
-#~ msgstr "Wygląd"
-
-#~ msgid "Quit the application"
-#~ msgstr "Kończy działanie programu"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Nie udało się wykonać zapytania bazy danych\n"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Pobierz za pomocą _menedżera pobierania"
-
-#~ msgid "General"
-#~ msgstr "Ogólne"
-
-#~ msgid "Font settings"
-#~ msgstr "Czcionki"
-
-#~ msgid "Interface"
-#~ msgstr "Interfejs"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Pasek narzędzi nawigacyjnych"
-
-#~ msgid "External applications"
-#~ msgstr "Zewnętrzne"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Ciasteczka"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Usuwanie ciasteczek podczas _kończenia programu"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "Pobrano %s z %s, %s/s"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Poprzednia odwiedzona karta"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Następna odwiedzona karta"
-
-#~ msgid "Previous tab from history"
-#~ msgstr ""
-#~ "Przechodzi do poprzedniej karty znajdującej się na liście ostatnio "
-#~ "odwiedzonych kart"
-
-#~ msgid "Pageholder"
-#~ msgstr "Schowek stron"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Schowek stron"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr ""
-#~ "Przechowuje otwarte strony niezależnie od zawartości głównego okna "
-#~ "programu"
-
-#~ msgid "_Contents"
-#~ msgstr "_Spis treści"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Wyświetla pomoc dotyczącą programu"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Zapisz obiekt odnośnika"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Pobierz obiekt odnośnika"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "wczytano %d%%"
-
-#~ msgid "_Transferbar"
-#~ msgstr "_Pasek pobierania plików"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Przełącza widoczność paska pobierania plików"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Pasek postępu wczytywania strony"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Wyświetla pasek postępu wczytywania strony w pasku adresu"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Wybór katalogu pobierania"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr ""
-#~ "Pyta o wskazanie katalogu docelowego każdorazowo przed rozpoczęciem "
-#~ "pobierania pliku"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Wyświetla powiadomienie gdy pobieranie zostanie zakończone"
-
-#~ msgid "Download I_mage"
-#~ msgstr "_Pobierz obraz"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Nie udało się wyczyścić historii wyszukiwania: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Odłącza panel od okna"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Przełącza widoczność przycisków konfiguracyjnych panelu"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Sprawdzanie pisowni"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Wprowadza listę języków sprawdzania pisowni, rozdzieloną znakami "
-#~ "przecinka, np.: „en_GB,pl”"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "_Zminimalizuj kartę"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimalizuje bieżącą kartę"
-
-#~ msgid "External Applications"
-#~ msgstr "Zewnętrzne programy"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Kojarzy schematy adresów URL z poleceniami"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Ostatnio odwiedzone strony"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Wyświetla listę ostatnio odwiedzonych stron"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Przechowywanie adresów ostatnio odwiedzonych stron"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Przechowuje listę ostatnio odwiedzonych stron"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Automatyczne wykrywanie serwera pośredniczącego"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Przełącza automatyczne wykrywanie serwera pośredniczącego"
-
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Ustaw ilość odnośników"
-
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Proszę wprowadzić ilość odnośników:"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "_Przywróć kartę"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Słowniki:"
-
-#~ msgid "Console"
-#~ msgstr "Konsola"
-
-#~ msgid "Copy _All"
-#~ msgstr "Skopiuj _wszystko"
-
-#~ msgid "Copy All"
-#~ msgstr "Skopiuj wszystko"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Nie udało się ustawić ikonki aplikacji w %s: %s"
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Proszę skopiować %s do katalogu „%s”."
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "Menedżer _ciasteczek"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Nie udało się utworzyć aktywatora (%s): %s"
 
-#~ msgid "REGEX"
-#~ msgstr "WYRAŻENIE REGULARNE"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Aktywator utworzony"
 
-#~ msgid "Open _Link"
-#~ msgstr "Otwórz _odnośnik"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Możesz uruchomić teraz <b>%s</b> ze swojego launchera lub menu"
 
-#~ msgid "View Selection Source"
-#~ msgstr "Pokaż źródło zaznaczenia"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Błąd tworzenia aktywatora"
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Pokaż źródło zaznaczenia"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikacje"
 
-#~ msgid "Both"
-#~ msgstr "Tekst pod ikonami"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Nowy p_rofil"
 
-#~ msgid "Both horizontal"
-#~ msgstr "Tekst obok ikon"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Tworzy nowy, niezależny profil i aktywator dla niego"
 
-#~ msgid "Load on Startup"
-#~ msgstr "Pokaż przy uruchomieniu"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nowa _aplikacja"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Przechowuj dane z formularzy"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Tworzy nową aplikację dla zdefiniowanej strony"
 
-#~ msgid "Cache size"
-#~ msgstr "Pamięć podręczna"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Błąd uruchamiania"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Rozmiar pamięci podręcznej"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Utwórz _aktywator"
 
-#~ msgid "Encoding"
-#~ msgstr "Kodowanie znaków"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Manager aplikacji webowych"
 
-#~ msgid "Enable"
-#~ msgstr "Skrypty użytkownika"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Zarządzaj stronami zainstalowanymi jako aplikacje"
 
-#~ msgid "_Disable"
-#~ msgstr "_Wyłącz"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Pobieranie plików"
 
-#~ msgid "Disable"
-#~ msgstr "_Plik"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Wyczyść wszystko"
 
-#~ msgid "URIs"
-#~ msgstr "Adresy URI"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Nie udało się otworzyć pobranego: %s"
 
-#~ msgid "[URIs]"
-#~ msgstr "[ADRES URI…]"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Otwórz _katalog pobierania"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Skopiuj położ_enie pliku"
 
-#~ msgid "Root"
-#~ msgstr "Korzeń"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Pobrano plik „<b>%s</b>”."
 
-#~ msgid "_Quick Find"
-#~ msgstr "Szybkie wyszukiwanie"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' oraz %d innych plików zostało pobrane."
 
-#~ msgid "HTTP Proxy"
-#~ msgstr "Serwer proxy HTTP"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Zakończono pobieranie"
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "Otwórz URL w nowej karcie"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Trwa pobieranie plików"
 
-#~ msgid "Source"
-#~ msgstr "Ź_ródło strony"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "Za_kończ program"
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Ikona (nazwa albo plik):"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Pobieranie plików zostanie anulowane wraz z zakończeniem programu."
 
-#~ msgid "Manage search engines"
-#~ msgstr "_Zarządzaj wyszukiwarkami"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Menedżer pobierania"
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Uwaga: Używasz konta administratora!"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Wyświetl pobrane pliki"
 
-#~ msgid "Bookmark"
-#~ msgstr "Zakładka"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Nie udało zaktualizować bazy danych: %s"
 
-#~ msgid "_Form Fill"
-#~ msgstr "Wypełnij _formularz"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Błąd wyboru z bazy danych: %s"
 
-#~ msgid "_Fullscreen"
-#~ msgstr "Tryb _pełnoekranowy"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Nie udało się zaimportować przeszłej sesji: %s"
 
-#~ msgid "_Leave Fullscreen"
-#~ msgstr "_Opuść tryb pełnoekranowy"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Pręgowany (wzdłuż)"
 
-#~ msgid "midori"
-#~ msgstr "midori"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Zarządzanie kartami i sesją."
 
-#~ msgid "Unknown argument."
-#~ msgstr "Nieznany argument"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Super piłka"
 
-#~ msgid "Settings"
-#~ msgstr "Ustawienia"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"To rozszerzenie oferuje kolejkę zadań dla aktualizacji lub zdarzeń "
+"cyklicznych."
 
-#~ msgid "Trash"
-#~ msgstr "Kosz"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Nie udało się dodać nowej notatki do bazy danych: %s\n"
 
-#~ msgid "Browser"
-#~ msgstr "Przeglądarka"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Nie udało się usunąć notatki z bazy danych: %s\n"
 
-#~ msgid "The current browser"
-#~ msgstr "Obecna przeglądarka"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Nie udało się zmienić nazwy notatki: %s\n"
 
-#~ msgid "The list of search engines"
-#~ msgstr "Lista wyszukiwarek"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Nie udało się zaktualizować notatki: %s\n"
 
-#~ msgid "The navigationbar"
-#~ msgstr "Pasek narzędzi nawigacyjnych"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notatki"
 
-#~ msgid "Tab"
-#~ msgstr "Karta"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Utwórz notatkę"
 
-#~ msgid "The current tab"
-#~ msgstr "Bieżącą karta"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Tworzy nową notatkę, nie związaną z otwartymi stronami"
 
-#~ msgid "The statusbar"
-#~ msgstr "Pasek stanu"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nowa notatka"
 
-#~ msgid "Pa_ge Setup"
-#~ msgstr "_Ustawienia strony"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Nie udało się wybrać bazy danych notatek: %s\n"
 
-#~ msgid "Show a preview of the printed page"
-#~ msgstr "Pokaż podgląd drukowanej strony"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Zmień nazwę notatki"
 
-#~ msgid "Open the selected bookmark in a new tab"
-#~ msgstr "Otwórz wybraną zakładkę w nowej karcie"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Skopiuj notatkę do schowka"
 
-#~ msgid "Open the selected bookmark in a new window"
-#~ msgstr "Otwórz wybraną zakładkę w nowym oknie"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Usuń notatkę"
 
-#~ msgid "Tab _Overview"
-#~ msgstr "P_odgląd kart"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Skopiuj jako notatkę"
 
-#~ msgid "_Work Offline"
-#~ msgstr "Pracuj bez podłączenia"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Zapisuje treści stron jako notatki"
 
-#~ msgid "Untitled"
-#~ msgstr "Bez tytułu"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Filtr reklam"
 
-#~ msgid "Limit"
-#~ msgstr "Ograniczenie"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokuje wyświetlanie treści według określonych filtrów"
 
-#~ msgid "Show New Tab"
-#~ msgstr "Pokazuj przycisk \"Nowa karta\""
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Filtr reklam"
 
-#~ msgid "Show the New Tab button in the toolbar"
-#~ msgstr "Pokaż przycisk nowej karty na pasku narzędzi"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Za_blokuj obraz"
 
-#~ msgid "Show the Homepage button in the toolbar"
-#~ msgstr "Pokaż przycisk strony startowej na pasku narzędzi"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Za_blokuj odnośnik"
 
-#~ msgid "Show Web search"
-#~ msgstr "Pokazuj wyszukiwarki internetowe"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Edycja reguły"
 
-#~ msgid "Show a notification window for finished downloads"
-#~ msgstr "Pokazuj powiadomienie dla zakończonych pobierań"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Reguła:"
index 900c17d0292d3387c5f78d200f1cc1787bd7df27..8af49fae183200351b74dc7dffded0a7a888e5a9 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
 # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the midori package.
 # Sérgio Marques <smarquespt@gmail.com> 2008-2010
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-26 07:45+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:43+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Portuguese\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-Launchpad-Export-Date: 2014-11-27 05:47+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\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:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navegador web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navegar na web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nova janela de navegação privada"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Novo separador"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nova janela"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navegador Web"
+msgid "New Private Browsing Window"
+msgstr "Nova janela de navegação privada"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori (Navegação privada)"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Abrir nova janela de navegação privada"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navegação privada"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Abrir nova janela de navegação privada"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Captura gravada em: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Executar ENDEREÇO como aplicação web"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ENDEREÇO"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Usar PASTA como pasta de configuração"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "PASTA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navegação privada, as alterações não são gravadas"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 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:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Janela GTK+ com WebKit, similar ao GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Mostrar janela de diagnóstico"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Executar com gdb e gravar um registo do erro"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
-msgstr "Executar o ficheiro como  \"javascript\""
+msgstr "Executar o ficheiro como  javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Obter uma captura da URI especificada"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Executar o comando especificado"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Lista dos comandos disponíveis para executar com -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Exibir versão do programa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
-msgstr "Endereços "
+msgstr "Endereços"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Bloquear URIs conforme a expressão PADRÃO"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PADRÃO"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Repor Midori após SEGUNDOS segundos de inatividade"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGUNDOS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Erro: \"gdb\" não encontrado\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Por favor reporte comentários, sugestões e erros em:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Verificar por novas versões a:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Ocorreu um erro desconhecido"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Adicionar mar_cador"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensões"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
-msgstr "\"Scripts\" de _utilizador"
+msgstr "Scripts de _utilizador"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Estilo_s de utilizador"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "No_vo separador"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferências"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "\"P_lug-ins\" Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Separadores _fechados"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Nova janela"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nova _pasta"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Endereços]"
 
@@ -229,134 +229,146 @@ msgstr "Documento inválido."
 msgid "Unrecognized bookmark format."
 msgstr "Formato de marcadores não reconhecido."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ir para a sub-página seguinte"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Pesquisa web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Recarregar página atual"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Parar de carregar da página atual"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Falha ao atualizar título: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "O valor \"%s\" é inválido para %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Definição inesperada \"%s\""
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Ação inesperada \"%s\"."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navegação privada)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Selecionar [texto]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nova pasta"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Editar pasta"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Novo marcador"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Editar marcador"
 
-#: ../midori/midori-browser.c:973
-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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Escreva o nome e o local para guardar o marcador"
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Adicionar à _ligação rápida"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Escreva o nome e escolha o local para guardar o marcador"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Mostrar na _barra de ferramentas"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mostrar na _barra de marcadores"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Executar como aplicação _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Adicionar à _ligação rápida"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Gravar como"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Gravar _recursos associados"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Foi aberta uma nova janela"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Foi aberto um novo separador"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Ocorreu um erro ao abrir a imagem!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 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:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Ocorreu um erro ao transferir a imagem!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "não é possível transferir a imagem."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Gravar ficheiro"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Recarregar página sem colocar em cache"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -370,31 +382,24 @@ msgstr ""
 "notícias. Da próxima vez que clicar no ícone de fontes, esta será "
 "automaticamente adicionada."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Nova fonte"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Adicionar novo marcador"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Partilhar esta página"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Vazio"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Alternar navegação de cursor de texto"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -402,109 +407,99 @@ 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:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Ativar nav_egação por cursor"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Abrir todos em _separadores"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Abrir em novo _separador"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importar marcadores…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importar marcadores"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplicação:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importar de XBEL ou HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importar de um ficheiro"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Falha ao importar marcadores"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Marcadores XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Marcadores Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "O Midori só consegue exportar para XBEL (*.xbel) e Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Falha ao exportar marcadores"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Um navegador web rápido."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Veja about:version para informações da versão."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -516,366 +511,392 @@ msgstr ""
 "Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente "
 "(por opção)."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Sérgio Marques <smarquespt@gmail.com>"
+msgstr ""
+"Sérgio Marques <smarquespt@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Diogo Lavareda https://launchpad.net/~diogolavareda\n"
+"  Filipe Catraia https://launchpad.net/~filipecatraia-deactivatedaccount\n"
+"  IvoGuerreiro https://launchpad.net/~ivoguerreiro\n"
+"  João Amaro https://launchpad.net/~joaoamaro37\n"
+"  João David Crespo Bernardes https://launchpad.net/~jony-david10\n"
+"  Laurentino https://launchpad.net/~laurentinolopes\n"
+"  Luis Manuel https://launchpad.net/~tutis\n"
+"  Pedro Monteiro https://launchpad.net/~pedro.monteiro\n"
+"  Sérgio Marques https://launchpad.net/~sergio+marques\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicar o separador atual"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Abrir nova janela"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Abrir novo separador"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nova janela de navegação p_rivada"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Gravar página como"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Gravar para ficheiro"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Adicionar à ligação rápi_da"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Subscrever _fonte de notícias"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Fechar separador"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Fechar o separador atual"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Fec_har janela"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Partilhar"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimir a página atual"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Fechar todas as jane_las"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Localizar…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Localizar palavra ou frase na página"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Localizar seg_uinte"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Localizar _anterior"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configurar preferências da aplicação"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ver"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Barra de ferramentas"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Recarregar página sem colocar em cache"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Aumentar a ampliação"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Diminuir a ampliação"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codificação"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ver código f_onte"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Ver código _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navegação ca_ret"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Alternar para ecrã completo"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Deslocar à _esquerda"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Deslocar para _baixo"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Deslocar para _cima"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Deslocar à _direita"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "Pode se_r lido"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ir para a página anterior"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ir para a sub-página anterior"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Seguinte ou Avançar"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Ir para a próxima sub-página ou página seguinte no histórico"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Página inicial"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ir para a página inicial"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Esvaziar lixo"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Anular _fecho de separadores"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Adicionar _nova pasta"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exportar marcadores"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importar marcadores..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Gerir motores de pesquisa"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exportar marcadores..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Limpar dados privados"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Gerir _motores de procura..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Limpar dados privados..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspecionar página"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Separador _anterior"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Separador _seguinte"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Mover separador para a pri_meira posição"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "M_over separador para trás"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mover separador para a frente"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Mover separador para a ú_ltima posição"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "_Focar o separador atual"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Focar visualização segui_nte"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Apenas mostrar o ícone do separador _atual"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Duplicar o separador atual"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Fec_har os outros separadores"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Abrir últi_ma sessão"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Questões frequentes"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Reportar um problema…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra de _menu"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra de _navegação"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Painel _lateral"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Painel lateral"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Barra de marcadores"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra de _estado"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Mandarim tradicional (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "mandarim simplificado (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonês (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russo (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Ocidental (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalizado…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Falha ao iniciar histórico: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separador"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Localização…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Abrir localização específica"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Pesquisa _web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Executar uma pesquisa web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Reabrir janela ou separador anteriormente fechado"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Mostrar marcadores gravados"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Separadores"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Mostrar lista de separadores abertos"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
@@ -884,35 +905,35 @@ msgstr "Menu"
 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:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "A autoridade de certificação não é conhecida."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 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:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "O certificado expirou."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -920,40 +941,40 @@ msgstr ""
 "O certificado foi revogado de acordo com a lista de revogações "
 "GTlsConnection's."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "O algoritmo do certificado não é seguro."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Ocorreram alguns erros ao validar o certificado."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Autoassinado"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Detalhes de segurança"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Cola_r e prosseguir"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Não verificada"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Ligação verificada e encriptada"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Ligação aberta e não codificada"
 
@@ -970,436 +991,449 @@ msgstr "Fechar painel"
 msgid "Align sidepanel to the left"
 msgstr "Alinhar painel lateral à esquerda"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Mostrar ligação rápida"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Mostrar página inicial"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Mostrar últimos separadores abertos"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Mostrar últimos separadores sem os carregar"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Mostrar página em branco"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Mostrar motor de pesquisa padrão"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Mostrar página personalizada"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonês (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Novo separador"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Separador atual"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Omissão"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ícones"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Ícones pequenos"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Texto"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ícones e texto"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Texto ao lado dos ícones"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automático (GNOME ou ambiente)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Servidor proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Sem servidor proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "O estilo da barra de ferramentas"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Utilizar sempre as minhas escolhas de tipo de letras"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 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:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "A configuração não foi carregada: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
-msgstr "O valor de configuração \"%s\" é inválido "
+msgstr "O valor de configuração \"%s\" é inválido"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Falha ao injetar a folha de estilo: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Mostrar _texto do separador"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Mostrar apenas o í_cone"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Fechar separador da  d_ireita"
+msgstr[1] "Fechar separadores à  d_ireita"
+
+#: ../midori/midori-notebook.vala:370
+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-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Confiar neste sítio web"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Segurança desconhecida"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s pretende gravar uma base de dados HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Rejeitar"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Permitir"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s pretende saber a sua localização."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Erro - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' não pode ser encontrada"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "A página \"%s\" não foi carregada."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "A página %s não pode ser carregada:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Tente novamente"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Verifique se o endereço tem erros ortográficos"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Verifique se o cabo está ligado corretamente se a rede sem fios está ativa"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verifique se as definições de rede estão corretas"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Tentar novamente"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Erro - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Ocorreu um erro com %s."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Tente novamente"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Enviar mensagem a %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Adicionar motor de pe_squisa"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Inspecionar _elementos"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Abrir _ligação"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "_Abrir ligação em novo separador"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Abrir ligação no _separador principal"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Abrir _ligação no separador secundário"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Abrir ligação em _nova janela"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Abrir ligação como a_plicação web"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "_Copiar destino da ligação"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Gr_avar como"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Abrir _imagem em nova janela"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Abrir _imagem em novo separador"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copiar im_agem"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Gravar image_m"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Abrir no _visualizador de imagens"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copiar _endereço do vídeo"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Gravar _vídeo"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Transferir _vídeo"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Abrir endereço em novo _separador"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Pesquisar _com"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Pesquisar na web"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Abrir endereço em novo _separador"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Abrir mol_dura em novo separador"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspecionar _elementos"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Abrir ou transferir ficheiro de %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipo de ficheiro: \"%s\""
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipo de ficheiro: %s (\"%s\")"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Abrir %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspecionar página - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Nenhuma documentação instalada"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "O Midori não guarda quaisquer dados privados."
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "O histórico e os cookies não são guardados."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "As extensões estão inativas."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "O armazenamento local de HTML5, base de dados e \"cache\" da aplicação estão "
 "inativas."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "O Midori impede que os sítios web obtenham dados do utilizador."
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Os URL são removidos do nome do servidor."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "A obtenção prévia de DNS está inativa."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "O idioma e o fuso horário não são transmitidos aos sítios web."
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Os \"plug-ins\" Flash e Netscape não são listados nos sítios web."
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 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:4511
-msgid "Page loading delayed"
-msgstr "Atualização de página atrasada"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Atraso no carregamento da página:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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."
+"O atraso no carregamento deve-se a um encerramento brusco ou às preferências "
+"de arranque."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Carregar página"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Página em branco"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Duplicar separador"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Mostrar _texto do separador"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Mostrar apenas o í_cone"
-
-#: ../midori/midori-view.c:4904
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "anterior"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "seguinte"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Imprimir imagens de fundo"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Marque se quiser imprimir as imagens de fundo"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Funcionalidades"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1407,27 +1441,27 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s restante(s)"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "O ficheiro transferido contém erros."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1436,393 +1470,394 @@ msgstr ""
 "ficheiro não foi transferido integralmente ou então foi modificado "
 "posteriormente."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Não tem permissão para escrever nesta localização."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Não possui espaço suficiente para transferir \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Precisa de %s e apenas tem livre %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Ligação rápida"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Clique para adicionar atalho"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Introduza o endereço do atalho"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Introduza o título do atalho"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
-msgstr "Tem a certeza que quer apagar este atalho?"
+msgstr "Tem a certeza que quer eliminar este atalho?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Arranque"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Ao iniciar o Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Página inicial:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Utili_zar página atual"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Usar página atual como página inicial"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Tipo de letra"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Família de letras proporcionais"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Letras com largura fixa"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Tamanho mínimo da letra"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Tamanho mínimo da letra para exibir o texto"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codificação preferida"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Carregar imagens automaticamente"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Ativar verificação ortográfica"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
-msgstr "Ativar \"scripts\""
+msgstr "Ativar scripts"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Ativar suporte a WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Ativar \"plug-ins\" Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Ampliar texto e imagens"
 
 #: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
-msgstr "Permitir que os \"scripts\" abram \"pop-ups\""
+msgstr "Permitir que os scripts abram pop-ups"
 
 #: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
-"Marque para permitir que os \"scripts\" abram janelas \"pop-up\" "
-"automaticamente"
+"Marque para permitir que os scripts abram janelas pop-up automaticamente"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Nível de ampliação padrão"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Fator inicial para ampliar novos separadores"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Idiomas preferidos"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
+"web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-"
+"fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Gravar ficheiros transferidos em:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navegar"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Estilo da barra de ferramentas:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Abrir novas páginas em:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Comportamento dos novos separadores:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Botão Fechar nos separadores"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Mostrar sempre barra de separadores"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Abrir separadores perto do atual"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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 "
+"Marque se quiser abrir os novos separadores perto do atual ou após o último"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Abrir separadores em segundo plano"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor de texto"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregador de notícias"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Rede"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nome de anfitrião"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Porta"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Tipos de proxy suportados:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "\"Web cache\""
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identificar como"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
-msgstr "Apagar cookies após:"
+msgstr "Eliminar cookies após:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "O número máximo de dias para guardar os cookies"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Aceitar cookies dos sítios que eu visitar"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Bloquear cookies de sítios de terceiros"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr ""
-"Os \"cookies\" guardam dados ou perfis de utilizador para publicitar "
-"produtos."
+"Os cookies guardam dados ou perfis de utilizador para publicitar produtos."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Ativar \"cache\" de aplicações web \"offline\""
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Ativar suporte a armazenagem local HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 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-preferences.c:581
+#: ../midori/midori-preferences.c:615
 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-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
-msgstr "Apagar páginas no histórico após:"
+msgstr "Eliminar páginas no histórico após:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "O número máximo de dias para guardar o histórico"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensões"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Gerir motores de pesquisa"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Adicionar motor de pesquisa"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editar motor de pesquisa"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descrição:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "\"_Token\":"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gerir motores de pesquisa"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Usar por _omissão"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Os motores de pesquisa não foram carregados. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Os motores de pesquisa não foram gravados. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Histórico"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Marcadores e histórico"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Falha ao iniciar histórico: %s"
+msgid "Search for %s"
+msgstr "Pesquisar por %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Falha ao selecionar do histórico: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Pesquisar por %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Pesquisar _com…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Pesquisar com %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Abrir com"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Escolha a aplicação ou comando para abrir \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Não é possível executar o programa externo."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI inválido"
 
@@ -1847,79 +1882,136 @@ msgstr "Sensível a maiúsculas"
 msgid "Close Findbar"
 msgstr "Fechar"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Falha ao adicionar marcador: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d marcador"
+msgstr[1] "%d marcadores"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Falha ao atualizar marcador: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d subpasta"
+msgstr[1] "%d subpastas"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Pasta vazia"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "A pasta contém %s e nenhum marcador"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "A pasta contém %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "A pasta contém %s e %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Marcador que conduz a: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s e nenhum marcador"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s e %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editar o marcador selecionado"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
-msgstr "Apagar o marcador selecionado"
+msgstr "Eliminar marcador selecionado"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Adicionar nova pasta"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separador</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Abrir em novo _separador"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Procurar nos marcadores"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Histórico"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Hoje"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Uma semana atrás"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Falha ao remover histórico: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Marcar o item de histórico selecionado"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
-msgstr "Apagar o item de histórico selecionado"
+msgstr "Eliminar item de histórico selecionado"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Limpar todo o histórico"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Procurar no histórico"
 
@@ -1947,125 +2039,75 @@ msgstr "Senha"
 msgid "_Remember password"
 msgstr "_Lembrar senha"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "O ícone \"%s\"  não foi carregado"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "O ícone \"%s\"  não foi carregado"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "As \"frames\" de animação estão danificadas"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Nenhum"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "A propriedade \"%s\" é inválida para %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Escolha o ficheiro"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Escolha a pasta"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dia"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 semana"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mês"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 ano"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferências para %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Verificação MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Verificação SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurar filtros de publicidade"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"Digite o endereço de uma lista de filtros pré-configurados e clique em "
-"\"Adicionar\" para a adicionar à lista.\n"
-"Pode encontrar mais listas em %s."
+"Parece que a página contém um script de utilizador. Pretende instalar?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Editar regra"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Instalar script de utilizador"
 
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regra:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_oquear imagem"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_oquear ligação"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Bloqueador de publicidade"
-
-#: ../extensions/adblock.c:1926
-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
-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
-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
-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?"
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+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
 msgid "_Install user style"
@@ -2075,71 +2117,71 @@ msgstr "_Instalar estilo de utilizador"
 msgid "Don't install"
 msgstr "Não instalar"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
-msgstr "\"Scripts\" de utilizador"
+msgstr "Scripts de utilizador"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Estilos de utilizador"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Erro"
 
 #: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
-msgstr "Pretende apagar \"%s\"?"
+msgstr "Pretende eliminar \"%s\"?"
 
 #: ../extensions/addons.c:417
 msgid "Delete user script"
-msgstr "Apagar \"script\" de utilizador"
+msgstr "Eliminar script de utilizador"
 
 #: ../extensions/addons.c:418
 msgid "Delete user style"
-msgstr "Apagar estilo de utilizador"
+msgstr "Eliminar estilo de utilizador"
 
 #: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
-msgstr "O ficheiro \"<b>%s</b>\" será apagado permanentemente."
+msgstr "O ficheiro \"<b>%s</b>\" será eliminado permanentemente."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Abrir no editor de texto"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Abrir pasta de destino"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Adicionar novo extra"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Remover o extra selecionado"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Extras de utilizador"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
-msgstr "Não é possível vigiar a pasta \"%s\": %s "
+msgstr "Não é possível vigiar a pasta \"%s\": %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
-msgstr "Suporte a \"scripts\" e estilos de utilizador"
+msgstr "Suporte a scripts e estilos de utilizador"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Separadores coloridos"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Cor distinta para cada separador"
 
@@ -2148,43 +2190,43 @@ msgstr "Cor distinta para cada separador"
 msgid "Cookie Manager"
 msgstr "Gestor de cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
-msgstr "Apagar todos"
+msgstr "Eliminar tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
 msgstr ""
-"Apagar todos os \"cookies\". Se definir um filtro, só serão eliminados os "
-"\"cookies\" que coincidam com o filtro."
+"Elimina 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:116
 msgid "Expand All"
 msgstr "Expandir tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Recolher tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
-msgstr "Deseja realmente apagar todos os cookies?"
+msgstr "Deseja realmente eliminar todos os cookies?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pergunta"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
-msgstr "Só serão apagados os cookies que coincidam com o filtro."
+msgstr "Só serão eliminados os cookies que coincidam com o filtro."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "No fim da sessão"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2202,43 +2244,43 @@ msgstr ""
 "<b>Expira</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Sim"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Não"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
 "<b>Cookies</b>: %d"
 msgstr ""
 "<b>Domínio</b>: %s\n"
-"<b>\"Cookies\"</b>: %d"
+"<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nome"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandir tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Re_colher tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
-msgstr "Procurar \"cookies\" por nome ou domínio"
+msgstr "Procurar cookies por nome ou domínio"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
-msgstr "Listar, ver e apagar cookies"
+msgstr "Listar, ver e eliminar cookies"
 
 #: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
@@ -2250,27 +2292,48 @@ msgstr "Copiar endereço dos separadores"
 
 #: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
-msgstr ""
-"Copiar para a área de transferência o endereço de todos os separadores "
+msgstr "Copiar endereço de todos os separadores para a área de transferência"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Atrasar carregamento"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Atraso até carregar a página (em segundos):"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Atrasar carregamento até à utilização do separador."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Duplo clique para mais informação"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Esta extensão mostra as mensagens de erro glib na bandeja do sistema."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "Ocorreu um erro ao tentar transferir o ficheiro com:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Ocorreu um erro ao tentar transferir o ficheiro com o este plugin:\n"
+"%s\n"
+"\n"
+"Erro:\n"
+"%s\n"
+"\n"
+"Continue sem este plugin."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2310,25 +2373,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Falha ao encontrar os elementos Atom de \"feed\" nos dados XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Última atualização: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Fontes"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Adicionar nova fonte"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
-msgstr "Apagar fonte"
+msgstr "Eliminar fonte"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Fontes"
 
@@ -2347,37 +2410,37 @@ msgstr "Formato de fonte não suportado."
 msgid "Failed to parse XML feed: %s"
 msgstr "Falha ao processar a fonte XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Falha ao encontrar o elemento \"channel\" nos dados RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Encontrada uma versão RSS não suportada."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Falha ao encontrar os elementos RSS do \"item\" nos dados XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Falha ao encontrar os elementos RSS do \"channel\" nos dados XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Já existe a fonte \"%s\""
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Erro ao carregar a fonte \"%s\""
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Painel de fontes"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Ler fontes Atom/RSS"
 
@@ -2398,122 +2461,408 @@ msgstr ""
 "Precisa de um nome de utilizador e uma senha\n"
 "para abrir esta localização:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Memorizar senha para esta página?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Memorizar"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nunca para esta página"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Alternar estado do histórico de formulários"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Falha ao abrir a base de dados: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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)"
+msgstr ""
+"Só ativar através das teclas de atalho e por separador (Ctrl+Shift+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Preenchimento do formulário"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Armazena o histórico do formulário"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Falha ao selecionar as sugestões\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Não existem separadores não visitados"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Histórico-Lista"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Ação ao fechar o separador"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Nenhuma"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Mudar para o último separador visualizado"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Mudar para o separador mais recente"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Janela intermitente nos separadores secundários"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "O próximo Novo separador (lista de histórico)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "O próximo Novo separador no histórico"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "O anterior Novo separador (lista de histórico)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "O anterior Novo separador no histórico"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Exibir separador em segundo plano (histórico)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Exibir separador selecionado em segundo plano"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Lista de histórico"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Mover para o último separador utilizado ao trocar ou fechar separadores"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Falha SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Aceitar"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Aceitar nesta sessão"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloquear"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Não foi possível abrir a base de dados da extensão: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Falha ao executar instrução da base de dados: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Quer mesmo remover todas as permissões JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Remover todas as permissões JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Esta ação eliminará todas as permissões JavaScript. Ser-lhe-ão solicitadas "
+"novas permissões por cada sítio web visitado."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instância do gestor"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instância para o gestor NoJS global"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurar NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Em baixo pode ver a lista de sítios web e as políticas definidas. Pode "
+"eliminar as políticas marcando as entradas e clicando em <i>Eliminar</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domínio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Política"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Elimin_ar tudo"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "P_ermitir scripts em todos os sítios web"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Bloq_uear scripts de domínios desconhecidos"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "D_efinir permissões no domínio de segundo nível"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Recusar %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permitir %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permitir %s nesta sessão"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Janela do navegador"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "A instância Midori a que esta vista pertence"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vista"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "A instância de vista Midori a que esta vista pertence"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Estado do ícone de menu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "O estado do ícone de menu a mostrar na barra de estado"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Indeterminado"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permitido"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Misto"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Recusado"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Ocorreu um erro fatal que impede a extensão NoJS de funcionar. Deve "
+"desativar a extensão."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Erro na extensão NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Motivo"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Não foi possível criar a pasta de configuração da extensão. %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Não foi possível criar a pasta de configuração da extensão."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Não foi possível abrir a base de dados da extensão."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"Não foi possível configurar a estrutura da base de dados da extensão."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instância da extensão"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "A instância do Midori para esta extensão"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instância da aplicação"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "A instância da aplicação a que esta extensão pertence"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instância da base de dados"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Caminho para a base de dados sqlite utilizada pela extensão"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Caminho da base de dados"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Caminho para a base de dados sqlite utilizada pela extensão"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permitir todos os sítios web"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Se ativa, a extensão não verifica as políticas por sítio web e permite-os "
+"todos."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Apenas segundo nível"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Se ativa, a extensão reduzirá cada domínio ao seu segundo nível (exemplo: "
+"www.exemplo.org aparecerá como exemplo.org."
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Política de domínio desconhecido"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Política utilizada nos domínios desconhecidos."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Aceitar temporariamente"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gestos de rato"
@@ -2542,11 +2891,11 @@ msgstr "Atalhos"
 msgid "View and edit keyboard shortcuts"
 msgstr "Ver e editar os atalhos de teclado"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Relógio de barra de estado"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Mostrar data e hora na barra de estado"
 
@@ -2556,12 +2905,16 @@ msgstr "Imagens"
 
 #: ../extensions/statusbar-features.c:162
 msgid "Scripts"
-msgstr "\"Scripts\""
+msgstr "Scripts"
 
 #: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
 msgstr "\"Plug-ins\" Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Ativar \"plug-ins\" Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Funções na barra de estado"
@@ -2570,15 +2923,15 @@ msgstr "Funções na barra de estado"
 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:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Painel de separadores"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "P_ainel de separadores"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Mostrar separadores num painel vertical"
 
@@ -2590,11 +2943,11 @@ 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:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personalizar barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2602,67 +2955,58 @@ msgstr ""
 "Selecione os itens a exibir na barra de ferramentas. Os itens podem ser "
 "ordenados por arrastamento."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Itens disponíveis"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Itens exibidos"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Personalizar barra de ferramen_tas…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor da barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Editar facilmente a barra de ferramentas"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Pôr comunicações HTTP em cache"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Falha ao carregar cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Limpar dados privados"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Limpar dados privados"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Limpar os seguintes dados:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Úl_timos separadores abertos"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Limpar dados privados ao _sair do Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Autenticações e sen_has gravadas"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies e dados da página web"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Ícones de sítios web"
 
@@ -2670,188 +3014,133 @@ msgstr "Ícones de sítios web"
 msgid "Open tabs"
 msgstr "Separadores abertos"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Mais separadores abertos..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
-msgstr "Falha ao apagar o histórico: %s\n"
+msgstr "Falha ao limpar o histórico: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Falha ao remover histórico mais antigo: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "falha ao ANEXAR base de dados anterior"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "falha ao importar da base de dados anterior"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "falha ao reverter a transação"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "falha ao DESANEXAR"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Não foi possível criar a tabela de marcadores: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Falha ao adicionar marcador: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Não foi possível importar dados da base de dados anterior: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Falha ao atualizar marcador: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Os marcadores não foram gravados. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Falha ao remover marcador: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "A configuração não foi gravada. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "A sessão não foi carregada: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "A sessão não foi gravada. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "O lixo não foi gravado. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 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."
+"O Midori encerrou inesperadamente da última vez. Pode reportar o problema em "
+"%s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modificar _preferências"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Desativar todas as _extensões"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Mostrar a janela após o encerramento do Midori"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Rejeitar separadores antigos"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Mostrar jane_la de encerramento"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Executar no _depurador"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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"
+msgstr ""
+"Já está ativa uma instância de Midori mas que não está a responder.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Os marcadores não foram carregados: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "A sessão não foi carregada: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "O lixo não foi carregado: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "O histórico não foi carregado: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Ocorreram os seguintes erros:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
-msgstr "_Ignorar "
+msgstr "_Ignorar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Falha SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Aceitar nesta sessão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
-msgstr "Não foi possível abrir a base de dados de extensões: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Falha ao executar instrução da base de dados: %s"
+msgstr "Não foi possível abrir a base de dados da extensão: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
-msgstr "Deseja realmente apagar todas as permissões de cookies?"
+msgstr "Deseja realmente eliminar todas as permissões de cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr "Apagar todas as permissões de cookies?"
+msgstr "Eliminar todas as permissões de cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2859,20 +3148,20 @@ msgstr ""
 "Esta ação elimina todas as permissões de cookies. Nas próximas visitas a "
 "sítios web terá que as definir novamente."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Gestor de permissões de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instância atual do gestor de permissões de cookies"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configurar permissões de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2885,23 +3174,13 @@ msgstr ""
 "adicionar uma política manualmente, introduzindo o domínio e a política e "
 "clicando em <i>Adicionar</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domínio"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Política"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "_Apagar tudo"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Política para cookies de domínios que não estejam na lista: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Perguntar política se e_sta for desconhecida para o domínio"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Perguntar decisão"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2915,127 +3194,66 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Erro na extensão de permissões de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Motivo"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Não foi possível criar a pasta de configuração da extensão. %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Não foi possível criar a pasta de configuração da extensão."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Não foi possível abrir a base de dados da extensão."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Não foi possível configurar a estrutura da base de dados da extensão."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "Não foi possível determinar a política de cookies do domínio: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Até ao fim da sessão"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "O sítio web %s quer guardar %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "O sítio web %s quer guardar 1 cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Diversos sítios web querem guardar %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Aceitar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Aceitar para esta _sessão"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Rejeitar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Não des_ta vez"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Caminho"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valor"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Data de expiração"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instância da extensão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "A instância do Midori para esta extensão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instância da aplicação"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "A instância da aplicação a que esta extensão pertence"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instância da base de dados"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Caminho para a base de dados sqlite utilizada pela extensão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Caminho da base de dados"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Caminho para a base de dados sqlite utilizada pela extensão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Perguntar política se desconhecida"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
-"Se definido como TRUE, a extensão pede a política para todos os domínios "
-"desconhecidos. Se definido para FALSE, a extensão utiliza as políticas "
-"gerais definidas nas definições do midori."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Indeterminado"
+"A política utilizada para domínios não configurados individualmente. Apenas "
+"atua para restringir a política global de cookies definida nas preferências "
+"do Midori."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3045,369 +3263,261 @@ msgstr "Gestor de segurança dos cookies"
 msgid "Manage cookie permission per site"
 msgstr "Gerir permissões de cookies por sítio web"
 
-#: ../extensions/apps.vala:82
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Falha ao carregar ícone da aplicação em %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Falha ao criar o lançador (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Lançador criado"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Já pode abrir <b>%s</b> a partir do lançador ou menu"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Erro ao criar lançador"
+
+#: ../extensions/apps.vala:191
 msgid "Applications"
 msgstr "Aplicações:"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Novo _perfil"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Cria um novo perfil independente e um lançador"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Nova _aplicação"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Criar uma nova aplicação para um sítio web"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Erro ao iniciar"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Criar lança_dor"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Gestor de aplicações web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Gerir sítios web instalados como aplicações"
 
-#: ../extensions/transfers.vala:89
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "Transferências"
 
-#: ../extensions/transfers.vala:102 ../extensions/transfers.vala:365
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Limpar tudo"
 
-#: ../extensions/transfers.vala:196
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Falha ao abrir a transferência: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Abrir pas_ta de destino"
 
-#: ../extensions/transfers.vala:203
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copiar localização da lig_ação"
 
-#: ../extensions/transfers.vala:428
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "O ficheiro \"<b>%s</b>\"  foi transferido."
 
-#: ../extensions/transfers.vala:429
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' e %d outros ficheiros foram transferidos."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transferência concluída"
 
-#: ../extensions/transfers.vala:456 ../extensions/transfers.vala:457
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Existem ficheiros a ser transferidos"
 
-#: ../extensions/transfers.vala:459
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Sair do Midori"
 
-#: ../extensions/transfers.vala:461
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "As transferências serão canceladas se sair do Midori."
 
-#: ../extensions/transfers.vala:508
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Gestor de transferências"
 
-#: ../extensions/transfers.vala:509
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Ver ficheiros transferidos"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Clique na roda do rato abre seleção"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Carregar endereço através do clique na roda do rato"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "Não foi possível obter o caminho de configuração da extensão. O caminho é "
-#~ "NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Não foi possível obter o caminho de configuração da extensão."
-
-#~ msgid "Custom..."
-#~ msgstr "Personalizar…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Confirmação de armazenamento de cookies"
-
-#~ msgid "_Details"
-#~ msgstr "_Detalhes"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Identificar nas páginas web como"
-
-#~ msgid "Writing failed."
-#~ msgstr "Falha ao escrever."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Deslocamento cinético"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr ""
-#~ "Marque se quiser que o deslocamento se mova cineticamente conforme a "
-#~ "velocidade"
-
-#~ msgid "_Window"
-#~ msgstr "_Janela"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "A_dicionar atalho ao ambiente de trabalho"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Avisos de reencaminhamento para o NOMEDEFICHEIRO especificado"
-
-#~ msgid "FILENAME"
-#~ msgstr "NOMEDEFICHEIRO"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Realçar ocorrências"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Lembrar último tamanho da janela"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Marque se quiser gravar o último tamanho da janela"
-
-#~ msgid "Last window width"
-#~ msgstr "Largura da última janela"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Última largura de janela gravada"
-
-#~ msgid "Last window height"
-#~ msgstr "Altura da última janela"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Última altura de janela gravada"
-
-#~ msgid "Last panel position"
-#~ msgstr "Última posição do painel"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Última posição de painel gravada"
-
-#~ msgid "Last panel page"
-#~ msgstr "Última página do painel"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Última página de painel gravada"
-
-#~ msgid "Last Web search"
-#~ msgstr "Última pesquisa web"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Última pesquisa web gravada"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Mostrar barra de menu"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Marque se quiser mostrar a barra de menu"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Mostrar barra de navegação"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Marque se quiser mostrar a barra de navegação"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Mostrar barra de marcadores"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Marque se quiser mostrar a barra de marcadores"
-
-#~ msgid "Show Panel"
-#~ msgstr "Mostrar painel"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Marque se quiser mostrar o painel"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Mostrar barra de estado"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Marque se quiser mostrar a barra de estado"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Itens da barra de ferramentas"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Itens a mostrar na barra de ferramentas"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Compactar painel lateral"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Marque se quiser compactar o painel lateral"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Alinhar painel lateral à direita"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Marque se quiser alinhar o painel lateral à direita"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Abrir painéis em janelas distintas"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Marque se quiser abrir os painéis em janelas distintas"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "O que fazer ao iniciar o Midori"
-
-#~ msgid "The homepage"
-#~ msgstr "A página inicial"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "A pasta para gravar as transferências"
-
-#~ 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 endereço"
-
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "A pesquisa a executar na barra do endereço"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "A codificação de caracteres preferida"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Mostrar sempre barra de separadores"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Marque se quiser que os separadores tenham os ícones para fechar"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Onde abrir novas páginas"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Marque se quiser abrir os novos separadores em segundo plano"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Abrir \"pop-ups\" em separadores"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Carregar e exibir automaticamente as imagens "
-
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Ativar linguagem de \"scripts\" incorporados"
-
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Ativar \"plug-ins\" Netscape incorporados"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Ativar verificação ortográfica ao escrever"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Ativar suporte a dados HTML5"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Marque se quiser ativar o suporte a dados HTML5"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5"
-
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\""
-
-#~ 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 "Allow websites to use OpenGL rendering"
-#~ msgstr "Permite que os sítios web utilizem o OpenGL"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Marque se quiser ajustar o texto e as imagens"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Encontrar ao escrever"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Falha ao atualizar a base de dados: %s"
 
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "Marque se quiser encontrar automaticamente ao escrever"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Falha ao selecionar da base de dados: %s"
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "O tipo de servidor proxy a utilizar"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Falha ao importar sessão: %s"
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "Servidor proxy HTTP"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Servidor proxy para ligações HTTP"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestão de separadores e sessões."
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "A porta do servidor proxy para ligações HTTP"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Identification string"
-#~ msgstr "Texto da identificação"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Esta extensão disponibiliza uma fila para atualizar tarefas ou eventos "
+"recorrentes."
 
-#~ msgid "The application identification string"
-#~ msgstr "O texto de identificação da aplicação"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Falha ao adicionar nova nota à base de dados: %s\n"
 
-#~ msgid "Clear private data"
-#~ msgstr "Limpar dados privados"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Falha ao remover nova nota da base de dados: %s\n"
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Os dados privados selecionados para apagar"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Falha ao mudar o nome da nota: %s\n"
 
-#~ msgid "Clear data"
-#~ msgstr "Limpar dados"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Falha ao atualizar nota: %s\n"
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "Os dados selecionados para apagar"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notas"
 
-#~ msgid "Filter:"
-#~ msgstr "Filtro:"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nova nota"
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr ""
-#~ "Introduza um filtro para só mostrar os \"cookies\" cujo nome ou domínio "
-#~ "coincidam com o filtro"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Cria uma nota vazia e não relacionada com as páginas abertas"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "Fec_har outros separadores"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova nota"
 
-#~ msgid "_Icon:"
-#~ msgstr "Í_cone:"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Falha ao selecionar da base de dados de notas: %s\n"
 
-#~ msgid "Load page"
-#~ msgstr "Carregar página"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Mudar nome da nota"
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Marcador"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copiar nota para a área de transferência"
 
-#~ msgid "_Console"
-#~ msgstr "_Consola"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Remover nota"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "Pasta superior"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiar seleção como nota"
 
-#~ msgid "_Title:"
-#~ msgstr "_Título:"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Gravar excertos de texto dos sítios web como notas"
 
-#~ msgid "_Folder:"
-#~ msgstr "_Pasta:"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueador de publicidade"
 
-#~ msgid "_Customize…"
-#~ msgstr "Personali_zar…"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquear publicidade de acordo com o filtro"
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "A pasta de configuração especificada é inválida."
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurar filtros de publicidade"
 
-#~ msgid "Cookies"
-#~ msgstr "\"Cookies\""
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_oquear imagem"
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "\"Cookies Flash\""
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_oquear ligação"
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "Bases de _dados HTML5"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editar regra"
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "Navegador Web rápido"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regra:"
index 8ba3c0af27eb1f5a15f2f2efcee2314eb5d65c7c..362ed1dce91e0efa89146114d8eeed79459205da 100644 (file)
 # Rogério Brito <rbrito@ime.usp.br> 2009
 # Sergio Cipolla <secipolla@gmail.com> 2010, 2011
 # Rafael Ferreira <rafael.f.f1@gmail.com> 2012, 2013.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-25 20:57+0000\n"
-"PO-Revision-Date: 2013-04-14 15:54-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-08-10 20:23+0000\n"
+"Last-Translator: Leonardo Lemos <leonardolemos@live.com>\n"
 "Language-Team: Brazilian Portuguese <xfce-i18n-br@xfce.org>\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-Launchpad-Export-Date: 2014-11-26 06:05+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.5\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Navegue na Web"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navegador Web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navegue na web"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nova janela de navegação privada"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Nova aba"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Nova janela"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navegador web"
+msgid "New Private Browsing Window"
+msgstr "Nova janela de navegação privada"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Navegação Privada Midori"
 
-#: ../data/midori-private.desktop.in.h:2
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Navegação privada"
+
+#: ../data/midori-private.desktop.in.h:3
 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:4412
-msgid "Private Browsing"
-msgstr "Navegação Privada"
-
-#: ../midori/main.c:72
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Captura salva em: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Executar ENDEREÇO como aplicativo web"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ENDEREÇO"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Usar PASTA como pasta de configuração"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "PASTA"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navegação privada, nenhuma modificação é salva"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "Modo portátil, todos arquivos de runtime armazenados em um só lugar"
+msgstr ""
+"Modo portátil, todos arquivos de execução são armazenados em um só lugar"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Janela GTK+ simples com WebKit, similar a GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Exibir diálogo de diagnóstico"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Executa no gdb e salva um registro (backtrace) da falha"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Executar o arquivo especificado como javascript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Capturar o URI especificado num arquivo PDF"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Executar o comando especificado"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Listar comandos disponíveis para execução com -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Exibir a versão do programa"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Endereços"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Bloquear URIs conforme a expressão regular PADRÃO"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PADRÃO"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Limpar a sessão do Midori após SEGUNDOS segundos de inatividade"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEGUNDOS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Erro: \"gdb\" não pôde ser encontrado\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Por favor, envie comentários, sugestões e relatos de erros para:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Verificar por novas versões em:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Ocorreu um erro desconhecido."
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Favoritos"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Adicionar _favorito"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Extensões"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Scripts de _usuário"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "E_stilos de usuário"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "_Nova aba"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Transferências"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "P_lugins Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Abas _fechadas"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nova _janela"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nova _pasta"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Endereços]"
 
@@ -231,134 +232,148 @@ msgstr "Documento mal conformado."
 msgid "Unrecognized bookmark format."
 msgstr "Formato de favoritos não reconhecido."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Ir para a subpágina seguinte"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Pesquisa web…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Recarregar a página atual"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Parar o carregamento da página atual"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Falha ao atualizar título: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "O valor '%s' é inválido para %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Configuração inesperada '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Ação inesperada '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (navegação privada)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Selecionar [texto]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Favoritos"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nova pasta"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Editar pasta"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Novo favorito"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Editar favorito"
 
-#: ../midori/midori-browser.c:973
-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:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+"Digite um nome para este favorito e escolhe um lugar onde queira deixá-lo."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Adicionar à _chamada rápida"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Digite um nome para esta pasta e escolhe um lugar onde queira deixá-lo."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Exibir na _barra de ferramentas"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Mostrar _barra de favoritos"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Executar como aplicativo _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Adicionar à _chamada rápida"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Salvar como"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Salvar _recursos associados"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Uma nova janela foi aberta"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Uma nova aba foi aberta"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Erro ao abrir a imagem!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 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:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Erro ao baixar a imagem!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Não é possível baixar a imagem selecionada."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Salvar arquivo"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Recarregar a página sem caching"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -372,31 +387,24 @@ 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:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Novo feed"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Adicionar novo favorito"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Compartilhar esta página"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Vazio"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Habilitar/desabilitar navegação por cursor de texto"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -404,109 +412,99 @@ msgstr ""
 "Pressione F7 para ativar ou desativar Caret Browsing. Quando ativo, um "
 "cursor de texto aparece em todos os websites."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Habilitar Nav_egação por cursor"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, 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:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Abrir tudo em a_bas"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Abrir em nova a_ba"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importar favoritos…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importar favoritos"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplicativo:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importar de um arquivo XBEL ou HTML"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importar de um arquivo"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Falha ao importar favoritos"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Favoritos XBEL"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Favoritos Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 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:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Falha ao exportar favoritos"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Um navegador web leve."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Veja about:version para informações da versão."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -518,369 +516,399 @@ msgstr ""
 "Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão "
 "mais recente."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Sérgio Cipolla <secipolla@gmail.com>\n"
 "Rogério Brito <rbrito@ime.usp.br>\n"
-"Rafael Ferreira <rafael.f.f1@gmail.com>"
+"Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Acacio Florentino https://launchpad.net/~acaciosc1\n"
+"  Anderson Felippe https://launchpad.net/~adfelippe\n"
+"  Douglas Moura https://launchpad.net/~araujodemoura\n"
+"  Gabriel Galli https://launchpad.net/~g7-galli96\n"
+"  Giovanni A. Valle https://launchpad.net/~gvalle-augusto\n"
+"  Iuri L. Machado https://launchpad.net/~imetallica\n"
+"  Leonardo Lemos https://launchpad.net/~leonardolemos\n"
+"  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
+"  Paulo Galardi https://launchpad.net/~paulogalardi1-deactivatedaccount\n"
+"  Rafael Ferreira https://launchpad.net/~rafael-f-f1\n"
+"  Thaynã Moretti https://launchpad.net/~izn\n"
+"  Vinícius Castelani Reck https://launchpad.net/~viniciuscr\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  i https://launchpad.net/~iiiiii-deactivatedaccount\n"
+"  nickrj1@gmail.com https://launchpad.net/~nickrj1-gmail"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Duplicar a_ba atual"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Abrir nova janela"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Abrir nova aba"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nova janela de navegação pri_vada"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Abrir um arquivo"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Salvar página como…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Salvar para arquivo"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Adicionar à cha_mada rápida"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Inscrever _feed de notícias"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Fechar aba"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Fechar a aba atual"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Fechar jane_la"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Compartilhar"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Imprimir a página atual"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Fechar _todas as janelas"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Locali_zar…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Localizar palavra ou frase na página"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Localizar _seguinte"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Localizar _anterior"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Configurar preferências do aplicativo"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Ver"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Recarregar a página sem caching"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Ampliar"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Reduzir"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Codificação"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ver _fonte"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Mostrar fonte _DOM"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navegação _por cursor"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Alternar tela cheia"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Rolar à _esquerda"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Rolar para _baixo"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Rolar para _cima"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Rolar à _direita"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Legível"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ir para a página anterior"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Ir para a subpágina anterior"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Próximo ou avançar"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Ir para a próxima sub-página ou próxima página no histórico"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Página inicial"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ir para a página inicial"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Esvaziar lixo"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "De_sfazer fechar aba"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Adicionar _nova pasta"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Exportar favoritos"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importar favoritos..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "Gerenciar motores de _pesquisa"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Exportar favoritos..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "Limpar _dados privados"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Gerenciar motores de busca..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Limpar dados privados..."
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Inspecionar página"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Aba _anterior"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Aba _seguinte"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Mover aba para a _primeira posição"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Mover a aba para _trás"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Mover a aba para a _frente"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Mover aba para a ú_ltima posição"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "_Focar a aba atual"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Focar o _campo de visão seguinte"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Exibir apenas o _ícone da aba atual"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "Duplicar a_ba atual"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Fec_har outras abas"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Abrir a _última sessão"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Perguntas fre_quentes"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Relatar um problema…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Barra de _menu"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Barra de _navegação"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Painel _lateral"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Painel lateral"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Barra de _favoritos"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Barra de _status"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automático"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chinês Tradicional (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chinês Simplificado (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonês (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Russo (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Ocidental (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Personalizado…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Falha ao inicializar o histórico: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Aba"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Localização…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Abrir localização específica"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "Pesquisa _web…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Pesquisar na web"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Reabrir janela ou aba anteriormente fechada"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Exibir favoritos salvos"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_abas"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Exibir lista das abas abertas"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Menu"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menu"
 
@@ -889,20 +917,20 @@ msgstr "Menu"
 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:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "A autoridade certificado signatária é desconhecida."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -910,15 +938,15 @@ msgstr ""
 "O certificado não corresponde à identidade experada para o site do qual o "
 "certificado foi adquirido."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 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:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "O certificado expirou"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -926,40 +954,40 @@ msgstr ""
 "O certificado foi revogado, de acordo com a lista de revogação de "
 "certificado da GTlsConnection"
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "O algoritmo do certificado é considerado inseguro."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Alguns erros ocorreram na validação do certificado."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportar certificado"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Auto-assinado"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Detalhes da segurança"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Cola_r e prosseguir"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Não verificado"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Verificado e conexão criptografada"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Aberto, conexão não criptografada"
 
@@ -976,434 +1004,449 @@ msgstr "Fechar painel"
 msgid "Align sidepanel to the left"
 msgstr "Alinhar painel lateral à esquerda"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Exibir chamada rápida"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Exibir a página inicial"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Exibir as últimas abas abertas"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Exibir as últimas abas sem carregá-las"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Mostrar página em branco"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Mostrar motor de pesquisa padrão"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Mostrar uma página inicial personalizada"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonês (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Aba atual"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Padrão"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ícones"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Ícones pequenos"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Texto"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ícones e texto"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Texto ao lado dos ícones"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automático (GNOME ou ambiente)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Servidor proxy HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Sem servidor proxy"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "O estilo da barra de ferramentas"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Sempre usar minhas escolhas de fonte"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
-msgstr "Substituir fontes escolhidas por sites com as preferencias do usuário"
+msgstr ""
+"Substituir fontes escolhidas por sites com as preferencias do usuário"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "A configuração não pôde ser carregada: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
-msgstr "Valor de configuração '%s' inválido "
+msgstr "Valor de configuração '%s' inválido"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Falha ao injetar folha de estilo: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Exibir _título da aba"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Exibir apenas o _ícone da aba"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Fechar aba à d_ireita"
+msgstr[1] "Fechar abas à d_ireita"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Confiar neste site"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Segurança desconhecida"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s quer salvar uma base de dados HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Permitir"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s quer saber a sua localização."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Erro - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' não pode ser encontrado"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "A página '%s' não pôde ser carregada."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "A página '%s' não pôde ser carregada:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Checar erros no endereço"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Tenha certeza que um cabo ethernet está plugado ou que a placa de rede sem "
+"fio está ativada"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verificar se as suas configurações de rede estão corretas"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Tentar novamente"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Ops - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Alguma coisa deu errado com \"%s\"."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Tentar novamente"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Enviar uma mensagem para %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Adicionar mecanismo de _pesquisa..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Inspecionar _elemento"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Abrir um _link"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Abrir link em nova a_ba"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Abrir link na aba em _primeiro plano"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Abrir link na aba em _segundo plano"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Abrir link em nova _janela"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Abrir link como aplicativo _web"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copiar _destino do link"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Salvar como…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Abrir _imagem em nova janela"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Abrir _imagem em nova aba"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Copiar im_agem"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Salvar i_magem"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Abrir no _Visualizador de Imagens"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copiar _endereço do vídeo"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Salvar _vídeo"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Baixar _vídeo"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Abrir endereço em nova a_ba"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Pesquisar _com"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Pesquisar na web"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Abrir endereço em nova a_ba"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Abrir _Frame em nova aba"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspecionar _elemento"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Abrir ou baixar arquivo de %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tipo de arquivo: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tipo de arquivo: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Abrir %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspecionar página - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Nenhuma documentação instalada"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori não armazena quaisquer dados pessoais:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "O histórico e cookies não estando sendo guardados."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "As extensões estão desativadas."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 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:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "O Midori impede que sites obtenham dados do usuário:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Os URL são removidos do nome da máquina."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "A obtenção prévia de DNS está desativada."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 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:4421
+#: ../midori/midori-view.c:3906
 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:4462
+#: ../midori/midori-view.c:3949
 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:4511
-msgid "Page loading delayed"
-msgstr "Carregamento da página postergado"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Carregamento de página atrasado:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 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:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Carregar página"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Página em branco"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Duplicar aba"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Exibir _título da aba"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Exibir apenas o _ícone da aba"
-
-#: ../midori/midori-view.c:4904
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "_Fechar outra aba"
-msgstr[1] "_Fechar outras abas"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "anterior"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "próxima"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Imprimir imagens de fundo"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Se as imagens de fundo devem ser impressas"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Funcionalidades"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1411,27 +1454,27 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s para terminar"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "O arquivo baixado é errôneo."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1439,131 +1482,127 @@ msgstr ""
 "A soma de verificação fornecida com o link não coincide. Isso significa que "
 "o arquivo provavelmente está incompleto ou foi modificado."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Você não tem permissão de escrita nesse local."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, 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-download.vala:352
+#: ../midori/midori-download.vala:373
 #, 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-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Chamada rápida"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Clique para adicionar um atalho"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Informe o endereço do atalho"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Informe o título do atalho"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 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:305
 msgid "Startup"
 msgstr "Início"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Ao iniciar o Midori:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Página inicial:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Usar a _página atual"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Usar a página atual como página inicial"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Família de fontes proporcionais"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Família de fontes de largura fixa"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 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:351
 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:353
 msgid "Minimum Font Size"
 msgstr "Tamanho mínimo de fonte"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "O tamanho mínimo de fonte usado para exibir texto"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codificação preferida"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Carregar imagens automaticamente"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Habilitar verificação ortográfica"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Habilitar scripts"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Habilitar suporte a WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Habilitar plugins Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Zoom de texto e imagens"
@@ -1577,11 +1616,19 @@ 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:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Nível de ampliação padrão"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Fator inicial para para ampliar abas recém abertas por"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Idiomas preferidos"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1590,117 +1637,117 @@ msgstr ""
 "páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-"
 "fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Salvar arquivos baixados em:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navegação"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Estilo da barra de ferramentas:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Abrir novas páginas em:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Novo comportamento da aba:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Botão fechar nas abas"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Sempre exibir barra de abas"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Abrir abas ao lado da atual"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Abrir abas em segundo plano"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor de texto"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregador de notícias"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Rede"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Nome da máquina"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Porta"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Tipos de proxy suportados:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Cache da web"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 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:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identificar-se como"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Excluir cookies antigos após:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "O número máximo de dias para manter cookies salvos"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Aceitar coockies apenas de sites visitados"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Bloquear coockies enviados por outros sites"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1708,123 +1755,122 @@ msgstr ""
 "Os cookies armazenam dados de autenticação, jogos salvos ou perfis do "
 "usuário para fins de propaganda."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Habilitar cache de aplicativos web offline"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Habilitar suporte a armazenagem local HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Eliminar detalhes do referrer enviados a sites externos"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 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-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Excluir páginas do histórico após:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 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-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensões"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Gerenciar motores de _pesquisa"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Adicionar motor de pesquisa"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editar motor de pesquisa"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descrição:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Palavra-chave:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Gerenciar motores de pesquisa"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Usar como _padrão"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, 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/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Os motores de pesquisa não puderam ser salvos. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Histórico"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Marcadores e Histórico"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Falha ao inicializar o histórico: %s"
+msgid "Search for %s"
+msgstr "Pesquisar por %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Falha ao selecionar do histórico. %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Pesquisar por %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Pesquisar com…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Pesquisar com %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Abrir com"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Escolha um aplicativo ou um comando para abrir \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Não foi possível executar o programa externo."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "URI inválida"
 
@@ -1849,79 +1895,136 @@ msgstr "Sensível ao caso"
 msgid "Close Findbar"
 msgstr "Fechar barra de localização"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Falha ao adicionar item aos favoritos: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d favorito"
+msgstr[1] "%d favoritos"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d sub-pasta"
+msgstr[1] "%d sub-pastas"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Pasta vazia"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Pasta contendo %s e nenhum favorito"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Pasta contendo %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Pasta contendo %s e %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Favorito levando a: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Falha ao atualizar favoritos: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s e nenhum favorito"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s e %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editar o favorito selecionado"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Excluir o favorito selecionado"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Adicionar nova pasta"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Aba</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Abrir em nova a_ba"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Pesquisar no Favoritos"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Histórico"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Hoje"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, 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:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Uma semana atrás"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Falha ao excluir item do histórico: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 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:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Adicionar como favorito o item do histórico selecionado"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Excluir o item do histórico selecionado"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Limpar todo o histórico"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Pesquisar no Histórico"
 
@@ -1949,121 +2052,70 @@ msgstr "Senha"
 msgid "_Remember password"
 msgstr "_Lembrar senha"
 
-#: ../katze/katze-throbber.c:947
-#, 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:960
-#, 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:1040
-msgid "Animation frames are broken"
-msgstr "Os quadros de animação estão corrompidos"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Nenhum"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Propriedade '%s' é inválida para %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Escolher arquivo"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Escolher pasta"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dia"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 semana"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mês"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 ano"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s - Preferências"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Soma de verificação MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Soma de verificação SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Configurar filtros de publicidade"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"Digite o endereço de uma lista de filtros pré-configurada e clique em "
-"\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em "
-"%s."
-
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Editar regra"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regra:"
+"Esta página aparentemente contém um script de usuário. Gostaria de instalá-"
+"lo?"
 
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_oquear imagem"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_oquear link"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Bloqueador de publicidade"
-
-#: ../extensions/adblock.c:1926
-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
-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
-msgid "_Install user script"
-msgstr "_Instalar script de usuário"
+#: ../extensions/addons.c:223
+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
@@ -2080,16 +2132,16 @@ msgstr "_Instalar estilo de usuário"
 msgid "Don't install"
 msgstr "Não instalar"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Scripts de usuário"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Estilos de usuário"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Erro"
 
@@ -2111,40 +2163,40 @@ msgstr "Excluir estilo de usuário"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "O arquivo <b>%s</b> será permanentemente excluído."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Abrir no editor de texto"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Abrir pasta de destino"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Adicionar novo complemento"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Excluir o complemento selecionado"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Extras de usuário"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Não é possível monitorar a pasta '%s': %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Suporte a scripts e estilos de usuário"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Abas coloridas"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Colorir distintamente cada aba"
 
@@ -2153,11 +2205,11 @@ msgstr "Colorir distintamente cada aba"
 msgid "Cookie Manager"
 msgstr "Gerenciador de cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Excluir tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2165,31 +2217,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:116
 msgid "Expand All"
 msgstr "Expandir tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Ocultar tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Você quer realmente excluir todos os cookies?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Pergunta"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "No fim da sessão"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2207,15 +2259,15 @@ msgstr ""
 "<b>Expiração</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Sim"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Não"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2224,20 +2276,20 @@ msgstr ""
 "<b>Domínio</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nome"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandir tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Ocultar tudo"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Pesquisar cookies por nome ou domínio"
 
@@ -2257,25 +2309,45 @@ msgstr "Copiar endereços das abas"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copiar os endereços de toda as abas para a área de transferência"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Carregamento atrasado"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Atraso em segundos até que a página esteja carregada:"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Atrasar carregamento da página até que você de fato use a aba."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Duplo clique para mais informações"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Essa extensão mostra mensagens de erro do glib na barra do sistema."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Ocorreu um erro enquanto tentava baixar uma arquivo com o seguinte plug-in:\n"
+"Ocorreu um erro ao tentar baixar um arquivo com o seguinte plugin:\n"
+"%s\n"
+"\n"
+"Erro:\n"
+"%s\n"
+"\n"
+"Continuar sem este plugin."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2317,25 +2389,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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Última atualização: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Feeds"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Adicionar novo feed"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Excluir feed"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Feeds"
 
@@ -2354,39 +2426,39 @@ msgstr "Formato de feed não suportado."
 msgid "Failed to parse XML feed: %s"
 msgstr "Falha ao analisar o feed XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Não foi encontrado o elemento \"channel\" nos dados RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Encontrada uma versão RSS não suportada."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr ""
 "Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "O feed '%s' já existe"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Erro ao carregar o feed '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Painel de feeds"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Ler feeds Atom/RSS"
 
@@ -2407,123 +2479,409 @@ msgstr ""
 "É necessário um nome de usuário e uma senha\n"
 "para abrir esta localização:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Lembrar senha nesta página?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nunca para esta página"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Alternar estado do formulário de histórico"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 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:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Falha ao abrir a base de dados: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, 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:624
+#: ../extensions/formhistory/formhistory.c:598
 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:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Preenchimento de formulários"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Armazenar o histórico de dados de formulário"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Falha ao selecionar sugestões\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Não há abas que não tenham sido visitadas"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Lista do histórico"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
-msgstr "Comportamento ao fechar abas "
+msgstr "Comportamento ao fechar abas"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Ir para a última aba visualizada"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Ir para a aba mais nova"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Piscar janela em abas de segundo plano"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Nova aba seguinte (lista do histórico)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Nova aba seguinte no histórico"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Nova aba anterior (lista do histórico)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Nova aba anterior no histórico"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Exibir aba em segundo plano (lista do histórico)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Exibir a aba selecionada em segundo plano"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Lista do histórico"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Ir para a última aba usada ao circular ou fechar abas"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Falha no SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Aceitar"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Aceitar para sessão"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Bloco"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Não é possível abrir o banco de dados da extensão: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Falha ao executar afirmação da base de dados: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Tem certeza que deseja excluir todas as permissões de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Excluir todas as permissões de JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Essa ação removerá todas permissões de JavaScript. Você será questionado "
+"novamente sobre permissões à cada site visitado."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instância do gerenciador"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instância do gerenciador global do NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurar NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Abaixo está uma lista de todos os sites e as políticas impostas à eles. Você "
+"pode remover as políticas marcando as entradas e clicando em  <i>Deletar</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domínio"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Política"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Excluir _todas"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "P_ermitir scripts de todos os sites"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blo_quear scripts em domínios desconhecidos por padrão"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "De_finir permissões em um domínio de segundo nível"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Bloquear %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permitir %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permitir %s nesta sessão"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Janela do navegador"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Esta instância de visualização do Midori pertence a"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Visualizar"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Esta instância de visualização do Midori pertence a"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Estado do ícone do menu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Estado do ícone do menu a ser exibido na barra de status"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Indeterminado"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permitido"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Misto"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Negado"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Um erro fatal ocorreu e está impedindo a extensão NoJS de continuar. Você "
+"deve desabilitá-la."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Erro na extensão NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Motivo"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Não foi possível criar pasta de configuração para a extensão: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Não foi possível criar pasta de configuração para a extensão."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Não foi possível abrir a base de dados da extensão."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Não foi possível configurar estrutura do banco de dados da extensão"
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instância da extensão"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "A instância da extensão do Midori para esta extensão"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instância do aplicativo"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "A instância do aplicativo Midori que esta extensão pertence"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instância de banco de dados"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Ponteiro para instância de banco de dados sqlite usada por esta instância"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Caminho do banco de dados"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Caminho para a instância de banco de dados sqlite usada por esta extensão"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permitir todos os sites"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Se verdadeiro, esta extensão não verificará pela política de cada site, mas "
+"permitirá-las."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Somente segundo nível"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Se verdadeiro, esta extensão reduzirá cada domínio ao seu segundo nível "
+"(www.exemplo.org será reduzido para exemplo.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Política de domínio desconhecida"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Política para uso de domínios desconhecidos."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Aceitar temporariamente"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gestos do mouse"
@@ -2552,11 +2910,11 @@ msgstr "Atalhos"
 msgid "View and edit keyboard shortcuts"
 msgstr "Ver e editar os atalhos de teclado"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Relógio na barra de status"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Exibir a data e a hora na barra de status"
 
@@ -2572,6 +2930,10 @@ msgstr "Scripts"
 msgid "Netscape plugins"
 msgstr "Plugins Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Habilitar plugins Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Funcionalidades na barra de status"
@@ -2580,15 +2942,15 @@ msgstr "Funcionalidades na barra de status"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Habilitar/desabilitar facilmente funcionalidades das páginas web"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Painel de abas"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "P_ainel de abas"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Exibir as abas num painel vertical"
 
@@ -2600,11 +2962,11 @@ msgstr "Apenas ícones nas abas por padrão"
 msgid "New tabs have no label by default"
 msgstr "Novas abas sem título por padrão"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Personalizar barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2612,67 +2974,58 @@ msgstr ""
 "Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem "
 "ser reordenados ao arrastar e soltar."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Itens disponíveis"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Itens exibidos"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Personalizar _barra de ferramentas..."
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor da barra de ferramentas"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Editar facilmente a barra de ferramentas"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Pôr comunicações HTTP em cache"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Falha ao carregar cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Limpar dados privados"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Limpar dados privados"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Limpar os seguintes dados:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Últimas abas abertas"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Limpar dados privados ao _sair do Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Nomes de _usuário e senhas salvos"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies e dados de sites"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Ícones de sites"
 
@@ -2680,191 +3033,134 @@ msgstr "Ícones de sites"
 msgid "Open tabs"
 msgstr "Abrir abas"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Mais abas abertas..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Falha ao limpar o histórico: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Falha ao excluir itens antigos do histórico: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "falha ao ANEXAR bd antiga"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "falha ao importar de bd antiga"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "falha ao desfazer a transação"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "falha ao DESANEXAR"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Não foi possível criar tabela de favoritos: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Falha ao adicionar item aos favoritos: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Não foi possível importar do banco da base de dados antiga: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Falha ao atualizar o favorito: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Os favoritos não puderam ser salvos. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Falha ao remover o favorito: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 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/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "A configuração não pôde ser salva. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "A sessão não pôde ser carregada: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "A sessão não pôde ser salva. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "O lixo não pôde ser salvo. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"O Midori encerrou abruptamente da última vez em que foi aberto. Se isso "
-"ocorrer repetidamente, tente uma das seguintes opções para resolver o "
-"problema."
+"O Midori quebrou desde a última vez em que foi aberto. Você pode reportar o "
+"problema em %s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Modificar _preferências"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Desabilitar todas as _extensões"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Exibir um diálogo após o encerramento abrupto do Midori"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Descartar abas antigas"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Mostrar último log de encerramento abrupto"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Executar em um _depurador"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 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/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Os favoritos não puderam ser carregados: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "A sessão não pôde ser carregada: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "O lixo não pôde ser carregado: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "O histórico não pôde ser carregado: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Ocorreram os seguintes erros:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
-msgstr "_Ignorar "
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Falha no SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Aceitar"
+msgstr "_Ignorar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Aceitar para sessão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Bloco"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Não foi possível abrir a base de dados da extensão: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Falha ao executar afirmação da base de dados: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Você deseja realmente excluir todas as permissões de cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Excluir todas permissões de cookies"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2872,20 +3168,20 @@ msgstr ""
 "Esta ação vai excluir todos os cookies de permissões. Você vai ser "
 "questionado por permissões novamente a cada página web visitada."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Gerenciador de permissões de cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Instância do gerenciador de permissão de cookie atual"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Configurar permissão de cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2899,23 +3195,13 @@ msgstr ""
 "manualmente digitando o domínio abaixo, escolhendo a política e clicando em "
 "<i>Adicionar</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domínio"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Política"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Excluir _todas"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Políticas para cookies de domínios que não estão na lista: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "_Perguntar por política se desconhecida para um domínio"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Pergunte por uma decisão"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2929,973 +3215,332 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Erro na extensão de gerenciador de permissão de cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Motivo"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Não foi possível criar pasta de configuração para a extensão: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Não foi possível criar pasta de configuração para a extensão."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Não foi possível abrir a base de dados da extensão."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Não foi possível configurar estrutura do banco de dados da extensão"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "Não foi possível determinar política global de cookies a ser definida para o "
 "domínio: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Até a sessão terminar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Esta página web %s deseja armazenar %d cookies."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Esta página web %s deseja armazenar um cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Múltiplas páginas web desejam armazenar %d cookies no total."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Aceitar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Aceitar para esta _sessão"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Negar"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Negar es_ta vez"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Caminho"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Valor"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Data de expiração"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Instância da extensão"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"A política de uso para domínios não está configurada individualmente. Isto "
+"só faz efeito para futuramente restringir a configuração da política global "
+"de cookies nos ajustes do Midori."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "A instância da extensão do Midori para esta extensão"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Gerenciador de segurança de cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Instância do aplicativo"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Gerencie perssões de cookies per site"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "A instância do aplicativo Midori que esta extensão pertence"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Falha ao colocar ícone de programa em %s: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Instância de banco de dados"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-"Ponteiro para instância de banco de dados sqlite usada por esta instância"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Falha ao criar novo lançador (%s): %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Caminho do banco de dados"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Lançador criado"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-"Caminho para a instância de banco de dados sqlite usada por esta extensão"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Você pode rodar agora <b>%s</b> de seu lançador ou menu"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Perguntar por política desconhecida"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Erro ao criar lançador"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"Se verdadeiro, esta extensão permita por política para todo domínio "
-"desconhecido. Se falso, esta extensão usa a política global de cookies "
-"definida nas configurações do Midori."
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplicativos"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Indeterminado"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Novo _perfil"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Gerenciador de segurança de cookie"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Criar um novo, independente perfil e lançador"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "Gerencie perssões de cookies per site"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Novo _aplicativo"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Aplicativos"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Cria um novo aplicativos para um site em específico"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Erro de lançamento"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Criar lança_dor"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Gerenciador de Aplicativos Web"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Gerenciar sites instalados como aplicativos"
 
-#: ../extensions/transfers.vala:89
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "Transferências"
 
-#: ../extensions/transfers.vala:102 ../extensions/transfers.vala:365
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Limpar tudo"
 
-#: ../extensions/transfers.vala:196
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Falha ao abrir download: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Abrir pas_ta de destino"
 
-#: ../extensions/transfers.vala:203
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Copiar loc_alização do link"
 
-#: ../extensions/transfers.vala:428
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "O arquivo <b>%s</b> foi baixado."
 
-#: ../extensions/transfers.vala:429
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' e %d outros arquivos foram transferidos."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Transferência concluída"
 
-#: ../extensions/transfers.vala:456 ../extensions/transfers.vala:457
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Alguns arquivos estão sendo baixados"
 
-#: ../extensions/transfers.vala:459
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Sair do Midori"
 
-#: ../extensions/transfers.vala:461
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "As transferências serão canceladas se sair do Midori."
 
-#: ../extensions/transfers.vala:508
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Gerenciador de transferências"
 
-#: ../extensions/transfers.vala:509
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Ver arquivos baixados"
 
-#~ msgid "Custom..."
-#~ msgstr "Personalizado..."
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Identificar-se para as páginas web como"
-
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Clicar o botão do meio do mouse abre seleção"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "Não foi possível obter o caminho da configuração da extensão: caminho é "
-#~ "NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Não foi possível obter o caminho da configuração da extensão."
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Confirmar armazenamento de cookie"
-
-#~ msgid "_Details"
-#~ msgstr "_Detalhes"
-
-#~ msgid "Writing failed."
-#~ msgstr "Falha na escrita."
-
-#~ msgid "_Window"
-#~ msgstr "_Janela"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Rolagem cinética"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "A_dicionar atalho à área de trabalho"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Redirecionar alertas do console para o ARQUIVO especificado"
-
-#~ msgid "FILENAME"
-#~ msgstr "ARQUIVO"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Realçar correspondências"
-
-#~ 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 "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 "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"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Definir número de colunas e linhas"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Informe o número de colunas e linhas:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Entrada inválida para o tamanho da ligação rápida"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Tamanho da miniatura:"
-
-#~ msgid "Small"
-#~ msgstr "Pequeno"
-
-#~ msgid "Medium"
-#~ msgstr "Médio"
-
-#~ msgid "Big"
-#~ msgstr "Grande"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Configurar _filtros de publicidade…"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Não encontrado - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "O documento não pode ser exibido"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Forçar 96 pontos por polegada"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Forçar resolução de vídeo de 96 PPP"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Alternar com Ctrl+Tab entre abas, ordenadas pelo último uso"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Excluir cookies antigos após 1 hora"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Excluir cookies antigos após 1 semana"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Excluir cookies antigos após 1 ano"
-
-#~ msgid "days"
-#~ msgstr "dias"
-
-#~ msgid "All cookies"
-#~ msgstr "Todos os cookies"
-
-#~ msgid "Session cookies"
-#~ msgstr "Cookies da sessão"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Exibir barra de transferências"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Se a barra de transferências deve ser exibida"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Motores de pesquisa na complementação do endereço"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr ""
-#~ "Se motores de pesquisa devem ser exibidos na complementação do endereço"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Exibir os controles operacionais do painel"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Se os controles operacionais do painel devem ser exibidos"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Exibir ligação rápida nas novas abas"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Exibir ligação rápida nas abas recentemente abertas"
-
-#~ msgid "Download Manager"
-#~ msgstr "Gerenciador de downloads"
-
-#~ msgid "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 "What type of cookies to accept"
-#~ msgstr "Tipo de cookies a aceitar"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Antiguidade máxima dos cookies"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Antiguidade máxima do histórico"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Lembrar últimos arquivos baixados"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Se os últimos arquivos baixados devem ser lembrados"
-
-#~ msgid "Appearance"
-#~ msgstr "Aparência"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Cookies"
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
-#~ msgid "Font settings"
-#~ msgstr "Configurações de fontes"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Barra de navegação"
-
-#~ msgid "External applications"
-#~ msgstr "Aplicativos externos"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Excluir cookies ao sair do Midori"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Aba seguinte (lista do histórico)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Aba anterior (lista do histórico)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Aba anterior no histórico"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Falha ao executar afirmação da base de dados:\n"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s de %s, %s/s"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Baixar com _gerenciador de downloads"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Abrir a pasta de destino para o complemento selecionado"
-
-#~ msgid "Pageholder"
-#~ msgstr "Fixador de página"
-
-#~ msgid "_Pageholder"
-#~ msgstr "Fixador de _página"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Manter uma ou várias páginas abertas em paralelo às suas abas"
-
-#~ msgid "Quit the application"
-#~ msgstr "Sair do aplicativo"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% carregado"
-
-#~ msgid "_Contents"
-#~ msgstr "_Conteúdo"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Exibir a documentação"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Exibir barra de transferências"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Exibir progresso no campo de endereço"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr ""
-#~ "Se o progresso do carregamento deve ser exibido no campo de endereço"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Perguntar pela pasta de destino"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Se é para perguntar em que pasta salvar o arquivo a ser baixado"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Se uma notificação deve ser exibida ao concluir-se a transferência"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Salvar destino do link"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Baixar destino do link"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Baixar i_magem"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Falha ao limpar o histórico de pesquisa: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Separar da janela o painel escolhido"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Ocultar controles operacionais"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Verificação ortográfica"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Uma lista de idiomas, separados por vírgulas, para a verificação "
-#~ "ortográfica, por exemplo \"en_GB,pt_BR\""
-
-#~ msgid "_Install %s"
-#~ msgstr "_Instalar %s"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Minimizar aba a_tual"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Minimizar a aba atual"
-
-#~ msgid "External Applications"
-#~ msgstr "Aplicativos externos"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Associar os esquemas dos URL a comandos externos"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Dicionários de ortografia:"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Falha ao atualizar banco de dados: %s"
 
-#~ msgid "Console"
-#~ msgstr "Console"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Falha ao selecionar do banco de dados: %s"
 
-#~ msgid "Copy _All"
-#~ msgstr "Copiar _tudo"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Falha ao importar a sessão legado: %s"
 
-#~ msgid "Copy All"
-#~ msgstr "Copiar tudo"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "Gerenciador de _cookies"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gerenciamento de sessão e aba."
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Restaurar aba"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimizar aba"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Esta extensão fornece uma fila de tarefas para atualizar trabalhos ou "
+"eventos recorrentes."
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Copiar %s para a pasta %s."
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Falha ao adicionar nova nota ao banco de dados: %s\n"
 
-#~ msgid "Minimize new Tabs"
-#~ msgstr "Minimizar novas abas"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Falha ao remover nota do banco de dados: %s\n"
 
-#~ msgid "New tabs open minimized"
-#~ msgstr "Novas abas abrem minimizadas"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Falha ao renomear nota: %s\n"
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "Páginas _recentes"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Falha ao atualizar nota: %s\n"
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Reabrir páginas visitadas anteriormente"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notas"
 
-#~ msgid "Original cookies only"
-#~ msgstr "Apenas cookies originais"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Nova nota"
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Lembrar últimas páginas visitadas"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Cria uma nova nota vazia, sem relação com as páginas abertas"
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Se as últimas páginas visitadas devem ser salvas"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Nova nota"
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Detectar servidor proxy automaticamente"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Falha ao selecionar das notas do banco de dados: %s\n"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Se o servidor proxy deve ser detectado automaticamente"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Renomear nota"
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Definir número de atalhos"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copiar nota para a área de transferência"
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Informe o número de atalhos"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Remover nota"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Hora do relógio incorreta"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiar seleção como nota"
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr ""
-#~ "O relógio está atrasado. Por favor, verifique a data e a hora atual."
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Salvar clipes de texto de sites como notas"
 
-#~ msgid "Open _Link"
-#~ msgstr "Abrir _link"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Bloqueador de publicidade"
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Copiar scripts de usuário para a pasta %s e copiar estilos de usuário "
-#~ "para a pasta %s."
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Bloquear publicidade de acordo com uma lista de filtros"
 
-#~ msgid "REGEX"
-#~ msgstr "REGEX"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Configurar filtros de publicidade"
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Não disponível para esta plataforma"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_oquear imagem"
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Falha na obtenção da hora atual: %s\n"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_oquear link"
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Exibir _títulos do painel"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editar regra"
 
-#~ msgid "Options"
-#~ msgstr "Opções"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regra:"
index d5efefd2f990f45105c1618b1c38a0dfaa59c337..4fc762ebb99e81852b615b208f8711ce325daa20 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
 # Romanian translation for Midori
-# Traducerea în limba română pentru Midori.
-# Copyright (C) 2009-2012 THE midori'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the midori package.
-# Igor Știrbu <igor.stirbu@gmail.com> 2009
-# Mișu Moldovan <dumol@xfce.org> 2009-2012
-# Andrei Popescu <andreimpopescu@gmail.com> 2010
-# 
+# Copyright (C) 2009-2014 THE Midori'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Midori package.
+# Igor Știrbu <igor.stirbu@gmail.com> 2009.
+# Mișu Moldovan <dumol@l10n.ro> 2009-2014.
+# Andrei Popescu <andreimpopescu@gmail.com> 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: midori 0.4.7git\n"
+"Project-Id-Version: midori 0.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-06 11:33+0000\n"
-"PO-Revision-Date: 2012-12-30 16:26+0200\n"
-"Last-Translator: Mișu Moldovan <dumol@xfce.org>\n"
-"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-05-03 03:09+0000\n"
+"Last-Translator: Mișu Moldovan <Unknown>\n"
+"Language-Team: diacritice@googlegroups.com\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
+"== 0) && (n != 0))) ? 2: 1));\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:03+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
-"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:138 ../midori/main.c:151
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Navigator web"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Navigatorul web Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Navigați pe Internet"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Fereastră nouă de navigare privată"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Navigator"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Tab nou"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Fereastră nouă"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Navigator web"
+msgid "New Private Browsing Window"
+msgstr "Fereastră nouă de navigare privată"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Navigare privată cu Midori"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Deschide o nouă fereastră de navigare privată"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:3925
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Navigare privată"
 
-#: ../midori/main.c:62
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Deschide o nouă fereastră de navigare privată"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Captură salvată în: %s\n"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Deschide ADRESA ca o aplicație web"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESĂ"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "Folosește DOSAR ca dosar cu preferințe"
+msgstr "Folosește DOSAR ca un director cu preferințe"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "DOSAR"
 
-#: ../midori/main.c:91
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Navigare privată, nu se salvează modificările"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr ""
 "Mod portabil, toate fișierele necesare executabilului sunt ținute într-un "
 "singur loc"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Ferestră GTK+ minimală cu WebKit, precum GtkLauncher"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Arată o fereastră de depanare"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Pornește în gdb și salvează un backtrace la terminarea prematură"
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Execută ca JavaScript fișierul precizat"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Salvează o captură a URI-ului specificat"
 
-#: ../midori/main.c:105
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Execută comanda specificată"
 
-#: ../midori/main.c:107
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Arată comenzile ce pot fi executate cu -e / --execute"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Arată versiunea programului"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Blochează URI-uri după modelul regexp MODEL"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "MODEL"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Repornește Midori după un număr de SECUNDE de inactivitate"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECUNDE"
 
-#: ../midori/main.c:152
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Eroare: „gdb” nu este prezent\n"
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Trimiteți comentarii, sugestii și raportați problemele la:"
 
-#: ../midori/main.c:154
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Versiunile noi sunt disponibile la:"
 
-#: ../midori/main.c:299
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "A intervenit o eroare necunoscută"
 
-#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Acțiune neașteptată „%s”."
-
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6070
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
-msgstr "Favori_te"
+msgstr "Favo_rite"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Adaugă ca fa_vorit"
 
-#: ../midori/midori-app.c:1353
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "E_xtensii"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Istoric"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Scripturi pr_oprii"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "_Stiluri de utilizator"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Ta_b nou"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "De_scărcări"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Module _Netscape"
 
-#: ../midori/midori-app.c:1360
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Taburi în_chise"
 
-#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5209
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Fereastră nouă"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "_Dosar nou"
 
-#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420
-#: ../midori/midori-app.c:1423
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adrese]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Nu s-a găsit fișierul."
 
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Document nevalid."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Format necunoscut de favorite."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Scrierea a eșuat."
-
-#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Salt la pagina următoare"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5353
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Salt la sub-pagina următoare"
 
-#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5294
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Caută pe net…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Reîncarcă pagina curentă"
 
-#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Oprește încărcarea paginii curente"
 
-#: ../midori/midori-browser.c:509
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Nu s-a putut actualiza titlul: %s\n"
 
-#: ../midori/midori-browser.c:604
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Valoarea „%s” nu este validă pentru %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Opțiune neașteptată „%s”"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Acțiune neașteptată „%s”."
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Navigare privată)"
 
-#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr "Selectare [text]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Favorite"
 
-#: ../midori/midori-browser.c:810
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Dosar nou"
 
-#: ../midori/midori-browser.c:810
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Editare dosar"
 
-#: ../midori/midori-browser.c:812
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Favorit nou"
 
-#: ../midori/midori-browser.c:812
-msgid "Edit bookmark"
-msgstr "Editare favorite"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Editare favorit"
 
-#: ../midori/midori-browser.c:846
-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:1119
+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:902
-msgid "Add to _Speed Dial"
-msgstr "Ada_ugă ca apel rapid"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+"Introduceți un nume pentru acest dosar și alegeți unde să îl salvați."
 
-#: ../midori/midori-browser.c:908
-msgid "Show in the tool_bar"
-msgstr "Arată în _bara cu unelte"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Arată în _bara cu favorite"
 
-#: ../midori/midori-browser.c:916
-msgid "Run as _web application"
-msgstr "Deschide ca o aplicație _web"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Adaugă ca ap_el rapid"
 
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4447
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Salvare fișier ca"
 
-#: ../midori/midori-browser.c:1036
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
-msgstr "Salvează resursele _asociate"
+msgstr "Salvează _resursele asociate"
 
-#: ../midori/midori-browser.c:1265
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "S-a deschis o nouă fereastră"
 
-#: ../midori/midori-browser.c:1268
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "S-a deschis un nou tab"
 
-#: ../midori/midori-browser.c:1285
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Eroare la deschiderea imaginii!"
 
-#: ../midori/midori-browser.c:1286
+#: ../midori/midori-browser.c:1630
 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:1292
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Eroare la descărcarea imaginii!"
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Nu s-a putut descărca imaginea selectată."
 
-#: ../midori/midori-browser.c:1350
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Salvare fișier"
 
-#: ../midori/midori-browser.c:2318
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Reîncarcă pagina de la sursă"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Deschidere fișier"
 
-#: ../midori/midori-browser.c:2444
+#: ../midori/midori-browser.c:2692
 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"
@@ -355,24 +390,24 @@ 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:2450 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Flux nou"
 
-#: ../midori/midori-browser.c:2485 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Adăugare favorit nou"
 
-#: ../midori/midori-browser.c:3009 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Gol"
 
-#: ../midori/midori-browser.c:3404 ../midori/midori-browser.c:3405
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Navigare cu sau fără cursor"
 
-#: ../midori/midori-browser.c:3407
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -380,109 +415,99 @@ 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:3410
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Activează _navigarea cu cursorul"
 
-#: ../midori/midori-browser.c:3851 ../midori/midori-browser.c:5817
-#, 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:4179 ../panels/midori-bookmarks.c:840
-#: ../panels/midori-history.c:797
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Deschide tot în _taburi"
 
-#: ../midori/midori-browser.c:4186 ../panels/midori-bookmarks.c:846
-#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519
-msgid "Open in New _Tab"
-msgstr "Deschide într-un _tab nou"
-
-#: ../midori/midori-browser.c:4189 ../midori/midori-view.c:2633
-#: ../midori/midori-view.c:4431 ../panels/midori-bookmarks.c:848
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Deschide într-o _fereastră nouă"
 
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4279
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4280
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4281
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4282
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4284
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4302
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importare de favorite…"
 
-#: ../midori/midori-browser.c:4305 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
-msgstr "Importă fa_voritele"
+msgstr "I_mportă favoritele"
 
-#: ../midori/midori-browser.c:4316
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Program:"
 
-#: ../midori/midori-browser.c:4381
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importă dintr-un fișier XBEL sau HTML"
 
-#: ../midori/midori-browser.c:4409
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importă dintr-un fișier"
 
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Nu s-au putut importa favoritele"
 
-#: ../midori/midori-browser.c:4452
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Favorite XBEL"
 
-#: ../midori/midori-browser.c:4457
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Favorite Netscape"
 
-#: ../midori/midori-browser.c:4471
+#: ../midori/midori-browser.c:4546
 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:4486
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Nu s-au putut exporta favoritele"
 
-#: ../midori/midori-browser.c:4707
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Un mic navigator web."
 
-#: ../midori/midori-browser.c:4708
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Consultați adresa about:version pentru detalii despre versiune."
 
-#: ../midori/midori-browser.c:4710
+#: ../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 "
@@ -494,418 +519,425 @@ msgstr ""
 "publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune "
 "ulterioară, la alegere."
 
-#: ../midori/midori-browser.c:4745
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Igor Știrbu <igor.stirbu@gmail.com>\n"
 "Mișu Moldovan <dumol@xfce.org>\n"
-"Andrei Popescu <andreimpopescu@gmail.com>"
+"Andrei Popescu <andreimpopescu@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Alexandru Musina https://launchpad.net/~alex-musina\n"
+"  Mișu Moldovan https://launchpad.net/~dumol\n"
+"  Stanciu Gabriel-Ciprian https://launchpad.net/~stanciu-gabriel-ciprian\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  george tataru https://launchpad.net/~gtataru"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplică tabul curent"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Fișier"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Deschide o fereastră nouă"
 
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Deschide un tab nou"
 
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Navigare p_rivată în fereastră nouă"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Deschide un fișier"
 
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
-msgstr "_Salvează pagina ca…"
+msgstr "Salvează pagina c_a…"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Salvează într-un fișier"
 
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
-msgstr "Ada_ugă ca apel rapid"
-
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5228
-msgid "Create _Launcher"
-msgstr "Creează _lansator"
+msgstr "Adaugă ca ap_el rapid"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Abonare la _fluxul de știri"
 
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "În_chide tabul"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Închide tabul curent"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Înc_hide fereastra"
 
-#: ../midori/midori-browser.c:5244
-msgid "_Share"
-msgstr "Distrib_uire"
-
-#: ../midori/midori-browser.c:5245
-msgid "Share this page"
-msgstr "Distribuiți această pagină"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Tipărește pagina curentă"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
-msgstr "Închide to_ate ferestrele"
+msgstr "Închide t_oate ferestrele"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "Ca_ută…"
 
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Caută un cuvânt sau o frază în pagină"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Caută înai_nte"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Caută înap_oi"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Schimbați preferințele programului"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Bare cu unelte"
 
-#: ../midori/midori-browser.c:5296
-msgid "Reload page without caching"
-msgstr "Reîncarcă pagina de la sursă"
-
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Zoom mărit"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Zoom micșorat"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
-msgstr "C_odare"
+msgstr "Co_dare"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Arată s_ursa"
 
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Arată sursa DO_M"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Navigare cu cu_rsor"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Comută pe tot ecranul"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Derulare în _stânga"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Derulare în j_os"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Derulare în _sus"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Derulare în _dreapta"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Lizibil"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Navigare"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Salt la pagina anterioară"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Salt la sub-pagina anterioară"
 
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Următor / Înainte"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Salt la sub-pagina următoare sau următoarea pagină în istoric"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Pagină de _start"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Salt la pagina de start"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Golește gunoiul"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
-msgstr "Revocă înc_hiderea tabului"
+msgstr "_Revocă închiderea tabului"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Adaugă un _dosar nou"
 
-#: ../midori/midori-browser.c:5377
-msgid "_Export bookmarks"
-msgstr "E_xportă favoritele"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "I_mport de favorite…"
 
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Gestionați motoarele de căutare"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "E_xport de favorite…"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Gestionați motoarele de căutare…"
 
-#: ../midori/midori-browser.c:5383
-msgid "_Clear Private Data"
-msgstr "Șterge d_atele private"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "Șterge d_atele private"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
-msgstr "_Inspectați pagina"
+msgstr "_Inspectare pagină"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Tabul a_nterior"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "Tabul u_rmător"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Mută tabul în p_rima poziție"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "M_ută înapoi tabul"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Mută înainte tabul"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Mută tabul în ulti_ma poziție"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Activează focusul tabului _curent"
 
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Activează focusul _următorului widget"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Arată doar iconița tabului _curent"
 
-#: ../midori/midori-browser.c:5413
-msgid "_Duplicate Current Tab"
-msgstr "_Duplică tabul curent"
-
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Înc_hide celelalte taburi"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Deschide ultima _sesiune"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "Î_ntrebări frecvente"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Raportați _o problemă…"
 
-#: ../midori/midori-browser.c:5432 ../midori/midori-browser.c:6089
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Unelte"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Bară de _meniu"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Bară de _navigare"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Panou lateral"
 
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Panou lateral"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Bară cu _favorite"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Bară de _stare"
 
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:200
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automată"
 
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Chineză tradițională (BIG5)"
 
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:125
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chineză simplificată (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japoneză (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Coreeană (EUC-KR)"
 
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rusă (KOI8-R)"
 
-#: ../midori/midori-browser.c:5483 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5486 ../midori/midori-websettings.c:130
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Vestică (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
-msgstr "Personalizat"
+msgstr "Personalizat…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Nu s-a putut inițializa istoricul: %s"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Separator"
 
-#: ../midori/midori-browser.c:6002
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "A_dresă…"
 
-#: ../midori/midori-browser.c:6004
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Deschideți o anumită adresă"
 
-#: ../midori/midori-browser.c:6026
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "C_aută pe net…"
 
-#: ../midori/midori-browser.c:6028
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Porniți o căutare pe net"
 
-#: ../midori/midori-browser.c:6055
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Redeschideți taburi ori ferestre închise recent"
 
-#: ../midori/midori-browser.c:6072
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Arată favoritele salvate"
 
-#: ../midori/midori-browser.c:6105
-msgid "_Window"
-msgstr "Fe_reastră"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Taburi"
 
-#: ../midori/midori-browser.c:6107
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Arată lista tuturor taburilor deschise"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Meniu"
 
-#: ../midori/midori-browser.c:6123
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Meniu"
 
-#: ../midori/midori-browser.c:6903
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Opțiune neașteptată „%s”"
-
 #: ../midori/midori-extension.c:341
 #, 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:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, 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:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportare certificat"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Autoritatea de semnare a certificatului nu este cunoscută."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 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:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Data de activare a certificatului este în viitor."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Certificatul a expirat."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -913,40 +945,40 @@ msgstr ""
 "Conform listei de certificate revocate GTlsConnection, certificatul a fost "
 "revocat."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Algoritmul certificatului este considerat nesigur."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "A intervenit o altă eroare la validarea certificatului."
 
 #: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
-msgstr "_Exportare certificat"
+msgstr "E_xportare certificat"
 
-#: ../midori/midori-locationaction.c:1434
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Cu semnătură proprie"
 
-#: ../midori/midori-locationaction.c:1468
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Detalii de securitate"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1555
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Lipește și co_ntinuă"
 
-#: ../midori/midori-locationaction.c:1787
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Neverificată"
 
-#: ../midori/midori-locationaction.c:1795
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Conexiune verificată și criptată"
 
-#: ../midori/midori-locationaction.c:1802
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Conexiune deschisă, necriptată"
 
@@ -963,430 +995,441 @@ msgstr "Închide panoul"
 msgid "Align sidepanel to the left"
 msgstr "Aliniază la stânga panoul lateral"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Arată apelurile rapide"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:107
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Pagina de start"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:339
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Ultimele taburi deschise"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:338
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Ultimele taburi fără a le încărca"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Arată o pagină goală"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Arată motorul implicit de căutare"
+
+# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Arată o pagină personalizată"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japoneză (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "Personalizare..."
-
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Tab nou"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Fereastră nouă"
 
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Tab curent"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Implicit"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Iconițe"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Iconițe mici"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Iconițe și text"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text lângă iconițe"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automat (din mediu ori GNOME)"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Server proxy HTTP"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Fără server proxy"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:280
-msgid "Toolbar Style:"
-msgstr "Stil pentru bara cu unelte:"
-
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Stilul barei cu unelte"
 
-# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:290
-msgid "When Midori starts:"
-msgstr "La pornirea Midori arată:"
-
-#: ../midori/midori-websettings.c:327
-msgid "Open new pages in:"
-msgstr "Paginile noi se vor deschide în:"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:390
-msgid "Identify as"
-msgstr "Identificare"
-
-#: ../midori/midori-websettings.c:391
-msgid "What to identify as to web pages"
-msgstr "Alegeți identitatea de prezentat serverelor web"
-
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Folosește întotdeauna fonturile mele"
 
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
-msgstr "Înlocuiește fonturile precizate în paginile web cu cele alese mai sus"
+msgstr ""
+"Înlocuiește fonturile precizate în paginile web cu cele alese mai sus"
 
-#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Nu s-au putut încărca preferințele: %s\n"
 
-#: ../midori/midori-websettings.c:1360
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Valoarea „%s” nu este validă pentru %s"
-
-#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Valoare nevalidă „%s” în preferințe"
 
-#: ../midori/midori-tab.vala:117
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Nu s-a putut injecta foaia de stiluri: %s"
 
-#: ../midori/midori-view.c:725 ../midori/midori-view.c:866
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "_Arată eticheta tabului"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "_Arată doar iconița tabului"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Închide _tabul din dreapta"
+msgstr[1] "Închide _taburile din dreapta"
+msgstr[2] "Închide _taburile din dreapta"
+
+#: ../midori/midori-notebook.vala:370
+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:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Site de încredere"
 
-#: ../midori/midori-view.c:864
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Nivel necunoscut de securitate"
 
-#: ../midori/midori-view.c:1162
+#: ../midori/midori-view.c:1025
 #, 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:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
-msgstr "_Refuză"
+msgstr "Refu_ză"
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
-msgstr "_Acceptă"
+msgstr "_Permite"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s dorește să vă identifice locația."
 
-#: ../midori/midori-view.c:1305
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "„%s” nu poate fi găsit"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Nu s-a putut încărca pagina „%s”:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Verificați adresa pentru greșeli de scriere"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Asigurați-vă că placa de rețea e conectată sau că interfața wireless este "
+"activată"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Verificați opțiunile de conectare la rețea"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Reîncearcă"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "Eroare - %s"
+msgid "Oops - %s"
+msgstr "Hopa - %s"
 
-#: ../midori/midori-view.c:1306
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Nu s-a putut încărca pagina „%s”."
+msgid "Something went wrong with '%s'."
+msgstr "Ceva n-a funcționat cum trebuie cu „%s”."
 
-#: ../midori/midori-view.c:1308
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "Reîncearcă"
 
-#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2574
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Scrieți un mail către %s"
 
-#: ../midori/midori-view.c:2362
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Adaugă ca _motor de căutare..."
 
-#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2709
-msgid "Inspect _Element"
-msgstr "_Inspectați elementul"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "_Deschide linkul"
 
-#: ../midori/midori-view.c:2457
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Deschide linkul într-un _tab nou"
 
-#: ../midori/midori-view.c:2461
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Deschide lin_kul într-un tab nou în prim plan"
 
-#: ../midori/midori-view.c:2462
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Deschide linkul într-un tab nou în _fundal"
 
-#: ../midori/midori-view.c:2465
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Deschide linkul într-o _fereastră nouă"
 
-#: ../midori/midori-view.c:2468
-msgid "Open Link as Web A_pplication"
-msgstr "Deschide linkul ca o aplicație _web"
-
-#: ../midori/midori-view.c:2473
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Copiază de_stinația linkului"
 
-#: ../midori/midori-view.c:2479
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Salvează c_a…"
 
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Deschide imaginea într-o _nouă fereastră"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
-msgstr "Deschide _imaginea într-un tab nou"
+msgstr "Deschide imaginea într-un tab _nou"
 
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
-msgstr "Copiază _adresa imaginii"
+msgstr "Copia_ză adresa imaginii"
 
-#: ../midori/midori-view.c:2494
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Salvează i_maginea"
 
-#: ../midori/midori-view.c:2497
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "D_eschide imaginea în programul asociat"
 
-#: ../midori/midori-view.c:2504
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Copiază _adresa materialului video"
 
-#: ../midori/midori-view.c:2507
-msgid "Save _Video"
-msgstr "Salvează materialul _video"
-
-#: ../midori/midori-view.c:2507
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Descarcă _materialul video"
 
-#: ../midori/midori-view.c:2533
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Deschide adresa într-un _tab nou"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Caută c_u"
 
-#: ../midori/midori-view.c:2562
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "C_aută pe net"
 
-#: ../midori/midori-view.c:2582
-msgid "Open Address in New _Tab"
-msgstr "Deschide adresa într-un _tab nou"
-
-#: ../midori/midori-view.c:2629
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Desc_hide cadrul într-un tab nou"
 
-#: ../midori/midori-view.c:2841
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "_Inspectare element"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Deschide sau descarcă fișierul de la %s"
 
-#: ../midori/midori-view.c:2854
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Nume fișier: %s"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Tip de fișier: „%s”"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Tip de fișier: %s („%s”)"
 
-#: ../midori/midori-view.c:2898
+#: ../midori/midori-view.c:2778
 #, 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:2909
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Deschide %s"
 
-#: ../midori/midori-view.c:3435
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspectare pagină - %s"
 
-#: ../midori/midori-view.c:3850
-#, c-format
-msgid "No documentation installed"
-msgstr "Documentația nu este instalată"
-
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori nu stochează niciun fel de date personale:"
 
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Nu se salvează istoricul ori cookie-urile."
 
-#: ../midori/midori-view.c:3928
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Extensiile sunt dezactivate."
 
-#: ../midori/midori-view.c:3929
+#: ../midori/midori-view.c:3901
 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:3930
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori previne urmărirea utilizatorilor pe Internet:"
 
-#: ../midori/midori-view.c:3931
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Antetele referrer sunt trunchiate la numele serverului."
 
-#: ../midori/midori-view.c:3932
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Cererile DNS nu se fac anticipat."
 
-#: ../midori/midori-view.c:3933
+#: ../midori/midori-view.c:3905
 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:3934
+#: ../midori/midori-view.c:3906
 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:4013
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "Cifrele dintre paranteze arată versiunile utilizate curent."
 
-#: ../midori/midori-view.c:4059
-msgid "Page loading delayed"
-msgstr "Încărcarea paginii a fost întârziată."
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Încărcarea paginii a fost întârziată:"
 
-#: ../midori/midori-view.c:4060
+#: ../midori/midori-view.c:4000
 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:4061
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Încarcă pagina"
 
-#: ../midori/midori-view.c:4225
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "O pagină goală"
 
-#: ../midori/midori-view.c:4435
-msgid "_Duplicate Tab"
-msgstr "D_uplică tabul"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Label"
-msgstr "_Arată eticheta tabului"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Icon Only"
-msgstr "_Arată doar iconița tabului"
-
-#: ../midori/midori-view.c:4447
-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"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5122
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "înapoi"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5141
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "înainte"
 
-#: ../midori/midori-view.c:5154
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Tipărește imaginile de fundal"
 
-#: ../midori/midori-view.c:5155
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Specifică dacă se tipăresc și imaginile de fundal"
 
-#: ../midori/midori-view.c:5179
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Facilități"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:54
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s din %s"
 
-#: ../midori/midori-download.vala:70
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1394,7 +1437,7 @@ msgstr[0] "o oră"
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: ../midori/midori-download.vala:71
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1402,7 +1445,7 @@ msgstr[0] "un minut"
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: ../midori/midori-download.vala:72
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1411,27 +1454,27 @@ msgstr[1] "%d secunde"
 msgstr[2] "%d de secunde"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:87
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - încă %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:98
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:100
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:197
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Fișierul descărcat este corupt."
 
-#: ../midori/midori-download.vala:198
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1439,168 +1482,154 @@ msgstr ""
 "Suma de control asociată linkului nu s-a potrivit. Probabil că fișierul este "
 "incomplet sau a fost modificat ulterior."
 
-#: ../midori/midori-download.vala:312
+#: ../midori/midori-download.vala:366
 #, 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-download.vala:314
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Nu aveți drepturile necesare pentru a scrie aici."
 
-#: ../midori/midori-download.vala:317
+#: ../midori/midori-download.vala:371
 #, 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-download.vala:319
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Fișierul necesită %s, dar liberi sunt doar %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Apeluri rapide"
 
-# dumol: E ok dacă e mai lung
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+# dumol: E ok dacă e mai lung...
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Dați clic  aici pentru a adăuga un apel rapid"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Introduceți adresa apelului rapid"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Introduceți titlul apelului rapid"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Sigur doriți să ștergeți acest apel rapid?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Pornire"
 
-#: ../midori/midori-preferences.c:305
+# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "La pornirea Midori arată:"
+
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Pagină de start:"
 
-#: ../midori/midori-preferences.c:313
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Tipărește pagina _curentă"
 
-#: ../midori/midori-preferences.c:317
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Utilizează pagina curentă ca pagină de start"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: ../midori/midori-preferences.c:328
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Familie de fonturi proporționale"
 
-#: ../midori/midori-preferences.c:332
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Familie implicită de fonturi pentru afișarea textului"
 
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Mărime implicită a fontului pentru afișarea textului"
 
-#: ../midori/midori-preferences.c:337
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Familie de fonturi cu lățime fixă"
 
-#: ../midori/midori-preferences.c:341
+#: ../midori/midori-preferences.c:348
 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:344
+#: ../midori/midori-preferences.c:351
 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:346
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Mărime minimă a fontului"
 
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Mărime minimă a fontului pentru afișarea textului"
 
-#: ../midori/midori-preferences.c:354
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Codare preferată"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Comportament"
 
-#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Încarcă automat imaginile"
 
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Activează verificarea ortografică"
 
-#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Execută scripturile"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Suport pentru standardul WebGL"
 
-#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Activează modulele Netscape"
-
-#: ../midori/midori-preferences.c:393
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Scalează imaginile odată cu textul"
 
-#: ../midori/midori-preferences.c:396
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Permite popup-uri deschise de scripturi"
 
-#: ../midori/midori-preferences.c:397
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Specifică dacă se permite scripturilor deschiderea de ferestre popup"
 
-#: ../midori/midori-preferences.c:403
-msgid "Kinetic scrolling"
-msgstr "Derulare cinetică"
-
-#: ../midori/midori-preferences.c:404
-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"
-
-#: ../midori/midori-preferences.c:409
-msgid "Middle click opens Selection"
-msgstr "Butonul din mijloc deschide selecția"
-
-#: ../midori/midori-preferences.c:410
-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-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Zoom implicit"
 
-#: ../midori/midori-preferences.c:415
-msgid "Flash window on background tabs"
-msgstr "Evidențiere pentru taburile noi în fundal"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Factor de mărire al zoomului în taburile nou deschise"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Limbă preferată"
 
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1608,100 +1637,121 @@ 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-preferences.c:426
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Salvează fișierele descărcate în:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Navigare"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Temă:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Stil pentru bara cu unelte:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Paginile noi se vor deschide în:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Comportamentul noilor taburi:"
+
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Butoane de închidere a taburilor"
 
-#: ../midori/midori-preferences.c:451
-msgid "Always Show Tabbar"
-msgstr "Arată întotdeauna bara cu taburi"
-
-#: ../midori/midori-preferences.c:455
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Deschide taburile lângă cel curent"
 
-#: ../midori/midori-preferences.c:456
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+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-preferences.c:459
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Deschide taburile în fundal"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Editor de text"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Agregator de știri"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:475
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Rețea"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: ../midori/midori-preferences.c:482
-msgid "Hostname"
-msgstr "Nume ori IP"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:490
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Tipuri de proxy acceptate:"
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Cache web"
 
-#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Mărimea maximă a paginilor din cache-ul pe disc"
 
-#: ../midori/midori-preferences.c:507
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-preferences.c:526
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identificare"
+
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Intimitate"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-preferences.c:528
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Șterge cookie-urile vechi după:"
 
-#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Numărul maxim de zile pentru păstrarea cookie-urilor"
 
-#: ../midori/midori-preferences.c:537
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
-msgstr "Nu accepta cookie-uri third-party"
+msgstr "Nu permite cookie-uri third-party"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:594
 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ă"
 
 # dumol: Scurtat puțin pentru a nu lăbărța fereastra preferințelor
-#: ../midori/midori-preferences.c:543
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1709,53 +1759,57 @@ msgstr ""
 "Cookie-urile stochează autentificări, preferințe ori alte date, multe în "
 "scopuri publicitare."
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Cache offline pentru aplicații web"
 
-#: ../midori/midori-preferences.c:553
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Suport pentru stocare locală HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:557
+#: ../midori/midori-preferences.c:613
 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-preferences.c:559
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Specifică dacă antetul Referrer va fi scurtat la numele serverului"
 
-#: ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Șterge paginile din istoric după:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Numărul maxim de zile pentru păstrarea istoricului"
 
-#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Extensii"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Gestionați motoarele de căutare"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Adăugați un motor de căutare"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Editare motor de căutare"
 
-#: ../midori/midori-searchaction.c:1071
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: ../midori/midori-searchaction.c:1086
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Descriere:"
 
-#: ../midori/midori-searchaction.c:1099 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adresă:"
 
@@ -1781,49 +1835,49 @@ msgstr "Nu s-au putut încărca motoarele de căutare. %s\n"
 msgid "The search engines couldn't be saved. %s"
 msgstr "Nu s-au putut salva motoarele de căutare. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Istoric"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Favorite și Istoric"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Nu s-a putut inițializa istoricul: %s"
+msgid "Search for %s"
+msgstr "Caută %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Nu s-a putut selecta din istoric: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Caută %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Caută cu…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Caută cu %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Deschide cu"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Alegeți o asociere pentru a deschide „%s”:"
 
-#: ../midori/sokoke.c:366 ../midori/sokoke.c:380
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Nu s-a putut porni programul extern."
 
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "URI invalid"
+
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
@@ -1845,71 +1899,105 @@ msgstr "Majuscule semnificative"
 msgid "Close Findbar"
 msgstr "Închide bara de căutare"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "S-a descărcat fișierul „<b>%s</b>”."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "un favorit"
+msgstr[1] "%d favorite"
+msgstr[2] "%d de favorite"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Descărcare finalizată"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "un sub-dosar"
+msgstr[1] "%d sub-dosare"
+msgstr[2] "%d de sub-dosare"
 
-#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Șterge tot"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Dosar gol"
 
-#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
-msgid "Some files are being downloaded"
-msgstr "Unele fișiere sunt în curs de descărcare"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Dosar conținând %s și niciun favorit"
 
-#: ../toolbars/midori-transferbar.c:278
-msgid "_Quit Midori"
-msgstr "În_chidere Midori"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Dosar conținând %s"
 
-#: ../toolbars/midori-transferbar.c:280
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Dacă închideți Midori, se vor pierde descărcările curente."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Dosar conținând %s și %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Nu s-a putut adăuga favoritul: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Favorit ce duce la: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Nu s-a putut actualiza favoritul: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s și niciun favorit"
 
-#: ../panels/midori-bookmarks.c:535
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Editați favoritul selectat"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Ștergeți favoritul selectat"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Adăugați un dosar nou"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Deschide într-un _tab nou"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1017
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Căutare în favorite"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Istoric"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Azi"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1917,48 +2005,36 @@ msgstr[0] "Ieri"
 msgstr[1] "Acum %d zile"
 msgstr[2] "Acum %d de zile"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Acum o săptămână"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, 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:362
+#: ../panels/midori-history.c:312
 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:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Adaugă ca favorit elementul selectat din istoric"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Șterge elementul selectat din istoric"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Șterge întregul istoric"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:988
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Căutare în istoric"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Descărcări"
-
-#: ../panels/midori-transfers.c:435
-msgid "Open Destination _Folder"
-msgstr "Deschide _dosarul de destinație"
-
-#: ../panels/midori-transfers.c:438
-msgid "Copy Link Loc_ation"
-msgstr "Copiază _adresa linkului"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Autentificare obligatorie"
@@ -1983,114 +2059,63 @@ msgstr "Parolă"
 msgid "_Remember password"
 msgstr "_Reține parola"
 
-#: ../katze/katze-throbber.c:947
-#, 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:960
-#, 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:1040
-msgid "Animation frames are broken"
-msgstr "Cadrele animației sunt nevalide"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Fără"
 
-#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Proprietatea „%s” nu este validă pentru %s"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Selectați un fișier"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Selectați un dosar"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "Fără"
-
-#: ../katze/katze-utils.c:687
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "o oră"
 
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "o zi"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "o săptămână"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "o lună"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "un an"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferințe pentru %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Sumă de control MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Sumă de control SHA1:"
 
-#: ../extensions/adblock.c:484
-msgid "Configure Advertisement filters"
-msgstr "Opțiuni pentru filtrarea reclamelor"
-
-#: ../extensions/adblock.c:515
-#, 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 ""
-"Introduceți adresa listei cu filtre preconfigurate în căsuța de text și "
-"faceți clic pe „Adaugă” pentru a o adăuga în listă. Puteți găsi mai multe "
-"liste la %s."
-
-#: ../extensions/adblock.c:929
-msgid "Edit rule"
-msgstr "Editare regulă"
-
-#: ../extensions/adblock.c:943
-msgid "_Rule:"
-msgstr "_Regulă:"
-
-#: ../extensions/adblock.c:997
-msgid "Bl_ock image"
-msgstr "Bl_ochează imaginea"
-
-#: ../extensions/adblock.c:1002
-msgid "Bl_ock link"
-msgstr "Bl_ochează linkul"
-
-#: ../extensions/adblock.c:1928
-msgid "Advertisement blocker"
-msgstr "Filtrare de reclame"
-
-#: ../extensions/adblock.c:1929
-msgid "Block advertisements according to a filter list"
-msgstr "Blochează reclamele conform unei liste de filtre"
-
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Această pagină pare să conțină un script de utilizator. Doriți să-l "
 "instalați ca script propriu?"
@@ -2114,71 +2139,71 @@ msgstr "_Instalează stilul"
 msgid "Don't install"
 msgstr "Nu instala"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Scripturi de utilizator"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Stiluri de utilizator"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Eroare"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Doriți să ștergeți „%s”?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Ștergere script de utilizator"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Ștergere stil de utilizator"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Fișierul <b>%s</b> va fi șters definitiv."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Deschide în editorul de text"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Deschide dosarul țintă"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Adăugare de noi elemente"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Șterge elementul selectat"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Module proprii"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Nu se poate monitoriza dosarul „%s”: %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Suport pentru scripturi și stiluri de utilizator"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Taburi colorate"
 
-#: ../extensions/colorful-tabs.c:204
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Colorează distinct taburile"
 
@@ -2187,11 +2212,11 @@ msgstr "Colorează distinct taburile"
 msgid "Cookie Manager"
 msgstr "Gestionare de cookie-uri"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Șterge tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2199,31 +2224,31 @@ msgstr ""
 "Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-"
 "urile ce se potrivesc cu respectivul filtru vor fi șterse."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Extinde tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Pliază tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Sigur doriți să ștergeți toate cookie-urile?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:574
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Întrebare"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Doar cookie-urile ce se potrivesc cu filtrul vor fi șterse."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
-msgstr "Până la sfârșitul sesiunii"
+msgstr "La sfârșitul sesiunii"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2241,15 +2266,15 @@ msgstr ""
 "<b>Valabilitate</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Da"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nu"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:699
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2258,19 +2283,20 @@ msgstr ""
 "<b>Domeniu</b>: %s\n"
 "<b>Cookie-uri</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1022
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Nume"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1074
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Extinde tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1082
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Plia_ză tot"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1134
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Căutare în numele și domeniile cookie-urilor"
 
@@ -2290,26 +2316,46 @@ msgstr "Copiere a adreselor taburilor"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Copiază adresele taburilor în clipboard"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Încărcare întârziată"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Întârziere în secunde la încărcarea paginii"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Întârzie încărcarea paginii până ce accesați respectivul tab"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dublu clic pentru mai multe informații"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Această extensie arată mesajele de eroare glib în systray."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
 "A intervenit o eroare la încercarea de a descărca un fișier cu următorul "
 "modul:\n"
+"%s\n"
+"\n"
+"Eroare:\n"
+"%s\n"
+"\n"
+"Continuați fără acest modul."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2336,38 +2382,38 @@ msgstr "Comandă:"
 msgid "Download files with \"%s\" or a custom command"
 msgstr "Descarcă fișierele cu „%s” ori o comandă personalizată"
 
-#: ../extensions/external-download-manager.vala:318
+#: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
 msgstr "Manager extern de descărcări - Linie de comandă"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Nu s-au găsit elementele necesare Atom „entry” în datele XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Nu s-au găsit elementele necesare Atom „feed” în datele XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:378
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Ultima actualizare: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:644
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Fluxuri de știri"
 
-#: ../extensions/feed-panel/feed-panel.c:697
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Adăugare flux nou"
 
-#: ../extensions/feed-panel/feed-panel.c:704
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Șterge fluxul"
 
-#: ../extensions/feed-panel/feed-panel.c:784
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Fluxuri de știri"
 
@@ -2376,48 +2422,48 @@ msgstr "_Fluxuri de știri"
 msgid "Failed to find root element in feed XML data."
 msgstr "Nu s-a găsit elementul rădăcină în datele fluxului XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Format de flux nesuportat."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Nu s-a putut prelucra fluxul XML: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Nu s-a găsit elementul „channel” în datele XML al RSS-ului."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "A fost depistată o versiune nesuportată de RSS."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Nu s-au găsit elementele necesare „item” în datele XML ale RSS-ului."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "Nu s-au găsit elementele necesare „channel” în datele XML ale RSS-ului."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Fluxul „%s” există deja"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Eroare la încărcarea fluxului „%s”"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panou cu fluxuri de știri"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Urmăriți fluxuri de știri Atom/RSS"
 
@@ -2438,124 +2484,417 @@ msgstr ""
 "Pentru a deschide această adresă e nevoie\n"
 "de numele unui cont de acces și parola sa:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Să se rețină parola pentru această pagină?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Reține"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Nu acum"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Niciodată pentru pagina asta"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Comută starea istoricului formularelor"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
-msgstr "Activează ori dezactivează istoricul formularelor pentru tabul curent"
-
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Nu s-a putut deschide baza de date: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Nu s-a putut executa comanda asupra bazei de date: %s\n"
+msgstr ""
+"Activează ori dezactivează istoricul formularelor pentru tabul curent"
 
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 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)"
+"Activează istoricul formularelor doar prin combinația de taste Ctrl+Shift+F "
+"(per tab)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Istoric pentru formulare"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Salvează istoricul datelor introduse în formulare"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Nu s-a putut selecta o sugestie\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Nu există taburi nevizitate"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
-msgstr "Lista istoricului"
+msgstr "Listă-istorică"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "La închiderea unui tab"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Nu face nimic"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Comută la ultimul tab vizualizat"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Comută la cel mai nou tab"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Evidențiere pentru taburile noi în fundal"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Următorul tab nou (din istoric)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Următorul tab nou din istoric"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Precedentul tab nou (din istoric)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Precedentul tab nou din istoric"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
-msgstr "Arată tabul în fundal (în lista istoricului)"
+msgstr "Arată tabul în fundal (listă istorică)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Arată în fundal tabul selectat curent"
 
-#: ../extensions/history-list.vala:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
-msgstr "Lista istoricului"
+msgstr "Listă istorică"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
-msgstr "La comutarea ori închiderea taburilor mută la ultimul tab folosit "
+msgstr "La comutarea ori închiderea taburilor mută la ultimul tab folosit"
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Eroare SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Permite"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Permite per sesiune"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blochează"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Nu s-a putut deschide baza de date a extensiei: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Nu s-a putut executa comanda asupra bazei de date: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Sigur doriți să ștergeți toate permisiunile JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Ștergeți toate permisiunile JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Această acțiune va șterge toate permisiunile JavaScript. Veți fi consultat "
+"din nou pentru permisiunile asociate fiecărui site web vizitat."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Instanță manager"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instanță a managerului global NoJS"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Configurare NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Mai jos este o listă a tuturor domeniilor pentru care există reguli "
+"asociate. Puteți șterge regulile marcându-le și apoi apăsând <i>Șterge</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domeniu"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Regulă"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Șterge t_ot"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Permite scripturi pentru toate domeniile"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "_Blochează implicit scripturile pentru domenii necunoscute"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "_Nu lua în considerare subdomeniile"
 
-#: ../extensions/mouse-gestures.c:297
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Refuză %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Permite %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Permite %s în această sesiune"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Fereastra navigatorului"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Instanța navigatorului Midori căreia îi aparține această vizualizare"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Vizualizare"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+"Instanța de vizualizare Midori căreia îi aparține această vizualizare"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Starea iconiței de meniu"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Specifică dacă să fie vizibilă iconița meniului în bara de stare"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Nedeterminat"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Permis"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Mixt"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Refuzat"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"A intervenit o eroare fatală ce nu permite extensiei NoJS să continue. Ar "
+"trebui să o dezactivați."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Eroare în extensia NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Motiv"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Nu s-a putut crea directorul cu opțiunile extensiei: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Nu s-a putut crea directorul cu opțiunile extensiei."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Nu s-a putut deschide baza de date a extensiei."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+"Nu s-a putut inițializa structura bazei de date pentru această extensie."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Instanța extensiei"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Instanța extensiei Midori pentru această extensie"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Instanța programului"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Instanța programului Midori căreia îi aparține această extensie"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Instanța bazei de date"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Pointer către instanța bazei de date SQLite utilizat de către această "
+"extensie"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Calea bazei de date"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Calea către instanța SQLite utilizată de această extensie"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Permite toate domeniile"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"La activare, această extensie va fi permisivă și nu va verifica regula "
+"pentru fiecare site."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Doar domeniul secundar"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"La activare, această extensie va lua în considerare pentru orice adresă doar "
+"domeniul secundar (www.example.org va fi redus la example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Regulă pentru domeniile necunoscute"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Regulă de utilizat pentru domeniile necunoscute."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Permite temporar"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Gesturi de maus"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "Controlați Midori prin gesturi de maus"
 
@@ -2568,7 +2907,7 @@ msgid "Customize Keyboard shortcuts"
 msgstr "Personalizați combinațiile de taste"
 
 #: ../extensions/shortcuts.c:275
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts"
 msgstr "Personalizați c_ombinațiile de taste…"
 
 #: ../extensions/shortcuts.c:312
@@ -2579,11 +2918,11 @@ msgstr "Combinații de taste"
 msgid "View and edit keyboard shortcuts"
 msgstr "Vizualizați și editați combinațiile de taste"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Ceas în bara de stare"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Arată data și ora în bara de stare"
 
@@ -2599,6 +2938,10 @@ msgstr "Scripturi"
 msgid "Netscape plugins"
 msgstr "Module Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activează modulele Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Facilități web în bara de stare"
@@ -2607,15 +2950,15 @@ msgstr "Facilități web în bara de stare"
 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:584 ../extensions/tab-panel.c:673
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Panou cu taburi"
 
-#: ../extensions/tab-panel.c:656
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Panou cu t_aburi"
 
-#: ../extensions/tab-panel.c:674
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Arată taburile într-un panou vertical"
 
@@ -2627,11 +2970,11 @@ 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:401
 msgid "Customize Toolbar"
 msgstr "Personalizați bara cu unelte"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2639,67 +2982,59 @@ 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:433
 msgid "Available Items"
 msgstr "Elemente disponibile"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Elemente afișate"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Personalizați bara cu unel_te…"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Editor pentru bara cu unelte"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Personalizați aspectul barei cu unelte"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Stochează comunicarea HTTP într-un cache pe disc"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Nu s-au putut încărca cookie-urile\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Ștergere de date private"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "Șt_erge datele private"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Șterge următoarele date:"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Ultimele _taburi deschise"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Șterge datele pri_vate la ieșirea din Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:298
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "_Parole și autentificări salvate"
 
-#: ../midori/midori-privatedata.c:300
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookie-uri și date ale site-urilor"
 
-#: ../midori/midori-privatedata.c:307
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Iconițe ale site-urilor web"
 
@@ -2708,760 +3043,513 @@ msgid "Open tabs"
 msgstr "Taburi deschise"
 
 # dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-viewcompletion.vala:67
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Mai multe taburi deschise..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Nu s-a putut curăța istoricul: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Nu s-au putut șterge elementele vechi din istoric: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "nu s-a putut face ATTACH la vechiul db"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "nu s-a putut importa din vechiul db"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "nu s-a putut anula tranzacția"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "nu s-a putut face DETACH"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Nu s-a putut crea tabela de favorite: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Nu s-a putut adăuga favoritul: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Nu s-a putut importa din vechea baza de date: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Nu s-a putut actualiza favoritul: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Nu s-au putut salva favoritele. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Nu s-a putut șterge favoritul: %s\n"
 
-#: ../midori/midori-session.c:187
+#: ../midori/midori-session.c:217
 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/midori-session.c:355
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Nu s-au putut salva preferințele. %s"
 
-#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:449
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Nu s-a putut încărca sesiunea: %s\n"
-
-#: ../midori/midori-session.c:406
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Nu s-a putut salva sesiunea. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:126
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Nu s-a putut salva gunoiul. %s"
 
-#: ../midori/midori-frontend.c:309
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 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."
+"Se pare că Midori s-a terminat prematur la ultima pornire. Puteți raporta "
+"problema la %s."
 
-#: ../midori/midori-frontend.c:319
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "_Editare preferințe"
 
-#: ../midori/midori-frontend.c:323
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
-msgstr "_Fără extensii"
+msgstr "_Dezactivează extensiile"
 
-#: ../midori/midori-frontend.c:332
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Arată o fereastră de depanare la pornirea după o terminare prematură"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Uită taburile vechi"
 
-#: ../midori/midori-frontend.c:401
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "_Arată înregistrările"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "Pornește în _debugger"
+
+#: ../midori/midori-frontend.c:461
 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"
+msgstr ""
+"O instanță a programului Midori este deja pornită, dar nu răspunde.\n"
 
-#: ../midori/midori-frontend.c:434
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Nu s-au putut încărca favoritele: %s\n"
 
-#: ../midori/midori-frontend.c:465
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Nu s-a putut încărca sesiunea: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Nu s-a putut încărca gunoiul: %s\n"
 
-#: ../midori/midori-frontend.c:473
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Nu s-a putut încărca istoricul: %s\n"
 
-#: ../midori/midori-frontend.c:484
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Au intervenit următoarele erori:"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignoră"
 
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Redirectează avertizările din consolă în FIȘIER"
-
-#~ msgid "FILENAME"
-#~ msgstr "FIȘIER"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Salvează lin_kul pe desktop"
-
-#~ msgid "Remember last window size"
-#~ msgstr "Reține dimensiunea ultimei ferestre"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre"
-
-#~ msgid "Last window width"
-#~ msgstr "Lățimea ultimei ferestre"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Ultima lățime salvată a ferestrei"
-
-#~ msgid "Last window height"
-#~ msgstr "Înălțimea ultimei ferestre"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Ultima înălțime salvată a ferestrei"
-
-#~ msgid "Last panel position"
-#~ msgstr "Ultima poziție a panoului"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Ultima poziție salvată a panoului"
-
-#~ msgid "Last panel page"
-#~ msgstr "Ultima pagină a panoului"
-
-#~ msgid "The last saved panel page"
-#~ msgstr "Ultima pagină salvată a panoului"
-
-#~ msgid "Last Web search"
-#~ msgstr "Ultima căutare pe net"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Ultima căutare pe net salvată"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Arată bara de meniu"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Specifică dacă să fie vizibilă bara de meniu"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Arată bara de navigare"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Specifică dacă să fie vizibilă bara de navigare"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Arată bara cu favorite"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Specifică dacă să fie vizibilă bara cu favorite"
-
-#~ msgid "Show Panel"
-#~ msgstr "Arată panoul"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Specifică dacă să fie vizibil panoul"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Arată bara de stare"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Specifică dacă să fie vizibilă bara de stare"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Elementele barei cu unelte"
-
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "Elementele de arătat în bara cu unelte"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Panou lateral compact"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Specifică dacă panoul lateral e compact"
-
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "Aliniază la dreapta panoul lateral"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Specifică dacă panoul lateral se aliniază la dreapta"
-
-#~ msgid "Open panels in separate windows"
-#~ msgstr "Deschide panourile în ferestre separate"
-
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "Specifică dacă panourile noi se deschid în ferestre separate"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Specificați cum să pornească Midori"
-
-#~ msgid "The homepage"
-#~ msgstr "Pagina de start"
-
-#~ msgid "Show crash dialog"
-#~ msgstr "Depanare după terminări premature"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Calea către dosarul pentru salvarea fișierelor descărcate"
-
-#~ msgid "An external text editor"
-#~ msgstr "Editor extern de text"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "Agregator extern de știri"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Căutarea în bara de adrese"
-
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "Căutarea de efectuat în bara de adrese"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Codarea de caractere preferată"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Arată întotdeauna bara cu taburi"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Specifică dacă se adaugă butoane de închidere pe taburi"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Alegeți unde să se deschidă paginile noi"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Specifică dacă taburile noi se deschid în fundal"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Deschide popup-urile în taburi"
-
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "Specifică dacă ferestrele popup se deschid în taburi"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Încarcă și afișează automat imaginile"
-
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "Activează limbajele de scripting incluse"
-
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "Activează modulele Netscape incluse"
-
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "Verifică ortografia în timpul tastării"
-
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "Suport pentru baze de date HTML5"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "Specifică dacă să se activeze suportul pentru baze de date HTML5"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "Specifică dacă să se activeze suportul pentru stocare locală HTML5"
-
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr ""
-#~ "Specifică dacă să se activeze suportul pentru cache offline de aplicații "
-#~ "web"
-
-#~ 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"
-
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "Permite randarea WebGL în paginile web"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Specifică dacă se scalează concomitent textul și imaginile"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Caută în pagină pe măsură ce se tastează"
-
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "Specifică dacă se caută automat pe măsură ce se tastează"
-
-#~ msgid "The type of proxy server to use"
-#~ msgstr "Tipul serverului proxy de utilizat"
-
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "Server proxy HTTP"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Serverul proxy pentru conexiuni HTTP"
-
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "Portul serverului proxy pentru conexiuni HTTP"
-
-#~ msgid "Identification string"
-#~ msgstr "Șir de identificare"
-
-#~ msgid "The application identification string"
-#~ msgstr "Șirul de identificare al navigatorului"
-
-#~ msgid "Clear private data"
-#~ msgstr "Șterge datele private"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Datele private selectate pentru ștergere"
-
-#~ msgid "Clear data"
-#~ msgstr "Șterge datele"
-
-#~ msgid "The data selected for deletion"
-#~ msgstr "Datele selectate pentru ștergere"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Evidențiază potrivirile"
-
-#~ 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 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"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Adaugă în pagina apelurilor rapide"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Salvează linkul pe desktop"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Creează un lansator"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Abonare la acest flux de știri"
-
-#~ msgid "Close this window"
-#~ msgstr "Închide fereastra curentă"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Închide toate ferestrele deschise"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Anulează ultima modificare"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Refă ultima modificare"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Taie textul selectat"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Copiază textul selectat"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Lipește textul din clipboard"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Șterge textul selectat"
-
-#~ msgid "Select all text"
-#~ msgstr "Selectează tot textul"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Caută următoarea apariție a cuvântului sau a expresiei"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Caută precedenta apariție a cuvântului sau a expresiei"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Zoom normal"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Vizualizați codul sursă al paginii"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Derulare spre stânga"
-
-#~ msgid "Scroll down"
-#~ msgstr "Derulare în jos"
-
-#~ msgid "Scroll up"
-#~ msgstr "Derulare în sus"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Derulare spre dreapta"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Șterge conținutul coșului de gunoi"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Deschide ultimul tab închis"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Adaugă un dosar cu favorite"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Adăugați, editați și ștergeți motoare de căutare…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Ștergere de date private…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Comută la tabul anterior"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Comută la tabul următor"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Mută tabul după tabul următor"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Mută tabul înaintea tabului anterior"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Activează focusul tabului curent"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Schimbă focusul între vizualizări"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Arată doar iconița tabului curent"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "Nu s-a putut deschide baza de date a extensiei: %s"
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplică tabul curent"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "Sigur doriți să ștergeți toate permisiunile pentru cookie-uri?"
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Închide toate taburile înafara celui curent"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "Ștergeți toate permisiunile pentru cookie-uri?"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Deschide taburile salvate în ultima sesiune"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Această acțiune va șterge toate permisiunile pentru cookie-uri. Veți fi "
+"consultat din nou pentru permisiunile asociate fiecărui site web vizitat."
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Arată întrebările frecvente"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Gestionare a permisiunilor pentru cookie-uri"
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Accesați baza de date cu probleme Midori"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "Instanță curentă a gestionarului de permisiuni pentru cookie-uri"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Arată detalii despre program"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "Configurați permisiunile pentru cookie-uri"
 
-#~ msgid "Show menubar"
-#~ msgstr "Arată bara de meniu"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"Mai jos este o listă a tuturor domeniilor pentru care există reguli "
+"definite. Puteți șterge aceste reguli marcându-le și apoi apăsând "
+"<i>Șterge</i>. Sau puteți adăuga o nouă regulă pentru un domeniu "
+"introducându-l mai jos, alegând o regulă și apoi apăsând <i>Adaugă</i>."
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Arată bara de navigare"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Regulă pentru cookie-urile domeniilor nelistate: "
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Arată panoul lateral"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Cere o decizie"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Arată bara cu favorite"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+"A intervenit o eroare fatală ce nu permite extensiei de gestionare a "
+"permisiunilor cookie-urilor să continue. Ar trebui să o dezactivați."
 
-#~ msgid "Show statusbar"
-#~ msgstr "Arată bara de stare"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Eroare în extensia de gestionare a permisiunilor pentru cookie-uri"
 
-#~ msgid "No filename specified"
-#~ msgstr "Nu s-a precizat un fișier"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+"Nu s-a putut determina regula generală de aplicat pentru cookie-urile "
+"domeniului: %s"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Precizați numărul de coloane și rânduri"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "Până la sfârșitul sesiunii"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Introduceți numărul de coloane și rânduri:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "Domeniul %s dorește să stocheze %d cookie-uri."
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Input invalid pentru dimensiunile apelurilor rapide"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "Domeniul %s dorește să stocheze un cookie."
 
-#~ msgid "Thumb size:"
-#~ msgstr "Mărimea miniaturii:"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "Mai multe domenii doresc să stocheze în total %d cookie-uri."
 
-#~ msgid "Small"
-#~ msgstr "Mică"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "_Permite"
 
-#~ msgid "Medium"
-#~ msgstr "Medie"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "Permite per _sesiune"
 
-#~ msgid "Big"
-#~ msgstr "Mare"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "Refu_ză"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "_Sesiune nouă"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "Refuză _de data asta"
 
-#~ msgid "Quit the application"
-#~ msgstr "Ieșire din Midori"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "Cale"
 
-#~ msgid "_Contents"
-#~ msgstr "_Conținut"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "Valoare"
 
-#~ msgid "Show the documentation"
-#~ msgstr "Arată documentația"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "Data expirării"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Nu s-a putut executa comanda asupra bazei de date\n"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+"Regula de utilizat pentru domeniile ce nu au fost configurate individual. "
+"Această regulă poate restrânge politica globală pentru gestionarea cookie-"
+"urile configurată în opțiunile Midori."
 
-#~ msgid "Show Blank page"
-#~ msgstr "O pagină goală"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Gestionare a permisiunilor pentru cookie-uri"
 
-#~ msgid "All cookies"
-#~ msgstr "Toate cookie-urile"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Gestionați permisiunile per domeniu pentru cookie-uri"
 
-#~ msgid "Session cookies"
-#~ msgstr "Cookie-uri de sesiune"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Nu s-a obține iconița programului în %s: %s"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Arată bara descărcărilor"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Specifică dacă să fie vizibilă bara descărcărilor"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Nu s-a putut crea un nou lansator (%s): %s"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Arată căutările la auto-completare"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Lansator creat"
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr ""
-#~ "Specifică dacă să fie vizibile motoarele de căutare la completarea în "
-#~ "bara de adrese"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Puteți porni <b>%s</b> utilizând lansatorul sau din meniu"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Arată controalele active ale panoului"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Eroare la crearea lansatorului"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Specifică dacă să fie vizibile controalele active ale panoului"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Programe"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Arată apelurile rapide în taburi noi"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "P_rofil nou"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Arată apelurile rapide în taburile nou deschise"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Creează un nou profil independent și un lansator"
 
-#~ msgid "Download Manager"
-#~ msgstr "Manager de descărcări"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "_Aplicație nouă"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Paginile externe se vor deschide în:"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Creează o nouă aplicație pentru un anume site"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Alegeți unde să se deschidă paginile externe"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Eroare la lansare"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Acceptă cookie-uri"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Creea_ză lansator"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Tipuri de cookie-uri acceptate"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Gestionar al aplicațiilor web"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Durată maximă pentru cookie-uri"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Gestionați site-urile web instalate ca aplicații"
 
-#~ msgid "Maximum history age"
-#~ msgstr "Număr maxim de zile pentru istoric"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Descărcări"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Reține ultimele fișiere descărcate"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Șterge tot"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Specifică dacă se rețin ultimele fișiere descărcate"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Nu s-a putut deschide descărcarea: %s"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Nu s-a găsit %s"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Deschide _dosarul de destinație"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Salvează destinația linkului"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Copiază _adresa linkului"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "D_escarcă cu managerul descărcărilor"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Fișierul „<b>%s</b>” a fost descărcat."
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Descarcă destinația linkului"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "„<b>%s</b> și %d alte fișiere au fost descărcate."
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Documentul nu poate fi afișat"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Descărcare finalizată"
 
-#~ msgid "General"
-#~ msgstr "Generale"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Unele fișiere sunt în curs de descărcare"
 
-#~ msgid "Appearance"
-#~ msgstr "Aspect"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "În_chidere Midori"
 
-#~ msgid "Font settings"
-#~ msgstr "Preferințe fonturi"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Dacă închideți Midori, se vor pierde descărcările curente."
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Forțează afișarea în 96 DPI"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Gestionar al descărcărilor"
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Forțează la 96 DPI densitatea punctelor ecranului"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Arată fișierele descărcate"
 
-#~ msgid "Interface"
-#~ msgstr "Interfață"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Nu s-a putut actualiza baza de date: %s"
 
-#~ msgid "Navigationbar"
-#~ msgstr "Bară de navigare"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Nu s-a putut selecta din baza de date: %s"
 
-#~ msgid "Applications"
-#~ msgstr "Programe"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Nu s-a putut importa sesiunea învechită: %s"
 
-#~ msgid "External applications"
-#~ msgstr "Programe externe"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Web Cookies"
-#~ msgstr "Cookie-uri web"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Gestionare de taburi și sesiuni."
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Cookie-uri de șters la închiderea Midori:"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Cele mai vechi de o oră"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Această extensie oferă o coadă de sarcini de executat la actualizare ori "
+"pentru alte evenimente recurente."
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Cele mai vechi de o săptămână"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Nu s-a putut adăuga o nouă notă în baza de date: %s\n"
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Cele mai vechi de o lună"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Nu s-a putut șterge nota din baza de date: %s\n"
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Cele mai vechi de un an"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Nu s-a putut redenumi nota: %s\n"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Opțiuni pentru _filtrarea reclamelor…"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Nu s-a putut actualiza nota: %s\n"
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Deschide dosarul țintă pentru elementul selectat"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Notițe"
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Tabul următor (din istoric)"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Notiță nouă"
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Tabul precedent (din istoric)"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Creați o nouă notiță, fără legătură cu paginile deschise"
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Tabul anterior din istoric"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Notiță nouă"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Arată taburile la Ctrl+Tab (listate după istoricul utilizării)"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Nu s-a putut selecta din baza de date a notițelor: %s\n"
 
-#~ msgid "Pageholder"
-#~ msgstr "Loc pentru pagini"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Redenumire notiță"
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Loc pentru pagini"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Copiază notița în clipboard"
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Țineți una sau mai multe pagini deschise în paralel"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Șterge notița"
 
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% încărcat"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Copiază selecția ca notiță"
 
-#~ msgid "_Transferbar"
-#~ msgstr "Bară de _descărcare"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Salvați bucăți de text online ca notițe"
 
-#~ msgid "Show transferbar"
-#~ msgstr "Arată bara descărcărilor"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blocare de reclame"
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Arată progresul în bara de adrese"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blochează reclamele conform unei liste de filtre"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr ""
-#~ "Specifică dacă să fie vizibil progresul încărcării în bara de adrese"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Opțiuni pentru filtrarea reclamelor"
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Cere un dosar de destinație"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "_Blochează imaginea"
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr ""
-#~ "Specifică dacă se va cere precizarea dosarului în care se face descărcarea"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Blochează linkul"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr ""
-#~ "Specifică dacă se afișează o notificare la finalizarea unei descărcări"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Editare regulă"
 
-#~ msgid "Download I_mage"
-#~ msgstr "Descarcă i_maginea"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regulă:"
index fb71f52c46994c61025358c2fb0ac9757f065739..5cad7583211b1a0c962d285bd6186dd96e54dd44 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
 # This file is distributed under the same license as the midori package.
 # Troitskiy Nikita <niktr@mail.ru> 2008
 # Anton Shestakov <engored@ya.ru> 2008-2009
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-28 09:57+0000\n"
-"PO-Revision-Date: 2012-08-27 22:45+1000\n"
-"Last-Translator: Alex 'AdUser' Z <ad_user@lavabit.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-01-13 21:53+0000\n"
+"Last-Translator: Artem Anufrij <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\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-Launchpad-Export-Date: 2015-01-14 05:42+0000\n"
+"X-Generator: Launchpad (build 17298)\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 "Работа в Интернете"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Интернет"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www"
+msgid "Web Browser"
+msgstr "Веб-обозреватель"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:153
-#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:3893
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Веб-браузер Midori"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82-обозÑ\80еваÑ\82елÑ\8c Midori"
+msgid "Browse the Web"
+msgstr "РабоÑ\82а Ð² Ð\98нÑ\82еÑ\80неÑ\82е"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Новое кон_фиденциальное окно"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Новая вкладка"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Новое окно"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82-обозÑ\80еваÑ\82елÑ\8c"
+msgid "New Private Browsing Window"
+msgstr "Ð\9dовое Ð¿Ñ\80иваÑ\82ное Ð¾ÐºÐ½Ð¾"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
-msgstr "Midori (конÑ\84иденÑ\86иалÑ\8cный режим)"
+msgstr "Midori (пÑ\80иваÑ\82ный режим)"
 
-#: ../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:4213
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
-msgstr "Конфиденциальный режим"
+msgstr "Приватный режим"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Открыть новое окно в приватном режиме"
 
-#: ../midori/main.c:63
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Снимок сохранён в: %s\n"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Запустить АДРЕС как веб-приложение"
 
-#: ../midori/main.c:90
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРЕС"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "Использовать файлы параметров из ПАПКИ"
+msgstr "Использовать FOLDER как папку конфигураций"
 
-#: ../midori/main.c:92
+#: ../midori/main.c:81
 msgid "FOLDER"
-msgstr "ПАПКА"
+msgstr "FOLDER"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
-msgstr "Ð\9aонÑ\84иденÑ\86иалÑ\8cный режим, изменения не будут сохранены"
+msgstr "Ð\9fÑ\80иваÑ\82ный режим, изменения не будут сохранены"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "Портативный режим. Все исполняемые файлы хранятся в одном месте"
 
-#: ../midori/main.c:100
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Простое GTK+ окно с WebKit, вроде GtkLauncher"
 
-#: ../midori/main.c:102
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Показать окно действий"
 
-#: ../midori/main.c:104
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
-msgstr "Запустить с помощью gdb и сохранить данные отладки в случае критической ошибки."
+msgstr ""
+"Запустить с помощью gdb и сохранить данные отладки в случае критической "
+"ошибки."
 
-#: ../midori/main.c:106
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Выполнить указанный файл как javascript"
 
-#: ../midori/main.c:108
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Создать снимок указанной страницы"
 
-#: ../midori/main.c:110
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Выполнить указанную команду"
 
-#: ../midori/main.c:112
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Вывести список доступных команд для -e/ --execute"
 
-#: ../midori/main.c:114
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Отобразить версию программы"
 
-#: ../midori/main.c:116
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адреса"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)"
 
-#: ../midori/main.c:118
+#: ../midori/main.c:107
 msgid "PATTERN"
-msgstr "ШАБЛОН"
+msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
-"Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия"
+msgstr "Сбросить состояние Midori через SECONDS сек. бездействия"
 
-#: ../midori/main.c:122
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "СЕКУНД"
 
-#: ../midori/main.c:147
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Ошибка: не удалось найти отладчик gdb\n"
 
-#: ../midori/main.c:173
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:"
+msgstr ""
+"Предложения, комментарии и сообщения об ошибках направляйте по адресу:"
 
-#: ../midori/main.c:175
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Искать обновления на:"
 
-#: ../midori/main.c:369
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Неизвестная ошибка"
 
-#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6115
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Закладки"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Добавить закладку"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
-msgstr "_Ð\94ополнения"
+msgstr "_РаÑ\81Ñ\88иÑ\80ения"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Журнал"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Пользовательские сценарии"
 
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "С_тили пользователя"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Но_вая вкладка"
 
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Передачи"
 
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "_Модули Netscape"
 
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "За_крытые вкладки"
 
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5254
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Новое окно"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Новая папка"
 
-#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410
-#: ../midori/midori-app.c:1413
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адреса]"
 
-#: ../midori/midori-array.c:551
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Файл не найден."
 
-#: ../midori/midori-array.c:576 ../midori/midori-array.c:615
-#: ../midori/midori-array.c:639 ../midori/midori-array.c:649
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Плохо сформированный документ."
 
-#: ../midori/midori-array.c:658
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Неизвестный формат закладок."
 
-#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "На следующую страницу"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5398
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "На следующую подстраницу"
 
-#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5339
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Поиск в сети…"
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Обновить страницу"
 
-#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Прекратить загрузку страницы"
 
-#: ../midori/midori-browser.c:525
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Не удалось обновить заголовок: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602
-#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Значение «%s» недействительно для %s"
 
-#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Неожиданный параметр «%s»"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Неожиданное действие «%s»."
 
-#: ../midori/midori-browser.c:691
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
-msgstr "%s (конфиденциальный режим)"
+msgstr "%s (приватный режим)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Не удалось добавить запись в журнал: %s\n"
 
-#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Выбрать [текст]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../midori/midori-browser.c:897
-msgid "New folder"
-msgstr "Создание Ð¿Ð°Ð¿ÐºÐ¸"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Ð\9dоваÑ\8f Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ../midori/midori-browser.c:897
-msgid "Edit folder"
-msgstr "Ð\98зменить папку"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "РедакÑ\82иÑ\80овать папку"
 
-#: ../midori/midori-browser.c:899
-msgid "New bookmark"
-msgstr "Ð\9dоваÑ\8f Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ°"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Ð\94обавиÑ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÑ\83"
 
-#: ../midori/midori-browser.c:899
-msgid "Edit bookmark"
-msgstr "Ð\98зменение Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "РедакÑ\82иÑ\80оваÑ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÑ\83"
 
-#: ../midori/midori-browser.c:933
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Выберите имя для закладки и место для её хранения."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Введите имя закладки и выберите, куда её сохранить."
 
-#: ../midori/midori-browser.c:989
-msgid "Add to _Speed Dial"
-msgstr "Ð\94обавиÑ\82Ñ\8c Ð² _бÑ\8bÑ\81Ñ\82Ñ\80Ñ\8bй Ð½Ð°Ð±Ð¾Ñ\80"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Ð\92ведиÑ\82е Ð¸Ð¼Ñ\8f Ð´Ð»Ñ\8f Ñ\8dÑ\82ой Ð¿Ð°Ð¿ÐºÐ¸ Ð¸ Ð²Ñ\8bбеÑ\80иÑ\82е, ÐºÑ\83да ÐµÑ\91 Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c."
 
-#: ../midori/midori-browser.c:995
-msgid "Show in the tool_bar"
-msgstr "По_казывать на панели закладок"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Показывать в панели закладок"
 
-#: ../midori/midori-browser.c:1003
-msgid "Run as _web application"
-msgstr "Ð\97апÑ\83Ñ\81каÑ\82Ñ\8c ÐºÐ°Ðº _веб-пÑ\80иложение"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Ð\94обавиÑ\82Ñ\8c Ð² _бÑ\8bÑ\81Ñ\82Ñ\80Ñ\8bй Ð½Ð°Ð±Ð¾Ñ\80"
 
-#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Сохранить файл как"
 
-#: ../midori/midori-browser.c:1129
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Сохранить связаннные ресурсы"
 
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Открыто новое окно"
 
-#: ../midori/midori-browser.c:1362
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Открыта новая вкладка"
 
-#: ../midori/midori-browser.c:1380
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Ошибка при открытии изображения!"
 
-#: ../midori/midori-browser.c:1381
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr ""
 "Выделенное изображение не удалось открыть в программе просмотра по умолчанию."
 
-#: ../midori/midori-browser.c:1387
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Ошибка при загрузке изображения!"
 
-#: ../midori/midori-browser.c:1388
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Не удалось загрузить выделенное изображение."
 
-#: ../midori/midori-browser.c:1447
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Сохранить файл"
 
-#: ../midori/midori-browser.c:2419
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Обновить страницу без кэширования"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: ../midori/midori-browser.c:2547
+#: ../midori/midori-browser.c:2692
 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"
@@ -362,31 +388,24 @@ msgstr ""
 "таком случае, в следующий раз при нажатии на ссылку на ленту, она будет "
 "добавлена автоматически."
 
-#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Новая лента"
 
-#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5414
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Новая закладка"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2634 ../midori/midori-browser.c:5290
-msgid "Share this page"
-msgstr "Не запоминать"
-
-#: ../midori/midori-browser.c:3110 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Очистить"
 
-#: ../midori/midori-browser.c:3492 ../midori/midori-browser.c:3493
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Режим перемещения по странице при помощи текстового курсора"
 
-#: ../midori/midori-browser.c:3495
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -394,112 +413,102 @@ msgstr ""
 "Нажатие F7 переключает перемещение курсором. Если включен, курсор "
 "отображается на всех сайтах."
 
-#: ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "Перемещение к_урсором"
 
-#: ../midori/midori-browser.c:3914 ../midori/midori-browser.c:5862
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Не удалось добавить запись в журнал: %s\n"
-
-#: ../midori/midori-browser.c:4229 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:793
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Открыть всё в отдельных _вкладках"
 
-#: ../midori/midori-browser.c:4236 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513
-msgid "Open in New _Tab"
-msgstr "Открыть в новой _вкладке"
-
-#: ../midori/midori-browser.c:4239 ../midori/midori-view.c:2800
-#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Открыть в новом _окне"
 
-#: ../midori/midori-browser.c:4328
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4329
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4331
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4332
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4334
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4352
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Импорт закладок…"
 
-#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Импортировать закладки"
 
-#: ../midori/midori-browser.c:4366
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Приложение:"
 
-#: ../midori/midori-browser.c:4431
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Импортировать из файла XBEL или HTML"
 
-#: ../midori/midori-browser.c:4459
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Импортировать из файла"
 
-#: ../midori/midori-browser.c:4471
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Не удалось импортировать закладки"
 
-#: ../midori/midori-browser.c:4502
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Закладки XBEL"
 
-#: ../midori/midori-browser.c:4507
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Закладки Netscape"
 
-#: ../midori/midori-browser.c:4521
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape "
 "(*.html)"
 
-#: ../midori/midori-browser.c:4536
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Не удалось экспортировать закладки"
 
-#: ../midori/midori-browser.c:4752
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Легковесный Интернет-обозреватель."
 
-#: ../midori/midori-browser.c:4753
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr ""
 "Посетите страницу about:version для получения информации о текущей версии."
 
-#: ../midori/midori-browser.c:4755
+#: ../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 "
@@ -511,400 +520,444 @@ msgstr ""
 "Public License опубликованной Free Software Foundation; либо версии 2.1 "
 "лицензии, либо (на ваше усмотрение) любой более поздней версии."
 
-#: ../midori/midori-browser.c:4790
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Команда переводчиков Xfce\n"
-"<http://translations.xfce.org/languages/l/ru/>"
+"<http://translations.xfce.org/languages/l/ru/>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  0crash0 https://launchpad.net/~0crash0\n"
+"  13i https://launchpad.net/~merkvlad\n"
+"  Alex 'AdUser' Z https://launchpad.net/~ad-user\n"
+"  Alexandr Shpak https://launchpad.net/~shpaker\n"
+"  Alexi Crazybass https://launchpad.net/~alex-crazybassist\n"
+"  Andrew \"dr. Equivalent\" Scherbackoff https://launchpad.net/~dr-"
+"equivalent\n"
+"  Andrey Viktorov https://launchpad.net/~akaluth\n"
+"  Anton Shestakov https://launchpad.net/~engored\n"
+"  Artem Anufrij https://launchpad.net/~artem-anufrij\n"
+"  Binali Rustamov https://launchpad.net/~binali-rustamov\n"
+"  Dmitry Visocky https://launchpad.net/~dim3-vs\n"
+"  Evgeniy kjen93 https://launchpad.net/~kjen93\n"
+"  Igor Mamzov https://launchpad.net/~igor-mamzov\n"
+"  Ivan https://launchpad.net/~vanek-2\n"
+"  Ivan Golubev https://launchpad.net/~ivan-golubev\n"
+"  Ivan Infro https://launchpad.net/~ivan-infro\n"
+"  Kirill Ivaha https://launchpad.net/~kirill-ivaha\n"
+"  Ksenia Dylova https://launchpad.net/~ksjenka\n"
+"  KursoRUS https://launchpad.net/~kursornn\n"
+"  Kyrill Detinov https://launchpad.net/~lazy-kent\n"
+"  Lexapi https://launchpad.net/~lexapi\n"
+"  Max Jekov https://launchpad.net/~maks70\n"
+"  Mukusev Vladimir https://launchpad.net/~damon95\n"
+"  Oleg https://launchpad.net/~oopseekoleg\n"
+"  Pargev https://launchpad.net/~pargev1993\n"
+"  Pasha. P. Komar https://launchpad.net/~cellachain\n"
+"  Pustovalov Maxim https://launchpad.net/~skrill-dmc\n"
+"  Sergey \"Shnatsel\" Davidoff https://launchpad.net/~shnatsel\n"
+"  Victor Makarov https://launchpad.net/~viktis\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Yanbaeva https://launchpad.net/~yanbaevas\n"
+"  daggert https://launchpad.net/~daggert\n"
+"  moonk https://launchpad.net/~wrex-tp\n"
+"  nevel https://launchpad.net/~imstiem\n"
+"  zepect https://launchpad.net/~zepect-deactivatedaccount\n"
+"  Александр https://launchpad.net/~qp1997\n"
+"  Глория Хрусталёва https://launchpad.net/~gloriya\n"
+"  Дмитрий https://launchpad.net/~myprodreams"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Сделать копию текущей вкладки"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Файл"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
-msgstr "Ð\9eÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ð² Ð½Ð¾Ð²Ð¾Ð¼ Ð¾ÐºÐ½Ðµ"
+msgstr "Ð\9eÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ð½Ð¾Ð²Ð¾Ðµ Ð¾ÐºÐ½Ð¾"
 
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Открыть в новой вкладке"
 
-#: ../midori/midori-browser.c:5260
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
-msgstr "Новое кон_фиденциальное окно"
+msgstr "Новое _приватное окно"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Открыть файл"
 
-#: ../midori/midori-browser.c:5266
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Сохранить страницу _как…"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Сохранить в файл"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Добавить в _быстрый набор"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5273
-msgid "Create _Launcher"
-msgstr "Создать кнопку _запуска"
-
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Подписаться на _ленту новостей"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Закрыть вкладку"
 
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Закрыть данную вкладку"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
-msgstr "З_акрыть окно"
-
-#: ../midori/midori-browser.c:5289
-msgid "_Share"
-msgstr "_Поделиться"
+msgstr "_Закрыть окно"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Распечатать страницу"
 
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "З_акрыть все окна"
 
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Найти…"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Поиск слова или фразы на странице"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Найти _следующее"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Найти _предыдущее"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Настройка приложения"
 
-#: ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Вид"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Панели инструментов"
 
-#: ../midori/midori-browser.c:5341
-msgid "Reload page without caching"
-msgstr "Обновить страницу без кэширования"
-
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Увеличить масштаб"
 
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Уменьшить масштаб"
 
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Кодировка"
 
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Ис_ходный код страницы"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Отобразить _DOM содержимое"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Перемещение к_урсором"
 
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Переключить полноэкранный режим"
 
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Смещение _влево"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Смещение _вниз"
 
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Смещение _вверх"
 
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Смещение _вправо"
 
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Читаемый"
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "П_ереход"
 
-#: ../midori/midori-browser.c:5387
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "На предыдущую страницу"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "На предыдущую подстраницу"
 
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Далее или Вперед"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Перейти к следующей под-странице или странице в истории"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "_Домашняя страница"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "На домашнюю страницу"
 
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Очистить"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "О_тменить закрытие вкладки"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "_Создать папку"
 
-#: ../midori/midori-browser.c:5422
-msgid "_Export bookmarks"
-msgstr "_ЭкÑ\81поÑ\80Ñ\82иÑ\80оваÑ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Ð\98мпоÑ\80Ñ\82 Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº..."
 
-#: ../midori/midori-browser.c:5425 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Управление средствами поиска"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Экспорт закладок..."
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Управление поисковыми системами ..."
 
-#: ../midori/midori-browser.c:5428
-msgid "_Clear Private Data"
-msgstr "Уда_лить личные данные"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Удалить личные данные..."
 
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Информация о странице"
 
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Предыдущая вкладка"
 
-#: ../midori/midori-browser.c:5438
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Следующая вкладка"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Переместить вкладку на _первую позицию"
 
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Переместить вкладку _назад"
 
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Переместить вкладку _вперёд"
 
-#: ../midori/midori-browser.c:5446
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Переместить вкладку на _последнюю позицию"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "_Фокус на текущую вкладку"
 
-#: ../midori/midori-browser.c:5452
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "_Фокус на следующую вкладку"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Показывать иконку только текущей вкладки"
 
-#: ../midori/midori-browser.c:5458
-msgid "_Duplicate Current Tab"
-msgstr "_Сделать копию текущей вкладки"
-
-#: ../midori/midori-browser.c:5461
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "З_акрыть остальные"
 
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Открыть предыдущий _сеанс"
 
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Часто задаваемые вопросы"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Сообщить об ошибке…"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-browser.c:6134
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Инструменты"
 
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Панель _меню"
 
-#: ../midori/midori-browser.c:5488
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Панель _навигации"
 
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Боковая панель"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Боковая панель"
 
-#: ../midori/midori-browser.c:5496
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Панель _закладок"
 
-#: ../midori/midori-browser.c:5500
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Строка состояния"
 
-#: ../midori/midori-browser.c:5509 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: ../midori/midori-browser.c:5512 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Китайская традиционная (Big5)"
 
-#: ../midori/midori-browser.c:5515 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Китайская упрощённая (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Японская (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5522 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: ../midori/midori-browser.c:5525 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Кириллица (KOI8-R)"
 
-#: ../midori/midori-browser.c:5528 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Юникод (UTF-8)"
 
-#: ../midori/midori-browser.c:5531 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Западно-европейская (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5534 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Выбрать…"
 
-#: ../midori/midori-browser.c:6040
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Не удалось инициализировать историю: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Разделитель"
 
-#: ../midori/midori-browser.c:6047
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Адрес…"
 
-#: ../midori/midori-browser.c:6049
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Открыть определённый адрес"
 
-#: ../midori/midori-browser.c:6071
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Поиск в сети…"
 
-#: ../midori/midori-browser.c:6073
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Запустить поиск в сети"
 
-#: ../midori/midori-browser.c:6100
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Открыть ранее закрытые вкладки или окна"
 
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Показать все сохранённые закладки"
 
-#: ../midori/midori-browser.c:6150
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Вкладки"
 
-#: ../midori/midori-browser.c:6152
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Показать список всех открытых вкладок"
 
-#: ../midori/midori-browser.c:6166
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Меню"
 
-#: ../midori/midori-browser.c:6168
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Меню"
 
-#: ../midori/midori-browser.c:6933
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Неожиданный параметр «%s»"
-
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Не удалось загрузить настройки дополнения «%s»: %s\n"
 
-#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Не удалось сохранить настройки дополнения «%s»: %s\n"
 
-#: ../midori/midori-locationaction.c:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Экспорт сертификата"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Центр сертификации неизвестен."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
@@ -912,15 +965,15 @@ msgstr ""
 "Имя, указанное в сертификате, не соответствует имени сайта, с которого он "
 "был получен."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Срок действия сертификата ещё не наступил."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Истёк срок действия сертификата"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -928,40 +981,40 @@ msgstr ""
 "Согласно списку отзыва сертификатов, этот сертификат объявлен "
 "недействительным."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгоритм, используемый сертификатом, считается небезопасным."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Произошли другие ошибки при проверке сертификата."
 
-#: ../midori/midori-locationaction.c:1420
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "Э_кспорт сертификата"
 
-#: ../midori/midori-locationaction.c:1435
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Самоподписный"
 
-#: ../midori/midori-locationaction.c:1459
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Сведения о безопасности"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1542
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
-msgstr "Вс&тавить и перейти"
+msgstr "Вс_тавить и перейти"
 
-#: ../midori/midori-locationaction.c:1774
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Непроверенное соединение"
 
-#: ../midori/midori-locationaction.c:1782
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Проверенное защищённое соединение"
 
-#: ../midori/midori-locationaction.c:1789
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Открытое, незашифрованное соединение"
 
@@ -978,419 +1031,434 @@ msgstr "Закрыть панель"
 msgid "Align sidepanel to the left"
 msgstr "Расположить панель слева"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Показать быстрый набор"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Открыть домашнюю страницу"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Открыть последние открытые страницы"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Открыть последние страницы без загрузки"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Открыть пустую страницу"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Показать поисковый движок по умолчанию"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Показать определённую страницу"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Японская (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Новая вкладка"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Новое окно"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Текущая вкладка"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Только значки"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Маленькие значки"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Только текст"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Текст под значками"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Текст рядом со значками"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Автоматически (GNOME или переменные окружения)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Прокси-сервер HTTP"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Не использовать прокси"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Стиль панели инструментов"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Всегда использовать"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "Использовать шрифты пользователя вместо предлагаемых сайтом"
 
-#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Не удалось загрузить настройки: %s\n"
 
-#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Недопустимое значение параметра: «%s»"
 
-#: ../midori/midori-tab.vala:121
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Не удалось добавить стиль: %s"
 
-#: ../midori/midori-view.c:769 ../midori/midori-view.c:897
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "_Показать заголовок"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "_Скрыть заголовок"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Закрыть вкладку справа"
+msgstr[1] "Закрыть вкладки справа"
+msgstr[2] "Закрыть вкладки справа"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "З_акрыть остальные"
+msgstr[1] "З_акрыть остальные"
+msgstr[2] "З_акрыть остальные"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Доверять этому сайту"
 
-#: ../midori/midori-view.c:895
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Неизвестный уровень безопасности"
 
-#: ../midori/midori-view.c:1196
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s запрашивает доступ к базе данных HTML5."
 
-#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Запретить"
 
-#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Разрешить"
 
-#: ../midori/midori-view.c:1228
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s хочет знать ваше местоположение."
 
-#: ../midori/midori-view.c:1362
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Ð\9eÑ\88ибка â\80\94 %s"
+msgid "'%s' can't be found"
+msgstr "Ð\9dевозможно Ð½Ð°Ð¹Ñ\82и '%s'"
 
-#: ../midori/midori-view.c:1363
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Не удалось открыть страницу «%s»."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Невозможно загрузить страницу '%s':"
 
-#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508
-msgid "Try again"
-msgstr "Попытаться снова"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Проверьте адрес на ошибки"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Убедитесь, что Ethernet кабель подключен или адаптер беспроводной сети "
+"активирован"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Убедитесь, что ваши сетевые настройки верны"
 
-#: ../midori/midori-view.c:1505
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Повторить"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Oops — %s"
 
-#: ../midori/midori-view.c:1506
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Что-то пошло не так с \"%s\"."
 
-#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Попытаться снова"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Отправить сообщение %s"
 
-#: ../midori/midori-view.c:2526
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Добавить поисковую систему..."
 
-#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876
-msgid "Inspect _Element"
-msgstr "Ð\98Ñ\81Ñ\81ледоваÑ\82Ñ\8c _Ñ\8dлеменÑ\82"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ð\9eÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c _Ñ\81Ñ\81Ñ\8bлкÑ\83"
 
-#: ../midori/midori-view.c:2621
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Открыть ссылку в новой _вкладке"
 
-#: ../midori/midori-view.c:2625
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Открыть ссылку в новой _активной вкладке"
 
-#: ../midori/midori-view.c:2626
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Открыть ссылку в _фоновой вкладке"
 
-#: ../midori/midori-view.c:2629
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Открыть ссылку в _новом окне"
 
-#: ../midori/midori-view.c:2632
-msgid "Open Link as Web A_pplication"
-msgstr "Открыть ссылку как веб-_приложение"
-
-#: ../midori/midori-view.c:2637
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "_Копировать адрес ссылки"
 
-#: ../midori/midori-view.c:2643
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Сохранить страницу _как…"
 
-#: ../midori/midori-view.c:2653
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Открыть изображение в новом _окне"
 
-#: ../midori/midori-view.c:2654
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Открыть изображение в новой _вкладке"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Копировать _изображение"
 
-#: ../midori/midori-view.c:2661
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Сохранить _изображение"
 
-#: ../midori/midori-view.c:2664
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Открыть изображение в программе прос_мотра"
 
-#: ../midori/midori-view.c:2671
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Копировать _адрес видео"
 
-#: ../midori/midori-view.c:2674
-msgid "Save _Video"
-msgstr "Сохранить _видео"
-
-#: ../midori/midori-view.c:2674
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Загрузить _видео"
 
-#: ../midori/midori-view.c:2700
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Открыть ссылку в новой _вкладке"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Найти _с помощью"
 
-#: ../midori/midori-view.c:2729
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Найти в сети"
 
-#: ../midori/midori-view.c:2749
-msgid "Open Address in New _Tab"
-msgstr "Открыть ссылку в новой _вкладке"
-
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Открыть _фрейм в новой вкладке"
 
-#: ../midori/midori-view.c:3013
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Исследовать _элемент"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Открыть или загрузить файл с %s"
 
-#: ../midori/midori-view.c:3026
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Имя файла: «%s»"
 
-#: ../midori/midori-view.c:3031
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Тип файла: «%s»"
 
-#: ../midori/midori-view.c:3033
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Тип файла: %s («%s»)"
 
-#: ../midori/midori-view.c:3070
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3081
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Файл %s"
 
-#: ../midori/midori-view.c:3610
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Информация о странице — %s"
 
-#: ../midori/midori-view.c:4138
-#, c-format
-msgid "No documentation installed"
-msgstr "Документация не установлена"
-
-#: ../midori/midori-view.c:4214
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori не сохраняет личные данные:"
 
-#: ../midori/midori-view.c:4215
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Не было сохранено ни истории, ни cookies."
 
-#: ../midori/midori-view.c:4216
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
-msgstr "Ð\94ополнения отключены."
+msgstr "РаÑ\81Ñ\88иÑ\80ения отключены."
 
-#: ../midori/midori-view.c:4217
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "Хранилище HTML5, локальная база данных и кэши приложений отключены."
 
-#: ../midori/midori-view.c:4218
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori затрудняет отслеживание сайтами пользователя:"
 
-#: ../midori/midori-view.c:4219
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Исходные адреса усекаются до имени узла."
 
-#: ../midori/midori-view.c:4220
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Упреждающие запросы DNS отключены."
 
-#: ../midori/midori-view.c:4221
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Сайтам не передается язык и часовой пояс."
 
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Сайтам не сообщается о наличии Flash и прочих модулей Netscape."
 
-#: ../midori/midori-view.c:4262
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "Числа в скобках обозначают используемые в данный момент версии."
 
-#: ../midori/midori-view.c:4312
-msgid "Page loading delayed"
-msgstr "Загрузка страницы отложена"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Загрузка страницы отложена:"
 
-#: ../midori/midori-view.c:4313
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей "
 "настройки."
 
-#: ../midori/midori-view.c:4314
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Загрузить страницу"
 
-#: ../midori/midori-view.c:4481
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Пустая страница"
 
-#: ../midori/midori-view.c:4695
-msgid "_Duplicate Tab"
-msgstr "Сделать _копию"
-
-#: ../midori/midori-view.c:4700
-msgid "Show Tab _Label"
-msgstr "_Показать заголовок"
-
-#: ../midori/midori-view.c:4700
-msgid "Show Tab _Icon Only"
-msgstr "_Скрыть заголовок"
-
-#: ../midori/midori-view.c:4707
-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:5396
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "назад"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5415
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "далее"
 
-#: ../midori/midori-view.c:5428
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Печатать фоновые изображения"
 
-#: ../midori/midori-view.c:5429
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Должны ли быть выведены на печать фоновые изображения"
 
-#: ../midori/midori-view.c:5454
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Возможности"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s из %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1398,7 +1466,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1406,7 +1474,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1415,27 +1483,27 @@ msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - осталось %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?Б"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Загруженный файл повреждён."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1443,131 +1511,127 @@ msgstr ""
 "Контрольная сумма, указанная в ссылке, не совпадает. Возможно, файл был "
 "изменён или загружен не до конца."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Файл «%s» не может быть сохранён в данную папку."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "У вас недостаточно прав для записи указанного файла."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Не хватает свободного места для загрузки \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Файл требует %s а %s доступно"
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Быстрый набор"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Нажмите, чтобы добавить закладку"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Введите адрес страницы"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Введите название закладки"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Удалить визуальную закладку?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Запуск"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "При запуске:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Домашняя страница:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Т_екущая страница"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Установить текущую страницу в качестве домашней"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Семейство пропорционального шрифта"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Семейство шрифта для отображения текста по умолчанию"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Размер шрифта для отображения текста по умолчанию"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Семейство моноширинного шрифта"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Семейство моноширинного шрифта для отображения текста"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Размер моноширинного шрифта для отображения текста"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Минимальный размер шрифта"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Наименьший размер шрифта для отображения текста"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Предпочтительная кодировка"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Поведение"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Загружать изображения автоматически"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Проверять орфографию"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Выполнять сценарии"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Включить поддержку WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Использовать модули Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Масштабировать изображения"
@@ -1582,23 +1646,19 @@ msgstr ""
 "Разрешено ли сценариям открывать всплывающие окна без вмешательства "
 "пользователя"
 
-#: ../midori/midori-preferences.c:415
-msgid "Middle click opens Selection"
-msgstr "Переходить на выделенный адрес по средней кнопке"
-
-#: ../midori/midori-preferences.c:416
-msgid "Load an address from the selection via middle click"
-msgstr "Загружать выделенный адрес средней кнопкой мыши"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Масштаб по умолчанию"
 
-#: ../midori/midori-preferences.c:420
-msgid "Flash window on background tabs"
-msgstr "Ð\9cигаÑ\82Ñ\8c Ð¾ÐºÐ½Ð¾Ð¼ Ð¿Ñ\80и Ð¾Ñ\82кÑ\80Ñ\8bÑ\82ии Ñ\84оновой Ð²ÐºÐ»Ð°Ð´ÐºÐ¸"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Ð\9eÑ\81новной Ñ\84акÑ\82оÑ\80 Ñ\83велиÑ\87ениÑ\8f Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ\82кÑ\80Ñ\8bÑ\82Ñ\8bÑ\85 Ð²ÐºÐ»Ð°Ð´Ð¾Ðº"
 
-#: ../midori/midori-preferences.c:425
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Предпочитаемые языки"
 
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1606,116 +1666,116 @@ msgstr ""
 "Список предпочитаемых языков для отображения многоязычных страниц, например, "
 "«de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Сохранять загружаемые файлы в:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:438
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Навигация"
 
-#: ../midori/midori-preferences.c:442
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Тема оформления:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Стиль панели инструментов:"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Открывать новые страницы в:"
 
-#: ../midori/midori-preferences.c:451
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
-msgstr ""
+msgstr "При открытии новой вкладки:"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Кнопки закрытия на вкладках"
 
-#: ../midori/midori-preferences.c:460
-msgid "Always Show Tabbar"
-msgstr "Всегда показывать строку вкладок"
-
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Открывать новые вкладки рядом с текущей"
 
-#: ../midori/midori-preferences.c:465
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "Открывать новую вкладку в следующей за данной или за последней"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Открывать вкладки в фоне"
 
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Текстовый редактор"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Программа чтения лент новостей"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:484
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Сеть"
 
-#: ../midori/midori-preferences.c:486
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Прокси-сервер"
 
-#: ../midori/midori-preferences.c:491
-msgid "Hostname"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
 msgstr "Адрес"
 
-#: ../midori/midori-preferences.c:499
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Порт"
 
-#: ../midori/midori-preferences.c:512
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Поддерживаемые типы proxy:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Сетевой кэш"
 
-#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Максимальный размер кэша страниц на диске"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "МБ"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:545
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Представляться как"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
-msgstr "Ð\9aонÑ\84иденÑ\86иалÑ\8cноÑ\81Ñ\82Ñ\8c"
+msgstr "Ð\9bиÑ\87нÑ\8bе Ð´Ð°Ð½Ð½Ñ\8bе"
 
-#: ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Удалять старые фрагменты данных через:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Срок хранения фрагментов данных"
 
-#: ../midori/midori-preferences.c:571
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Принимать фрагменты данных только с посещаемых сайтов"
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Блокировать фрагменты данных от посторонних сайтов"
 
-#: ../midori/midori-preferences.c:577
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1723,127 +1783,126 @@ msgstr ""
 "Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также "
 "могут хранить информацию о пользователе в рекламных целях."
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Включить кэш веб-приложений"
 
-#: ../midori/midori-preferences.c:587
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Включить поддержку локального хранилища HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:591
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Передавать в «referer» только название сайта"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:593
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
 "Заголовок «Referer» будет содержать только домен, а не адрес конкретной "
 "страницы"
 
-#: ../midori/midori-preferences.c:596
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Хранить историю посещений:"
 
-#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Срок хранения записей в журнале"
 
-#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
-msgstr "Дополнения"
+msgstr "Расширения"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Управление средствами поиска"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Добавление средства поиска"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Правка средства поиска"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Описание:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Признак:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Управление средствами поиска"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Использовать _по умолчанию"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Не удалось загрузить средства поиска. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Не удалось сохранить средства поиска. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Ð\96Ñ\83Ñ\80нал"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Ð\97акладки Ð¸ Ð¸Ñ\81Ñ\82оÑ\80иÑ\8f"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ð¸Ð½Ð¸Ñ\86иализиÑ\80оваÑ\82Ñ\8c Ð¸Ñ\81Ñ\82оÑ\80иÑ\8e: %s"
+msgid "Search for %s"
+msgstr "Ð\9fоиÑ\81к %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Не удалось найти в истории: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Поиск %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Найти с помощью…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Найти с помощью %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Выберите приложение или команду для «%s»:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:309
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Не удалось выполнить внешнюю программу."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
-msgstr "Неправильный URI"
+msgstr "Неправильный адрес"
 
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
@@ -1866,71 +1925,105 @@ msgstr "Учитывать регистр"
 msgid "Close Findbar"
 msgstr "Закрыть вкладку поиска"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Файл «<b>%s</b>» загружен."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d закладка"
+msgstr[1] "%d закладки"
+msgstr[2] "%d закладок"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Загрузка завершена"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d подпапка"
+msgstr[1] "%d подпапок"
+msgstr[2] "%d подпапки"
 
-#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Убрать завершённые"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Пустая папка"
 
-#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Некоторые файлы загружаются"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Папка содержит %s и не содержит закладок"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "В_ыйти из Midori"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Папка содержит %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Загрузки будут отменены при закрытии Midori."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Папка содержит %s и %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÑ\83: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr "Ð\97акладка Ð²ÐµÐ´ÐµÑ\82 Ðº: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Не удалось обновить закладку: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s и ни одной закладки"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s и %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Редактировать закладку"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Удалить закладку"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Создать папку"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Разделитель</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Открыть в новой _вкладке"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Поиск в закладках"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Журнал"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1938,48 +2031,36 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дня назад"
 msgstr[2] "%d дней назад"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Неделю назад"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Не удалось удалить запись из журнала: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Удалить все записи в журнале?"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Добавить выделенную запись в закладки"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Удалить запись из журнала"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Очистить весь журнал"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:981
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Поиск в истории"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Загрузки"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Открыть _папку загрузок"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Копировать _адрес ссылки"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Требуется авторизация"
@@ -2004,113 +2085,63 @@ msgstr "Пароль"
 msgid "_Remember password"
 msgstr "_Запомнить пароль"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Не удалось загрузить именованный значок «%s»"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Не удалось загрузить системный значок «%s»"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Кадры анимации повреждены"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Нет"
 
-#: ../katze/katze-utils.c:442
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Свойство «%s» недействительно для %s"
 
-#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Выберите файл"
 
-#: ../katze/katze-utils.c:494
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Выберите папку"
 
-#: ../katze/katze-utils.c:603
-msgid "None"
-msgstr "Нет"
-
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 час"
 
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 день"
 
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 неделю"
 
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 месяц"
 
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 год"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Параметры %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Контрольная сумма MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Контрольная сумма SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Настройка рекламных фильтров"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Редактирование правила"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Правило:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Бл_окировать изображение"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Бл_окировать ссылку"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Блокировка рекламы"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "Эта страница содержит пользовательский сценарий. Установить?"
 
 #: ../extensions/addons.c:223
@@ -2130,71 +2161,71 @@ msgstr "_Установить пользовательский стиль"
 msgid "Don't install"
 msgstr "Не устанавливать"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Пользовательские сценарии"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Пользовательские стили"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Удалить «%s»?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Удаление сценария"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Удаление стиля"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Файл «<b>%s</b>» будет удалён безвозвратно."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Открыть в текстовом редакторе"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Открыть папку с файлом"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Добавить дополнение"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Удалить выбранное дополнение"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Пользовательские дополнения"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Отслеживание изменений в «%s» отключено: %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Поддержка пользовательских сценариев и стилей"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Цветные вкладки"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Каждая вкладка имеет свой цвет"
 
@@ -2203,11 +2234,11 @@ msgstr "Каждая вкладка имеет свой цвет"
 msgid "Cookie Manager"
 msgstr "Менеджер фрагментов данных"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Удалить всё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2215,31 +2246,31 @@ msgstr ""
 "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены "
 "только те фрагменты, которые удовлетворяют его условиям."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Развернуть всё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Свернуть всё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Удалить все сохранённые фрагменты данных?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Вопрос"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "В конце сеанса"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2257,15 +2288,15 @@ msgstr ""
 "<b>Срок истекает</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Да"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Нет"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2274,20 +2305,20 @@ msgstr ""
 "<b>Домен</b>: %s\n"
 "<b>Фрагментов данных</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Имя"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Развернуть всё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Свернуть всё"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Искать фрагменты данных по имени или домену"
 
@@ -2307,24 +2338,46 @@ msgstr "Скопировать адреса вкладок"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Копирует адреса всех вкладок в буфер обмена"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Задержка загрузки"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Задержка (в секундах) загруки страницы:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Задержка загрузки страницы, пока вы используете вкладку."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Кликните дважды для подробной информации"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+"Это расширение показывает GLIB сообщения об ошибках в области уведомления."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "Во время загрузки файла плагина произошла ошибка:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Произошла ошибка при попытке загрузить файл со следующим расширением:\n"
+"%s\n"
+"\n"
+"Ошибка:\n"
+"%s\n"
+"\n"
+"Попробуйте без этого расширения."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2355,34 +2408,34 @@ msgstr "Загружать файлы с помощью \"%s\" или указа
 msgid "External Download Manager - CommandLine"
 msgstr "Внешний менеджер загрузок - CommandLine"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Последнее обновление: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Ленты"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Добавить ленту"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Удалить ленту"
 
-#: ../extensions/feed-panel/feed-panel.c:769
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "Л_енты"
 
@@ -2391,47 +2444,47 @@ msgstr "Л_енты"
 msgid "Failed to find root element in feed XML data."
 msgstr "Не удалось найти корневой элемент в данных XML."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Формат ленты не поддерживается."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Не удалось обработать XML-ленту: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Не удалось найти элемент «channel» в данных RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Обнаруженная версия RSS не поддерживается."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Не удалось найти обязательные элементы RSS «item» в данных XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Лента «%s» уже была добавлена"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Не удалось загрузить ленту «%s»"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Панель лент новостей"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Чтение лент RSS/Atom"
 
@@ -2452,118 +2505,407 @@ msgstr ""
 "Для просмотра этой страницы требуются\n"
 "имя пользователя и пароль:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Запомнить пароль для данной страницы?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Не сейчас"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Не запоминать"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Хранить данные форм"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Включение хранения данных форм для текущей вкладки."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Не удалось открыть базу данных: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Не удалось выполнить запрос к базе данных: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "Включать заполнение форм вручную для каждой вкладки (Ctrl+Shift+F)"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "История форм ввода"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Хранит данные, введённые ранее в формы ввода"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Не удалось выбрать предложения\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Нет непосещенных вкладок"
 
 # Используется как заголовок окна настроек дополнения: «Параметры <this>»
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "истории вкладок"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "При закрытии вкладки:"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Переключиться на последнюю активную вкладку"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Переключиться на последнюю открытую вкладку"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Мигать окном при открытии фоновой вкладки"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Следующая вкладка (из истории вкладок)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Следующая новая вкладка из истории"
 
-#: ../extensions/history-list.vala:453
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Предыдущая новая вкладка (из истории вкладок)"
 
-#: ../extensions/history-list.vala:454
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Предыдущая новая вкладка из истории"
 
-#: ../extensions/history-list.vala:463
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Открыть вкладку на заднем плане"
 
-#: ../extensions/history-list.vala:464
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Открывает выделенную вкладку на заднем плане"
 
-#: ../extensions/history-list.vala:591
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "История вкладок"
 
-#: ../extensions/history-list.vala:592
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Переход к последней использовавшейся вкладке"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "Ошибка SQL: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Принимать"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Принять на время сесии"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Заблокировать"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Не удалось открыть базу данных расширения: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Не удалось выполнить запрос к базе данных: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Вы действительно хотите удалить все разрешения для JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Удалить все разрешения для JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Это действие удалит все разрешения JavaScript. Разрешения будут запрошены "
+"снова при заходе на каждый сайт."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Настройка NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Ниже находится список сайтов и политики для них. Вы можете удалить политику, "
+"выбрав её и нажав  на <i>Удалить</i>"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Домен"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Политика"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "У_далить всё"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "Р_азрешить скрипты на всех сайтах"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Б_локировать скрипты на неизвестных доменах"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "У_становить разрешения для доменов второго уровня"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Запретить %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Разрешить %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Разрешить %s в этой сесии"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Окно браузера"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Эта копия браузера Midori принадлежит"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Вид"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Эта копия браузера Midori принадлежит"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Состояние значка меню"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Неопределен"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Разрешено"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Отказано"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Обнаружена серьезная ошибка, препятствующая работе расширения NoJS. Вы "
+"должны отключить его."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Ошибка в  расширении NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Причина"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Не удалось создать папку с настройками для расширения: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Не удалось создать папку с настройками для расширения."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Не удалось открыть базу данных расширения."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Не удалось создать структуру базы данных расширения."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Экземпляр расширения"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Экземпляр расширения Midori для этого расширения"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Экземпляр приложения"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Экземпляр этого расширения Midori принадлежит"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Экземпляр базы данных"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Указатель на экземпляр базы данных SQLite, используемый этим расширением"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Путь к базе данных"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Путь к базе данных sqlite, используемый этим расширением"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Разрешить всем сайтам"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Если включено, это расширение не будет проверять политику для каждого сайта, "
+"а разрешит все."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Только второй уровень"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Если включено, это расширение сокращает каждый домен до домена второго "
+"уровня (www.example.org будет example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Неизвестная политика домена"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Политика для неизвесных доменов."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Разрешить временно"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Жесты мышью"
@@ -2592,11 +2934,11 @@ msgstr "Комбинации клавиш"
 msgid "View and edit keyboard shortcuts"
 msgstr "Просмотр и изменение «горячих клавиш»"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Часы в строке состояния"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Показывать дату и время в строке состояния"
 
@@ -2612,6 +2954,10 @@ msgstr "Сценарии"
 msgid "Netscape plugins"
 msgstr "Модули Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Использовать модули Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Настройка возможностей"
@@ -2620,15 +2966,15 @@ msgstr "Настройка возможностей"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Быстрая настройка режимов отображения страниц"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Панель вкладок"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "П_анель вкладок"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Показ вкладок в боковой панели"
 
@@ -2640,77 +2986,68 @@ msgstr "Только значок на новых вкладках"
 msgid "New tabs have no label by default"
 msgstr "У новых вкладок скрыт заголовок и виден только значок"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Настройка панели инструментов"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr "Выбрать и изменить порядок элементов можно с помощью мыши."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Доступные элементы"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Отображаемые элементы"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Настроить _панель инструментов…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Редактор панели инструментов"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Простой редактор панели инструментов"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Кэширует принятые данные (HTTP) на диске"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Не удалось загрузить cookies\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
-msgstr "Удаление Ð»Ð¸Ñ\87нÑ\8bÑ\85 Ð´Ð°Ð½Ð½Ñ\8bÑ\85"
+msgstr "УдалиÑ\82Ñ\8c Ð»Ð¸Ñ\87нÑ\8bе Ð´Ð°Ð½Ð½Ñ\8bе"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Удалить личные данные"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Удалить следующие данные:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Открытые _вкладки"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Удалять личные данные _при закрытии Midori"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:322
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Сохранённые логины и _пароли"
 
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies и данные веб-сайта"
 
-#: ../midori/midori-privatedata.c:331
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Значки веб-сайтов"
 
@@ -2718,208 +3055,149 @@ msgstr "Значки веб-сайтов"
 msgid "Open tabs"
 msgstr "Открытые вкладки"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Больше открытых владок..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Не удалось очистить журнал: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Не удалось удалить устаревшие записи из журнала: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "не удалось подключить старую базу данных"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "Не удалось импортировать закладки"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "не удалось отменить транзанкцию"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Не удалось создать таблицу закладок: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Не удалось добавить закладку: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Не удалось открыть базу данных: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Не удалось обновить закладку: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c Ð·Ð°ÐºÐ»Ð°Ð´ÐºÑ\83: %s\n"
 
-#: ../midori/midori-session.c:192
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен."
+msgstr ""
+"Недоступен корневой сертификат. SSL сертификат не может быть проверен."
 
-#: ../midori/midori-session.c:361
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Не удалось сохранить настройки. %s"
 
-#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Не удалось загрузить сеанс: %s\n"
-
-#: ../midori/midori-session.c:412
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Не удалось сохранить сеанс. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:129
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Не удалось сохранить содержимое корзины. %s"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Возможно, работа Midori была аварийно прекращена. Если это часто "
-"повторяется, можно выбрать действие для решения проблемы ниже."
 
-#: ../midori/midori-frontend.c:347
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Изменить _параметры"
 
-#: ../midori/midori-frontend.c:351
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Отключить _все дополнения"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Показывать окно действий после аварийного завершения работы"
 
-#: ../midori/midori-frontend.c:365
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Закрыть все вкладки"
 
-#: ../midori/midori-frontend.c:373
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Показывать последний _лог ошибок"
 
-#: ../midori/midori-frontend.c:386
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Запустить с помощью _отладчика"
 
-#: ../midori/midori-frontend.c:457
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori уже запущена, но не отвечает.\n"
 
-#: ../midori/midori-frontend.c:490
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Не удалось загрузить закладки: %s\n"
 
-#: ../midori/midori-frontend.c:521
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Не удалось загрузить сеанс: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Не удалось загрузить содержимое корзины: %s\n"
 
-#: ../midori/midori-frontend.c:529
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Не удалось загрузить журнал: %s\n"
 
-#: ../midori/midori-frontend.c:540
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Обнаружены следующие ошибки:"
 
-#: ../midori/midori-frontend.c:545
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Игнорировать"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:252
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:297
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:667
-#, c-format
-msgid "SQL fails: %s"
-msgstr "Ошибка SQL: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121
-msgid "Accept"
-msgstr "Принимать"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122
-msgid "Accept for session"
-msgstr "Принять на время сесии"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123
-msgid "Block"
-msgstr "Заблокировать"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:156
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Не удалось открыть базу данных: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:201
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Не удалось выполнить запрос к базе данных: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Удалить все сохранённые куки?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr "Удалять старые фрагменты данных через месяц"
+msgstr "Удалить все разрешения на Cookies?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
-msgstr "Этим действием вы удалите все cookie. Вам будет задан вопрос для доступа на каждый посещённый сайт."
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Менеджер доступов cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
-msgstr ""
+msgstr "Экземпляр текущего менеджера cookies"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Настроить доступы cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2928,1185 +3206,345 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:561
-msgid "Domain"
-msgstr "Домен"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Политика"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "У_далить всё"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Политика cookies для доменов вне списка: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Спрашивать о политике безопасности если домен неизвестен"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Спросить для принятия решения"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
-msgstr "С менеджером доступов cookie произошла критическая ошибка. Вы должны отключить его."
+msgstr ""
+"С менеджером доступов cookie произошла критическая ошибка. Вы должны "
+"отключить его."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
 msgstr "Ошибка в модуле доступов cookie"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Причина"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:137
-msgid "Could not get path to configuration of extension: path is NULL"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:139
-msgid "Could not get path to configuration of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:145
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:147
-msgid "Could not create configuration folder for extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:164
-#, fuzzy
-msgid "Could not open database of extension."
-msgstr "Не удалось открыть базу данных: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:197
-msgid "Could not set up database structure of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:318
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
-msgstr ""
+msgstr "Не удалось определить общую политику cookies для домена: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:493
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
-msgstr ""
+msgstr "До конца сеанса"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
-msgstr ""
+msgstr "Веб-сайт %s хочет сохранить %d файлов Cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:519
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
-msgstr ""
+msgstr "Веб-сайт %s хочет сохранить файл Cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:523
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr ""
+msgstr "Несколько веб-сайтов хотят сохранить %d файлов Cookie."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:532
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
-msgstr ""
+msgstr "_Принять"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:533
-#, fuzzy
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
-msgstr "УдалиÑ\82Ñ\8c _даннÑ\8bе Ð¿Ð¾Ñ\81леднего сеанса"
+msgstr "Ð\9fÑ\80инÑ\8fÑ\82Ñ\8c Ð´Ð»Ñ\8f Ñ\82екÑ\83Ñ\89его _сеанса"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:534
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
-msgstr ""
+msgstr "_Отклонить"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:535
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
-msgstr ""
+msgstr "Отклонить на _этот раз"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:568
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
-msgstr ""
+msgstr "Местоположение"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:582
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:593
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016
-#, fuzzy
-msgid "Extension instance"
-msgstr "Дополнения"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017
-msgid "The Midori extension instance for this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023
-#, fuzzy
-msgid "Application instance"
-msgstr "Приложения"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
+msgstr "Срок действия до"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030
-msgid "Database instance"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036
-msgid "Database path"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043
-msgid "Ask for unknown policy"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120
-msgid "Undetermined"
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
 
 #: ../extensions/cookie-permissions/main.c:62
-#, fuzzy
 msgid "Cookie Security Manager"
-msgstr "Менеджер фрагментов данных"
+msgstr "Менеджер безопасности Cookies"
 
 #: ../extensions/cookie-permissions/main.c:63
 msgid "Manage cookie permission per site"
-msgstr ""
-
-#~ msgid "Writing failed."
-#~ msgstr "Ошибка записи."
-
-#~ msgid "_Window"
-#~ msgstr "_Окно"
-
-#~ msgid "Custom..."
-#~ msgstr "Другая…"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr ""
-#~ "Строка, которая будет посылаться на запросы идентификации обозревателя"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Инерционная прокрутка"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ"
-
-#~ msgid "FILENAME"
-#~ msgstr "ФАЙЛ"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Добавить кнопку запуска на _рабочий стол"
-
-#~ 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 "Действия, выполняемые при запуске Midori"
-
-#~ msgid "The homepage"
-#~ 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 ""
-#~ "Включить поддержку локального хранилища (localStorage) стандарта 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 "Highlight Matches"
-#~ msgstr "Подсветить совпадения"
-
-#~ 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 "Not available: %s"
-#~ msgstr "Недоступно: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Файлы ресурсов не установлены"
-
-#~ msgid "No filename specified"
-#~ msgstr "Имя файла не задано"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Установить количество закладок"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Введите число столбцов и строк:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Проверьте правильность ввода"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Размер миниатюр:"
-
-#~ msgid "Small"
-#~ msgstr "Маленький"
-
-#~ msgid "Medium"
-#~ msgstr "Средний"
-
-#~ msgid "Big"
-#~ msgstr "Большой"
+msgstr "Управление настройками Cookie для сайтов"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Не удалось выполнить запрос к базе данных\n"
-
-#~ msgid "All cookies"
-#~ msgstr "Все"
-
-#~ msgid "Session cookies"
-#~ msgstr "С информацией о сеансе"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Показать панель передач"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Показывать панель передач"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Показывать средства поиска при автодополнении адреса"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Показывать средства поиска при вводе текста в адресную строку"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Показать элементы управления панелью"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Показывать элементы управления панелью"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Показывать панель быстрого набора в новых вкладках"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Показывать панель быстрого набора в только что открытых вкладках"
-
-#~ msgid "Download Manager"
-#~ msgstr "Менеджер загрузок"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Открывать внешние страницы в:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Расположение сторонних страниц при открытии"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Разрешённый тип фрагментов данных"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Хранить фрагменты данных"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Хранить историю за последние"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Запоминать последние загруженные файлы"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Сохранять историю последних загрузок"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Страница не найдена — %s"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Загрузить с помощью _менеджера загрузок"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Не удалось отобразить документ"
-
-#~ msgid "General"
-#~ msgstr "Общие"
-
-#~ msgid "Appearance"
-#~ msgstr "Внешний вид"
-
-#~ msgid "Font settings"
-#~ msgstr "Настройки шрифта"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Всегда использовать разрешение 96 точек на дюйм"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Принудительно использовать разрешение 96 точек на дюйм"
-
-#~ msgid "Interface"
-#~ msgstr "Интерфейс"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Панель навигации"
-
-#~ msgid "External applications"
-#~ msgstr "Внешние приложения"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Фрагменты данных"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Удалять фрагменты данных при закрытии Midori"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Удалять старые фрагменты данных через час"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Удалять старые фрагменты данных через неделю"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Удалять старые фрагменты данных через год"
-
-#~ msgid "days"
-#~ msgstr "дней"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s из %s, %s/s"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "_Настроить рекламные фильтры…"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Открыть папку с выбранным дополнением"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Следующая вкладка (история вкладок)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Предыдущая вкладка (история вкладок)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Предыдущая вкладка из истории"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Переключение вкладок по Ctrl-Tab в порядке времени последнего "
-#~ "использования"
-
-#~ msgid "Pageholder"
-#~ msgstr "Контейнер"
-
-#~ msgid "_Pageholder"
-#~ msgstr "К_онтейнер"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "Дополнительная область для просмотра страниц"
-
-#~ msgid "Quit the application"
-#~ msgstr "Выйти из программы"
-
-#~ msgid "_Contents"
-#~ msgstr "_Содержание"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Документация"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Сохранить объект"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Загрузить объект"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% загружено"
-
-#~ msgid "_Transferbar"
-#~ msgstr "П_ередачи"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Показать вкладку передачи"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Показывать прогресс загрузки страницы в адресной строке"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Запрашивать папку для загрузок"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Запрашивать конечную папку для каждого файла"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Показывать уведомление по окончании передачи файлов"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Загрузить _изображение"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Не удалось очистить журнал поисковых запросов: %s\n"
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "С_вернуть текущую вкладку"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Свернуть текущую вкладку"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Отсоединить выбранную панель от главного окна"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Скрыть элементы управления"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Проверка орфографии"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Список языков для проверки орфографии через запятую, например, «en_US,ru»"
-
-#~ msgid "External Applications"
-#~ msgstr "Внешние приложения"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Ассоциация ссылок с внешними командами"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Словари:"
-
-#~ msgid "Console"
-#~ msgstr "Консоль"
-
-#~ msgid "Copy _All"
-#~ msgstr "Копировать все"
-
-#~ msgid "Copy All"
-#~ msgstr "Копировать все"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Менеджер _фрагментов данных"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Недавно посещённые страницы"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Открывать страницы, посещённые ранее"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Только оригинальные фрагменты данных"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Запоминать посещённые страницы"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Сохранять историю последних посещений"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Автоматически обнаруживать прокси-сервер"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Брать данные о прокси-сервере из переменных окружения"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "Во_сстановить вкладку"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Свернуть вкладку"
-
-#~ msgid "Erroneous clock time"
-#~ msgstr "Некорректное время"
-
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Дата находится в прошлом. Проверьте системное время."
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Скопировать %s в папку %s."
-
-#~ msgid "New tabs open minimized"
-#~ msgstr "Новые закладки открываются свёрнутыми"
-
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Установить число закладок"
-
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Введите число закладок:"
-
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Установленными считаются пользовательские сценарии, расположенные в «%s» "
-#~ "и стили, расположенные в «%s»."
-
-#~ msgid "Open _Link"
-#~ msgstr "_Открыть ссылку"
-
-#~ msgid "Not available on this platform"
-#~ msgstr "Недоступно для данной платформы"
-
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Не удалось получить текущее время: %s\n"
-
-#~ msgid "Show panel _titles"
-#~ msgstr "_Заголовки панелей"
-
-#~ msgid "Options"
-#~ msgstr "Настройки"
-
-#~ msgid "View Selection Source"
-#~ msgstr "Исходный код выделенного фрагмента"
-
-#~ msgid "View the source code of the selection"
-#~ msgstr "Просмотр исходного кода выделенного фрагмента"
-
-#~ msgid "Enable developer tools"
-#~ msgstr "Включить средства разработчика"
-
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Включить особые расширения для разработчиков"
-
-#~ msgid "Prefetch IP addresses of hovered links"
-#~ msgstr "Упреждающие запросы DNS при наведении на ссылки"
-
-#~ msgid "Shrink images automatically"
-#~ msgstr "Масштабировать изображения автоматически"
-
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Автоматически уменьшать отдельные изображения по размеру экрана"
-
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Цветные вкладки"
-
-#~ msgid "Remember last form inputs"
-#~ msgstr "Запоминать введённые в формы данные"
-
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Сохранять последние введённые данные в формы ввода"
-
-#~ msgid "Cache size"
-#~ msgstr "Размер кэша"
-
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Разрешённый размер кэша"
-
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Кодировка символов, которая будет использоваться по умолчанию"
-
-#~ msgid "Encoding"
-#~ msgstr "Кодировка"
-
-#~ msgid "Resizable text areas"
-#~ msgstr "Изменяемый размер текстовых полей"
-
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Текстовые поля могут изменять размер"
-
-#~ msgid "Both"
-#~ msgstr "Значки и текст"
-
-#~ msgid "Both horizontal"
-#~ msgstr "Значки и текст горизонтально"
-
-#~ msgid "Load on Startup"
-#~ msgstr "Загружать при запуске"
-
-#~ msgid "Configure _Toolbar…"
-#~ msgstr "Настроить панель _инструментов…"
-
-#~ msgid "Enable"
-#~ msgstr "Включить"
-
-#~ msgid "_Disable"
-#~ msgstr "_Отключить"
-
-#~ msgid "Disable"
-#~ msgstr "Отключить"
-
-#~ msgid "%d days ago"
-#~ msgstr "%d дней назад"
-
-#~ msgid "_Quick Find"
-#~ msgstr "_Быстрый поиск"
-
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Перейти на слово или фразу"
-
-#~ msgid "Add to customized _homepage"
-#~ msgstr "До_бавить в визуальные закладки"
-
-#~ msgid "Search"
-#~ msgstr "Найти"
-
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Внимание: используется учётная запись суперпользователя!"
-
-#~ msgid "P_lugins"
-#~ msgstr "_Модули"
-
-#~ msgid "Plugins"
-#~ msgstr "Модули"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Не удалось  найти значок приложения в %s: %s"
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s не обладает свойством «%s»"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s не может быть назначен для %s.%s"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Не удалось создать новый ярлык (%s): %s"
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s недоступен"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Ярлык создан"
 
-#~ msgid ""
-#~ "<b>Host: %s</b>\n"
-#~ "Path: %s\n"
-#~ "Secure: %s\n"
-#~ "Name: %s\n"
-#~ "Value: %s"
-#~ msgstr ""
-#~ "<b>Узел: %s</b>\n"
-#~ "Путь: %s\n"
-#~ "Защищённый: %s\n"
-#~ "Имя: %s\n"
-#~ "Значение: %s"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Вы можете запустить <b>%s</b> с помощью ярлыка или меню."
 
-#~ msgid "Source"
-#~ msgstr "Исходный код"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Ошибка при создании ярлыка"
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Значок (имя или файл):"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Приложения"
 
-#~ msgid "URIs"
-#~ msgstr "Идентификаторы URI"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Новый _Профиль"
 
-#~ msgid "[URIs]"
-#~ msgstr "[Идентификаторы URI]"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Создаст новый, независимый профиль и ярлык"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Новое _Приложение"
 
-#~ msgid "Root"
-#~ msgstr "Root"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Создает новое приложение для конкретного сайта"
 
-#~ msgid "HTTP Proxy"
-#~ msgstr "HTTP-прокси"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Ошибка при запуске"
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "Открыть URL в новой _вкладке"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Создать кнопку _запуска"
 
-#~ msgid "Enforce 96 DPI"
-#~ msgstr "Всегда использовать 96 DPI"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Управление Web-приложениями"
 
-#~ msgid "Manage search engines"
-#~ msgstr "Управление средствами поиска"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Управление сайтами, установленными как приложения"
 
-#~ msgid "Open in Page_holder…"
-#~ msgstr "Открыть в _контейнере…"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Загрузки"
 
-#~ msgid "Last pageholder URI"
-#~ msgstr "Текущий индекс URI"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Убрать завершённые"
 
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "Последняя открытая ссылка в хранилище"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Не удалось открыть загрузку: %s"
 
-#~ msgid "_Fullscreen"
-#~ msgstr "Полноэкранный режим"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Открыть _папку загрузок"
 
-#~ msgid "_Leave Fullscreen"
-#~ msgstr "Выйти из полноэкранного режима"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Копировать _адрес ссылки"
 
-#~ msgid "Settings"
-#~ msgstr "Установки"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Файл «<b>%s</b>» загружен."
 
-#~ msgid "Trash"
-#~ msgstr "Корзина"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' и %d других файлов были загружены."
 
-#~ msgid "The trash, collecting recently closed tabs and windows"
-#~ msgstr "Корзина. Сохраняет закрытые вкладки и окна"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Загрузка завершена"
 
-#~ msgid "The list of search engines"
-#~ msgstr "Список средств поиска"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Некоторые файлы загружаются"
 
-#~ msgid "Browser"
-#~ msgstr "Обозреватель"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "В_ыйти из Midori"
 
-#~ msgid "The current browser"
-#~ msgstr "Данный браузер"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Загрузки будут отменены при закрытии Midori."
 
-#~ msgid "Kind"
-#~ msgstr "Тип"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Менеджер загрузок"
 
-#~ msgid "The kind of addons"
-#~ msgstr "Тип дополнения"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Просмотреть загруженные файлы"
 
-#~ msgid "The navigationbar"
-#~ msgstr "Панель навигации"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Не удалось обновить базу данных: %s"
 
-#~ msgid "URI"
-#~ msgstr "URI"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Не удалось выбрать из базы данных: %s"
 
-#~ msgid "The current URI"
-#~ msgstr "Данная URI"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Не удалось импортировать предыдущую сессию: %s"
 
-#~ msgid "Tab"
-#~ msgstr "Вкладка"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "The current tab"
-#~ msgstr "Данная вкладка"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Управление закладками и сессиями"
 
-#~ msgid "The statusbar"
-#~ msgstr "Панель состояния"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "The list of search engines to be used for web search"
-#~ msgstr "Список средств поиска используемые для поиска в сети"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Open the selected bookmark in a new tab"
-#~ msgstr "Открыть выбранные закладки в новых вкладках"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Не удалось добавить новую заметку в базе данных: %s\n"
 
-#~ msgid "Open the selected bookmark in a new window"
-#~ msgstr "Открыть выбранные закладки в новом окне"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Не удалось удалить заметку из базы данных: %s\n"
 
-#~ msgid "Shadow Type"
-#~ msgstr "Тип тени"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Не удалось переименовать заметку: %s\n"
 
-#~ msgid "Appearance of the shadow around each panel"
-#~ msgstr "Внешний вид тени вокруг панели"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Не удалось обновить заметку: %s\n"
 
-#~ msgid "Menu to hold panel items"
-#~ msgstr "Управление содержимым панелей"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Заметки"
 
-#~ msgid "Show New Tab"
-#~ msgstr "Показать новую вкладку"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Создать заметку"
 
-#~ msgid "Show the New Tab button in the toolbar"
-#~ msgstr "Показать кнопку Новая Вкладка в панели инструментов"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Создать пустую заметку, несвязанную с открытыми страницами"
 
-#~ msgid "Show Web search"
-#~ msgstr "Показать поиск"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Создать заметку"
 
-#~ msgid "Show the Web search entry in the toolbar"
-#~ msgstr "Показывать запись сетевого поиска в панели инструментов"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Ошибка при чтении из базы данных заметок: %s\n"
 
-#~ msgid "Load Finished"
-#~ msgstr "Загрузка завершена"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Переименовать заметку"
 
-#~ msgid "The URI of the currently loaded page"
-#~ msgstr "URI загруженной страницы"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Копировать заметку в буфер обмена"
 
-#~ msgid "The title of the currently loaded page"
-#~ msgstr "Заголовок загруженной страницы"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Удалить заметку"
 
-#~ msgid "The current loading status"
-#~ msgstr "Статус загрузки"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Копировать выбранное как заметку"
 
-#~ msgid "The current loading progress"
-#~ msgstr "Процесс загрузки"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Сохранить текстовые вырезки с сайта как заметки"
 
-#~ msgid "Dialog"
-#~ msgstr "Диалог"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Блокировка рекламы"
 
-#~ msgid "A dialog to manage search engines"
-#~ msgstr "Диалог управления средствами поиска"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Блокирует рекламу по списку фильтров"
 
-#~ msgid "Icon size"
-#~ msgstr "Размер значков"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Настройка рекламных фильтров"
 
-#~ msgid "The name of an icon containing animation frames"
-#~ msgstr "Имя иконки содержащей анимационные рамки"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Бл_окировать изображение"
 
-#~ msgid "The name of an icon to be used as the static image"
-#~ msgstr "Имя иконки для статичного изобрадения"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Бл_окировать ссылку"
 
-#~ msgid "The descriptive text of the item"
-#~ msgstr "Описание пункта"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Редактирование правила"
 
-#~ msgid "Token"
-#~ msgstr "Признак"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Правило:"
index 82ef652a2054ec97cc60103e3bced3fefe69f4cd..e8cd0901e520825d20715d184d999bec6f5d9afe 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,509 +8,371 @@ 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"
-"Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-10-27 08:01+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: slovenčina <slovenska-lokalizacia-xfce@googlegroups.com>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Poedit-Language: Slovak\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:04+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 "X-Poedit-Country: SLOVAKIA\n"
+"Language: sk\n"
+"X-Poedit-Language: Slovak\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Internetový prehliadač"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori internetový prehliadač"
 
-#: ../data/midori.desktop.in.h:1
+#: ../data/midori.desktop.in.h:4
 msgid "Browse the Web"
 msgstr "Prehliadať internet"
 
-#: ../data/midori.desktop.in.h:2
+#: ../data/midori.desktop.in.h:5
 msgid "Internet;WWW;Explorer"
 msgstr "Internet; WWW; Prehliadač"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
-#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
-msgid "Midori"
-msgstr "Midori"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nová karta"
 
-#: ../data/midori.desktop.in.h:4
-msgid "Web Browser"
-msgstr "Internetový prehliadač"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Nové okno"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Nové okno súkromého prehliadania"
 
 #: ../data/midori-private.desktop.in.h:1
 msgid "Midori Private Browsing"
 msgstr "Midori - súkromné prehliadanie"
 
-#: ../data/midori-private.desktop.in.h:2
-msgid "Open a new private browsing window"
-msgstr "Otvoriť nové okno súkromného prehliadania"
-
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4210
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Súkromné prehliadanie"
 
-#: ../midori/main.c:97 ../midori/main.c:103
-#, 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
-#, 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
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Neplatná hodnota '%s' v konfigurácii"
-
-#: ../midori/main.c:381
-#, 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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Nastavenie sa nepodarilo uložiť. %s"
-
-#: ../midori/main.c:582
-#, 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
-#, 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
-msgid "Extensions"
-msgstr "Rozšírenia"
-
-#: ../midori/main.c:674
-msgid "Privacy"
-msgstr "Súkromie"
-
-#: ../midori/main.c:686
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"V cookies sa ukladajú prihlasovacie údaje, zostavy hier alebo používateľské "
-"dáta pre reklamu."
-
-#: ../midori/main.c:742
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sedenie sa nepodarilo uložiť. %s"
-
-#: ../midori/main.c:960
-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
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Zdá sa, že Midori nebolo naposledy riadne ukončené. Ak sa to stáva "
-"opakovane, pre odstránenie problému skúste nasledujúce možnosti."
-
-#: ../midori/main.c:1055
-msgid "Modify _preferences"
-msgstr "Zmeniť _predvoľby"
-
-#: ../midori/main.c:1059
-msgid "Disable all _extensions"
-msgstr "Zakázať všetky _rozšírenia"
-
-#: ../midori/main.c:1072
-msgid "Discard old tabs"
-msgstr "Zahodiť staré karty"
-
-#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
-msgid "Show last tabs without loading"
-msgstr "Zobraziť naposledy otvorené karty bez načítania"
-
-#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
-msgid "Show last open tabs"
-msgstr "Zobraziť naposledy otvorené karty"
-
-#: ../midori/main.c:1321 ../midori/main.c:2399
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sedenie nie je možné načítať: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Otvoriť nové okno súkromného prehliadania"
 
-#: ../midori/main.c:1459
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Snímok uložený do: %s\n"
 
-#: ../midori/main.c:1875
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Spustiť ADDRESS ako webovú aplikáciu"
 
-#: ../midori/main.c:1875
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESA"
 
-#: ../midori/main.c:1878
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Použiť PRIEČINOK ako konfiguračný priečinok"
 
-#: ../midori/main.c:1878
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "PRIEČINOK"
 
-#: ../midori/main.c:1881
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Súkromné prehliadanie, nič sa neukladá"
 
-#: ../midori/main.c:1883
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Zobraziť dialóg po spadnutí"
 
-#: ../midori/main.c:1885
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Spustiť zadaný názov súboru ako javaskript"
 
-#: ../midori/main.c:1887
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Urobiť snímok požadovanej URI"
 
-#: ../midori/main.c:1889
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Spustiť zadaný príkaz"
 
-#: ../midori/main.c:1891
+#: ../midori/main.c:101
 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:103
 msgid "Display program version"
 msgstr "Zobraziť verziu programu"
 
-#: ../midori/main.c:1895
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresy"
 
-#: ../midori/main.c:1897
+#: ../midori/main.c:107
 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:107
 msgid "PATTERN"
 msgstr "REGVÝRAZ"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Resetovať Midori po SEKUNDY sekundy nečinnosti"
 
-#: ../midori/main.c:1901
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SEKUNDY"
 
-#: ../midori/main.c:1904
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Presmeruje varovania konzoly do zadaného MENA_SÚBORU"
-
-#: ../midori/main.c:1904
-msgid "FILENAME"
-msgstr "MENO_SÚBORU"
-
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Adresy]"
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
 
-#: ../midori/main.c:2011
+#: ../midori/main.c:162
 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:164
 msgid "Check for new versions at:"
 msgstr "Skontrolovať nové verzie na:"
 
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
-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"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "Vyrovnávacia pamäť stránok"
-
-#: ../midori/main.c:2117
-msgid "Website icons"
-msgstr "Ikony webových stránok"
-
-#: ../midori/main.c:2223
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Vyskytla sa neznáma chyba"
 
-#: ../midori/main.c:2330
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Midori síce beží, ale neodpovedá.\n"
-
-#: ../midori/main.c:2366
-#, 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
-#, 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
-#, 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
-msgid "The following errors occured:"
-msgstr "Došlo k nasledujúcim chybám:"
-
-#: ../midori/main.c:2459
-msgid "_Ignore"
-msgstr "_Ignorovať"
-
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Záložka"
-
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Záložky"
 
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Pridať záložku"
 
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Konzola"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1155
 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:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_História"
 
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Domovská stránka"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Užívateľské skripty"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "_Užívateľské štýly"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Nová _karta"
 
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Prenosy"
 
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Pluginy _Netscape"
 
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Zatvorené karty"
 
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Nový _priečinok"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresy]"
+
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Súbor sa nenašiel."
 
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Nesprávny formát dokumentu."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Neznámy formát záložiek"
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Zapisovanie zlyhalo."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Dopredu na nasledujúcu stránku"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Prejsť na nasledujúcu podstránku"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Vyhľadávanie na webe..."
 
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 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:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Zastaviť načítanie aktuálnej stránky"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Hodnota '%s' nie je platná pre %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Neočakávané nastavenie '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Neočakávaná akcia '%s'."
 
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Súkromné prehliadanie)"
 
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Priečinok najvyššej úrovne"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, 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:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Záložky"
 
-#: ../midori/midori-browser.c:774
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Nový priečinok"
 
-#: ../midori/midori-browser.c:774
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Upraviť priečinok"
 
-#: ../midori/midori-browser.c:776
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nová záložka"
 
-#: ../midori/midori-browser.c:776
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Upraviť záložku"
 
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Názov:"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Zadajte názov pre túto záložku a zvoľte miesto, kde bude ponechaná."
 
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresa:"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Zadajte názov pre tento priečinok a zvoľte miesto, kde bude uložený."
 
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Priečinok:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:1185
 msgid "Add to _Speed Dial"
 msgstr "Pridať do _rýchleho prístupu"
 
-#: ../midori/midori-browser.c:890
-msgid "Show in the tool_bar"
-msgstr "Zobraziť v paneli _nástrojov"
-
-#: ../midori/midori-browser.c:905
-msgid "Run as _web application"
-msgstr "Spustiť ako _webovú aplikáciu"
-
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Súbor \"%s\" nemôže byť uložený do tohoto priečinka."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Nemáte oprávnenia k zápisu."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Nie je dosť miesta pre stiahnutie \"%s\"."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Potrebuje %s, ale k dispozícií je iba %s."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Uložiť súbor ako"
 
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nové okno"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Uložiť pripojené zd_roje"
 
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Bolo otvorené nové okno"
 
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nová karta"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Bola otvorená nová karta"
 
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Chyba pri otváraní obrázku!"
 
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1630
 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
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Chyba pri sťahovaní obrázku!"
 
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Nepodarilo sa stiahnuť vybraný obrázok."
 
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Uložiť súbor"
 
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Obnoviť stránku bez použitia vyrovnávacej pamäte"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2692
 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 +387,126 @@ 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:2698 ../extensions/feed-panel/main.c:350
 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:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 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:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Prázdne"
 
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Prepína navigáciu pomocou kurzora"
 
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
-#, 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:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Stlačenie klávesy F7 prepína funkciu ovládania pomocou kurzora. Keď je "
+"aktívna, na všetkých stránkach sa objavuje kurzor."
 
-#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "Povoliť ovládani_e kurzorem"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Otvoriť v novom _okne"
 
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4241
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importovať záložky…"
 
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importovať záložky"
 
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Aplikácia:"
 
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4455
 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:4481
 msgid "Import from a file"
 msgstr "Importovať zo súboru"
 
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Nepodarilo sa importovať záložky"
 
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "Záložky vo formáte XBEL"
 
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Záložky z Netscape"
 
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4546
 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:4558
 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
-msgid "Clear Private Data"
-msgstr "Odstrániť súkromné údaje"
-
-#: ../midori/midori-browser.c:4562
-msgid "_Clear private data"
-msgstr "_Odstrániť súkromné údaje"
-
-#: ../midori/midori-browser.c:4575
-msgid "Clear the following data:"
-msgstr "Odstrániť nasledujúce údaje:"
-
-#: ../midori/midori-browser.c:4585
-msgid "Last open _tabs"
-msgstr "Naposledy otvorené _karty"
-
-#: ../midori/midori-browser.c:4611
-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:4746
 msgid "A lightweight web browser."
 msgstr "Ľahký internetový prehliadač."
 
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4747
 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: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 "
@@ -671,1505 +518,1469 @@ 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:4780
 msgid "translator-credits"
 msgstr ""
 "Robert Hartl <hartl.robert@gmail.com>, 2009\n"
-"Tomáš Vadina <kyberdev@gmail.com>, 2011"
+"Tomáš Vadina <kyberdev@gmail.com>, 2011\n"
+"\n"
+"Launchpad Contributions:\n"
+"  DAG Software https://launchpad.net/~dagsoftware\n"
+"  Milan Slovák https://launchpad.net/~milboys\n"
+"  Tomáš Vadina https://launchpad.net/~kyberdev\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Z_dvojiť aktuálnu kartu"
 
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Otvoriť nové okno"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Otvoriť novú kartu"
 
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Nové okno súk_romného prehliadania"
 
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Otvoriť súbor"
 
-#: ../midori/midori-browser.c:5230
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Uložiť _stránku ako…"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Uložiť do súboru"
 
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Pridať do _Rýchleho prístupu"
 
-#: ../midori/midori-browser.c:5237
-msgid "Add Shortcut to the _desktop"
-msgstr "Pridať záložku na _plochu"
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Pridať _kanál"
 
-#: ../midori/midori-browser.c:5239
-msgid "Create _Launcher"
-msgstr "Vytvoriť _spúšťač"
-
-#: ../midori/midori-browser.c:5243
-msgid "Subscribe to News _feed"
-msgstr "Pridať _kanál"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Zatvoriť kartu"
 
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Zatvoriť aktívnu kartu"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Zatvoriť okno"
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Vytlačiť aktuálnu stránku"
 
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Z_atvoriť všetky okná"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Nájsť…"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "Hľadať _ďalšie"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Hľadať _predchádzajúce"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Nastaviť možnosti aplikácie"
 
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Panely s nástrojmi"
 
-#: ../midori/midori-browser.c:5302
-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:5156
 msgid "Increase the zoom level"
 msgstr "Priblížiť"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Oddialiť"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kódovanie"
 
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Zobraziť _zdrojový kód"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Prehliadanie ku_rzorom"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Prepnúť zobrazenie na celú obrazovku"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Rolovať _vľavo"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Rolovať _dole"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Rolovať na_hore"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Rolovať v_pravo"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "Čí_tací režim"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "P_rejsť"
 
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Späť na predchádzajúcu stránku"
 
-#: ../midori/midori-browser.c:5348
-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:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Prejsť na nasledujúcu podstránku"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Domovská stránka"
+
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ísť na domovskú stránku"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Vysypať kôš"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Obnoviť _zatvorenú kartu"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Pridať nový priečinok"
 
-#: ../midori/midori-browser.c:5377
-msgid "_Export bookmarks"
-msgstr "_Exportovať záložky"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importovať záložky..."
 
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Správca vyhľadávacích modulov"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "Exportovať záložky..."
 
-#: ../midori/midori-browser.c:5383
-msgid "_Clear Private Data"
-msgstr "_Odstrániť súkromné údaje"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Správa vyhľadávania..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Odstrániť súkromné údaje..."
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Preskúmať stránku"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Predchádzajúca karta"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Ďalšia karta"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr "Presunúť záložku na _prvú pozíciu"
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Presunúť kartu do_zadu"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Presunúť kartu do_predu"
 
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr "Presunúť záložku na _poslednú pozíciu"
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Zamerať _aktuálnu kartu"
 
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Prepnúť _na ďalšiu"
 
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Zobraziť iba ikonu a_ktuálnej karty"
 
-#: ../midori/midori-browser.c:5409
-msgid "_Duplicate Current Tab"
-msgstr "Z_dvojiť aktuálnu kartu"
-
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Zatvoriť ostatné karty"
 
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Otvoriť posledné _sedenie"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Časté otázky"
 
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "_Ohlásiť chybu"
 
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Nástroje"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Panel _ponuky"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigačný panel"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Bočný panel"
 
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Bočný panel"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Panel _záložiek"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Stavový riadok"
 
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatické"
 
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Tradičné čínske (BIG5)"
 
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Zjednodušené čínske (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonské (SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Kórejské (EUC-KR)"
 
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ruské (KOI8-R)"
 
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Vlastné…"
 
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Oddeľovač"
 
-#: ../midori/midori-browser.c:5998
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Umiestnenie…"
 
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Otvoriť umiestnenie"
 
-#: ../midori/midori-browser.c:6022
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Hľadať na webe…"
 
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Spustí vyhľadávanie na webe"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Znovu otvoriť zatvorenú kartu alebo okno"
 
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Zobrazí uložené záložky"
 
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "_Nástroje"
-
-#: ../midori/midori-browser.c:6101
-msgid "_Window"
-msgstr "_Okno"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "_Záložky"
 
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:5939
 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:5953
 msgid "_Menu"
 msgstr "_Ponuka"
 
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "_Ponuka"
 
-#: ../midori/midori-browser.c:6933
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Neočakávané nastavenie '%s'"
-
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "Exportovať certifikát"
 
-#: ../midori/midori-locationaction.c:412
-msgid "Search with…"
-msgstr "Hľadať pomocou…"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Autorita podepisujúca certifikát nie je známa."
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Nepodarilo sa vybrať z histórie\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Certifikát nezodpovedá očakávanej identite stránky, z ktorej bol získaný."
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "Hľadať %s"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Dátum aktivácie platnosti certifikátu je v budúcnosti."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Platnosť certifikátu vypršala"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Certifikát bol odmietnutý na základe zoznamu odvolaných certifikátov od "
+"GTIsConnection."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Certifikační algoritmus nie je považovaný za dôveryhodný."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Pri overování certifikátu došlo k chybe."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Exportovať certifikát"
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Podpísaný sám sebou (self-signed)"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Podrobnosti o zabezpečení"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Vložiť a s_pustiť"
 
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Neoverené"
 
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Overené a zabezpečené spojenie"
 
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1814
 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
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Umiestnenie bočného panelu vpravo"
 
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Zatvoriť panel"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Umiestnenie bočného panelu vľavo"
 
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Zobraziť rýchly prístup"
 
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Zobraziť domovskú stránku"
 
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Zobraziť naposledy otvorené karty"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Zobraziť naposledy otvorené karty bez načítania"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "Zobraziť prázdnu stránku"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "Zobraziť predvolené vyhľadávanie"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "Zobraziť vlastnú stránku"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonské (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "novej karte"
 
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "novom okne"
 
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "aktuálnej karte"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Predvolený"
 
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikony"
 
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Malé ikony"
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikony a text"
 
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text pod ikonami"
 
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automaticky (GNOME alebo iné prostredie)"
 
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTTP proxy server"
 
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Žiadny"
 
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:401
-msgid "Remember last window size"
-msgstr "Zapamätať si poslednú veľkosť okna"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Štýl panelu s nástrojmi"
 
-#: ../midori/midori-websettings.c:402
-msgid "Whether to save the last window size"
-msgstr "Či ukladať poslednú veľkosť okna"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Vždy použiť môj výber písma"
 
-#: ../midori/midori-websettings.c:410
-msgid "Last window width"
-msgstr "Posledná šírka okna"
+#: ../midori/midori-websettings.c:492
+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-websettings.c:411
-msgid "The last saved window width"
-msgstr "Naposledy uložená šírka okna"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Konfigurácia sa nemôže načítať: %s\n"
 
-#: ../midori/midori-websettings.c:419
-msgid "Last window height"
-msgstr "Posledná výška okna"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Neplatná hodnota '%s' v konfigurácii"
 
-#: ../midori/midori-websettings.c:420
-msgid "The last saved window height"
-msgstr "Naposledy uložená výška okna"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:445
-msgid "Last panel position"
-msgstr "Posledná pozícia panela"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Zobraziť _popisok karty"
 
-#: ../midori/midori-websettings.c:446
-msgid "The last saved panel position"
-msgstr "Uložená posledná pozícia panela"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Zobraziť len _ikonu karty"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
-msgid "Last panel page"
-msgstr "Posledná stránka panelu"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:456
-msgid "The last saved panel page"
-msgstr "Posledná uložená stránka panala"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Zatvoriť druhú kartu"
+msgstr[1] "_Zatvoriť ostatné karty"
+msgstr[2] "_Zatvoriť ostatné karty"
 
-#: ../midori/midori-websettings.c:464
-msgid "Last Web search"
-msgstr "Rýchle hľadanie na webe"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Dôverovať tejto webstránke"
 
-#: ../midori/midori-websettings.c:465
-msgid "The last saved Web search"
-msgstr "Uložené posledné vyhľadávanie na webe"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Neznáme zabezpečenie"
 
-#: ../midori/midori-websettings.c:474
-msgid "Show Menubar"
-msgstr "Zobraziť panel pouky"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s požaduje uloženie dát do HTML5 databázy."
 
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the menubar"
-msgstr "Či Zobrazovať ponuku"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Zakázať"
 
-#: ../midori/midori-websettings.c:483
-msgid "Show Navigationbar"
-msgstr "Zobraziť vyhľadávaciu lištu"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Povoliť"
 
-#: ../midori/midori-websettings.c:484
-msgid "Whether to show the navigationbar"
-msgstr "Či zobrazovať vyhľadávaciu lištu"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s požaduje zistenie Vašej polohy."
 
-#: ../midori/midori-websettings.c:492
-msgid "Show Bookmarkbar"
-msgstr "Zobraziť záložky"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "'%s' nebol nájdený"
 
-#: ../midori/midori-websettings.c:493
-msgid "Whether to show the bookmarkbar"
-msgstr "Či zobrazovať panel záložiek"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Stránku '%s' sa nepodarilo načítať:"
 
-#: ../midori/midori-websettings.c:501
-msgid "Show Panel"
-msgstr "Zobraziť panel"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the panel"
-msgstr "Či zobrazovať panel"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:510
-msgid "Show Statusbar"
-msgstr "Zobraziť stavový riadok"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Overte či máte správne nastavenú sieť"
 
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the statusbar"
-msgstr "Či zobraziť stavový riadok"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Skúsiť znova"
 
-#: ../midori/midori-websettings.c:520
-msgid "Toolbar Style:"
-msgstr "Štýl panelu s nástrojmi:"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:521
-msgid "The style of the toolbar"
-msgstr "Štýl panelu s nástrojmi"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:530
-msgid "Toolbar Items"
-msgstr "Položky panelu nástrojov"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Skúsiť znovu"
 
-#: ../midori/midori-websettings.c:531
-msgid "The items to show on the toolbar"
-msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "Poslať %s správu"
 
-#: ../midori/midori-websettings.c:539
-msgid "Compact Sidepanel"
-msgstr "Kompaktný bočný panel"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "Pridat vy_hľadávací engine..."
 
-#: ../midori/midori-websettings.c:540
-msgid "Whether to make the sidepanel compact"
-msgstr "Či zobrazovať bočný panel kompaktne"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Otvoriť _odkaz"
 
-#: ../midori/midori-websettings.c:555
-msgid "Align sidepanel on the right"
-msgstr "Umiestniť bočný panel vpravo"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Otvoriť odkaz na novej _karte"
 
-#: ../midori/midori-websettings.c:556
-msgid "Whether to align the sidepanel on the right"
-msgstr "Či presunúť bočný panel na opačnú stranu"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Otvoriť odkaz v novej _karte"
 
-#: ../midori/midori-websettings.c:571
-msgid "Open panels in separate windows"
-msgstr "Otvoriť panely v samostatných oknách"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Otvoriť odkaz v novej karte na pozadí"
 
-#: ../midori/midori-websettings.c:572
-msgid "Whether to always open panels in separate windows"
-msgstr "Či otvoriť panel v samostatnom okne"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Otvoriť odkaz v novom _okne"
 
-#: ../midori/midori-websettings.c:581
-msgid "When Midori starts:"
-msgstr "Pri spustení Midori:"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Kopírovať _cieľ odkazu"
 
-#: ../midori/midori-websettings.c:582
-msgid "What to do when Midori starts"
-msgstr "Čo robiť pri spustení Midori?"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Uložiť _ako…"
 
-#: ../midori/midori-websettings.c:591
-msgid "Homepage:"
-msgstr "Domovská stránka:"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "Otvoriť _obrázok v novom okne"
 
-#: ../midori/midori-websettings.c:592
-msgid "The homepage"
-msgstr "Domovská stránka"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Otvoriť _obrázok na novej karte"
 
-#: ../midori/midori-websettings.c:607
-msgid "Show crash dialog"
-msgstr "Zobraziť dialóg po spadnutí"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr "Kopírovať _obrázok"
 
-#: ../midori/midori-websettings.c:608
-msgid "Show a dialog after Midori crashed"
-msgstr "Zobrazí dialóg po spadnutí Midori"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Uložiť _obrázok"
 
-#: ../midori/midori-websettings.c:616
-msgid "Save downloaded files to:"
-msgstr "Uložiť stiahnuté súbory do:"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "Otvoriť obrázok v prehliadači _obrázkov"
 
-#: ../midori/midori-websettings.c:617
-msgid "The folder downloaded files are saved to"
-msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Kopírovať _adresu videa"
 
-#: ../midori/midori-websettings.c:625
-msgid "Text Editor"
-msgstr "Textový editor"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "Stiahnuť v_ideo"
 
-#: ../midori/midori-websettings.c:626
-msgid "An external text editor"
-msgstr "Externý textový editor"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otvoriť adresu v novej karte"
 
-#: ../midori/midori-websettings.c:641
-msgid "News Aggregator"
-msgstr "Čítačka RSS"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Hľadať _pomocou"
 
-#: ../midori/midori-websettings.c:642
-msgid "An external news aggregator"
-msgstr "Externá čítačka správ RSS"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Hľadať na webe"
 
-#: ../midori/midori-websettings.c:650
-msgid "Location entry Search"
-msgstr "Vyhľadávanie v adresnom riadku"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Otvoriť _rám na novej karte"
 
-#: ../midori/midori-websettings.c:651
-msgid "The search to perform inside the location entry"
-msgstr "Vyhľadávanie použité v riadku s adresou"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Preskúmať _prvok"
 
-#: ../midori/midori-websettings.c:659
-msgid "Preferred Encoding"
-msgstr "Preferované kódovanie"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "Otvoriť alebo stiahnuť súbor z %s"
 
-#: ../midori/midori-websettings.c:660
-msgid "The preferred character encoding"
-msgstr "Preferované kódovanie znakov"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Typ súboru: %s"
 
-#: ../midori/midori-websettings.c:670
-msgid "Always Show Tabbar"
-msgstr "Vždy zobrazovať karty"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Typ súboru: '%s'"
 
-#: ../midori/midori-websettings.c:671
-msgid "Always show the tabbar"
-msgstr "Vždy zobrazí panel kariet"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Typ súboru: %s ('%s')"
 
-#: ../midori/midori-websettings.c:684
-msgid "Close Buttons on Tabs"
-msgstr "Zatváracie tlačidlá na kartách"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Veľkosť: %s"
 
-#: ../midori/midori-websettings.c:685
-msgid "Whether tabs have close buttons"
-msgstr "Či zobraziť zatváracie tlačidlá na kartách"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Otvoriť %s"
 
-#: ../midori/midori-websettings.c:710
-msgid "Open new pages in:"
-msgstr "Otvárať nové stránky v:"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inšpekcia stránky - %s"
 
-#: ../midori/midori-websettings.c:711
-msgid "Where to open new pages"
-msgstr "Kde sa budú otvárať nové stránky"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori neukladá žiadne osobné dáta:"
 
-#: ../midori/midori-websettings.c:720
-msgid "Middle click opens Selection"
-msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Neukladá sa história ani cookies."
 
-#: ../midori/midori-websettings.c:721
-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-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Rozšírenia sú vypnuté."
 
-#: ../midori/midori-websettings.c:729
-msgid "Open tabs in the background"
-msgstr "Otvárať karty na pozadí"
+#: ../midori/midori-view.c:3901
+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-websettings.c:730
-msgid "Whether to open new tabs in the background"
-msgstr "Či otvorené karty otvárať na pozadí"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori odmieta sledovanie používateľa zo stránok:"
 
-#: ../midori/midori-websettings.c:738
-msgid "Open Tabs next to Current"
-msgstr "Otvoriť karty vedľa aktívnej"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Z URL sú odstránené údaje o odkazoch."
 
-#: ../midori/midori-websettings.c:739
-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-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "Prednačítanie DNS záznamov je zakázané."
 
-#: ../midori/midori-websettings.c:747
-msgid "Open popups in tabs"
-msgstr "Otvárať vyskakujúce okná na kartách"
+#: ../midori/midori-view.c:3905
+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-websettings.c:748
-msgid "Whether to open popup windows in tabs"
-msgstr "Či vyskakovacie okno otvárať v novej karte"
+#: ../midori/midori-view.c:3906
+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-websettings.c:758 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Automaticky načítať obrázky"
+#: ../midori/midori-view.c:3949
+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-websettings.c:759
-msgid "Load and display images automatically"
-msgstr "Načíta a zobrazí obrázky automaticky"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Povoliť skripty"
+#: ../midori/midori-view.c:4000
+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-websettings.c:767
-msgid "Enable embedded scripting languages"
-msgstr "Povolí vložené skriptové jazyky"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Načítať stránku"
 
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Povoliť pluginy z Netscape (Mozilly)"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Prázdnu stránku"
 
-#: ../midori/midori-websettings.c:775
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "predchádzajúce"
 
-#: ../midori/midori-websettings.c:790
-msgid "Enable Spell Checking"
-msgstr "Povoliť kontrolu pravopisu"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "nasledujúce"
 
-#: ../midori/midori-websettings.c:791
-msgid "Enable spell checking while typing"
-msgstr "Povolí kontrolu pravopisu pri písaní"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Tlačiť obrázky na pozadí"
 
-#: ../midori/midori-websettings.c:797
-msgid "Enable HTML5 database support"
-msgstr "Povoliť podporu databázy HTML5"
-
-#: ../midori/midori-websettings.c:798
-msgid "Whether to enable HTML5 database support"
-msgstr "Či povoliť podporu databázy HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Enable HTML5 local storage support"
-msgstr "Povoliť miestne úložisko pre HTML5"
-
-#: ../midori/midori-websettings.c:805
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Či povoliť miestne úložisko dát pre HTML5"
-
-#: ../midori/midori-websettings.c:811
-msgid "Enable offline web application cache"
-msgstr "Povoliť cache pre offline aplikácie"
-
-#: ../midori/midori-websettings.c:812
-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
-msgid "Flash window on background tabs"
-msgstr "Zablysnúť oknom prehliadača pri kartách na pozadí"
-
-#: ../midori/midori-websettings.c:829
-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
-msgid "Zoom Text and Images"
-msgstr "Zväčšovať text aj obrázky"
-
-#: ../midori/midori-websettings.c:865
-msgid "Whether to zoom text and images"
-msgstr "Či upravovať text aj obrázky pri menení veľkosti"
-
-#: ../midori/midori-websettings.c:880
-msgid "Find inline while typing"
-msgstr "Hľadať pri písaní"
-
-#: ../midori/midori-websettings.c:881
-msgid "Whether to automatically find inline while typing"
-msgstr "Či hľadať text pri písaní"
-
-#: ../midori/midori-websettings.c:896
-msgid "Kinetic scrolling"
-msgstr "Kinetické rolovanie"
-
-#: ../midori/midori-websettings.c:897
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Či naklonením zariadenia rolovať"
-
-#: ../midori/midori-websettings.c:905
-msgid "Delete old Cookies after:"
-msgstr "Zmazať staré cookies po:"
-
-#: ../midori/midori-websettings.c:906
-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
-msgid "Only accept Cookies from sites you visit"
-msgstr "Prijať cookies len z navštívených stránok"
-
-#: ../midori/midori-websettings.c:923
-msgid "Block cookies sent by third-party websites"
-msgstr "Zablokovať cookies odoslané stránkami tretích strán"
-
-#: ../midori/midori-websettings.c:937
-msgid "Delete pages from history after:"
-msgstr "Zmazať stránky z histórie po:"
-
-#: ../midori/midori-websettings.c:938
-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
-msgid "Proxy server"
-msgstr "Proxy server"
-
-#: ../midori/midori-websettings.c:954
-msgid "The type of proxy server to use"
-msgstr "Typ proxy servera"
-
-#: ../midori/midori-websettings.c:963
-msgid "HTTP Proxy Server"
-msgstr "HTTP proxy server"
-
-#: ../midori/midori-websettings.c:964
-msgid "The proxy server used for HTTP connections"
-msgstr "Nastavenie proxy serveru pre HTTP spojenie"
-
-#: ../midori/midori-websettings.c:979
-msgid "Port"
-msgstr "Port"
-
-#: ../midori/midori-websettings.c:980
-msgid "The proxy server port used for HTTP connections"
-msgstr "Nastavenie portu proxy servera pre HTTP spojenie"
-
-#: ../midori/midori-websettings.c:998
-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
-msgid "Identify as"
-msgstr "Identifikovať sa ako"
-
-#: ../midori/midori-websettings.c:1016
-msgid "What to identify as to web pages"
-msgstr "Ako sa hlási webovým stránkam"
-
-#: ../midori/midori-websettings.c:1032
-msgid "Identification string"
-msgstr "Identifikačný reťazec"
-
-#: ../midori/midori-websettings.c:1033
-msgid "The application identification string"
-msgstr "Identifikačný reťazec aplikácie"
-
-#: ../midori/midori-websettings.c:1049
-msgid "Preferred languages"
-msgstr "Uprednostňované jazyky"
-
-#: ../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 ""
-"Č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
-msgid "Clear private data"
-msgstr "Odstrániť súkromné údaje"
-
-#: ../midori/midori-websettings.c:1066
-msgid "The private data selected for deletion"
-msgstr "Osobné dáta boli označené k vymazaniu"
-
-#: ../midori/midori-websettings.c:1081
-msgid "Clear data"
-msgstr "Vymazať dáta"
-
-#: ../midori/midori-websettings.c:1082
-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
-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
-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
-msgid "Always use my font choices"
-msgstr "Vždy použiť môj výber písma"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Či tlačiť obrázky na pozadí"
 
-#: ../midori/midori-websettings.c:1148
-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:4781
+msgid "Features"
+msgstr "Funkcie"
 
-#: ../midori/midori-view.c:1375
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
 #, 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
-msgid "_Deny"
-msgstr "_Zakázať"
-
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
-msgid "_Allow"
-msgstr "_Povoliť"
+msgid "%s of %s"
+msgstr "%s z %s"
 
-#: ../midori/midori-view.c:1408
+#: ../midori/midori-download.vala:75
 #, c-format
-msgid "%s wants to know your location."
-msgstr "%s požaduje zistenie Vašej polohy."
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodín"
+msgstr[1] "%d hodina"
+msgstr[2] "%d hodiny"
 
-#: ../midori/midori-view.c:1502
+#: ../midori/midori-download.vala:76
 #, c-format
-msgid "Error - %s"
-msgstr "Chyba - %s"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minút"
+msgstr[1] "%d minúta"
+msgstr[2] "%d minúty"
 
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-download.vala:77
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Stránka '%s' sa nedá načítať."
-
-#: ../midori/midori-view.c:1505
-msgid "Try again"
-msgstr "Skúsiť znovu"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekúnd"
+msgstr[1] "%d sekunda"
+msgstr[2] "%d sekundy"
 
-#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
 #, c-format
-msgid "Send a message to %s"
-msgstr "Poslať %s správu"
-
-#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781
-msgid "Inspect _Element"
-msgstr "Preskúmať _prvok"
-
-#: ../midori/midori-view.c:2507
-msgid "Open Link in New _Tab"
-msgstr "Otvoriť odkaz na novej _karte"
-
-#: ../midori/midori-view.c:2511
-msgid "Open Link in _Foreground Tab"
-msgstr "Otvoriť odkaz v novej _karte"
-
-#: ../midori/midori-view.c:2512
-msgid "Open Link in _Background Tab"
-msgstr "Otvoriť odkaz v novej karte na pozadí"
-
-#: ../midori/midori-view.c:2515
-msgid "Open Link in New _Window"
-msgstr "Otvoriť odkaz v novom _okne"
-
-#: ../midori/midori-view.c:2518
-msgid "Open Link as Web A_pplication"
-msgstr "Otvoriť odkaz ako _webovú aplikáciu"
-
-#: ../midori/midori-view.c:2523
-msgid "Copy Link de_stination"
-msgstr "Kopírovať _cieľ odkazu"
-
-#: ../midori/midori-view.c:2539
-msgid "Open _Image in New Tab"
-msgstr "Otvoriť _obrázok na novej karte"
-
-#: ../midori/midori-view.c:2542
-msgid "Copy Image _Address"
-msgstr "Kopírovať _adresu obrázka"
-
-#: ../midori/midori-view.c:2545
-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
-msgid "Copy Video _Address"
-msgstr "Kopírovať _adresu videa"
-
-#: ../midori/midori-view.c:2558
-msgid "Save _Video"
-msgstr "Uložiť _video"
-
-#: ../midori/midori-view.c:2558
-msgid "Download _Video"
-msgstr "Stiahnuť v_ideo"
-
-#: ../midori/midori-view.c:2584
-msgid "Search _with"
-msgstr "Hľadať _pomocou"
-
-#: ../midori/midori-view.c:2616
-msgid "_Search the Web"
-msgstr "_Hľadať na webe"
+msgid " - %s remaining"
+msgstr " - %s ostáva"
 
-#: ../midori/midori-view.c:2633
-msgid "Open Address in New _Tab"
-msgstr "Otvoriť adresu v novej karte"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-view.c:2686
-msgid "Open _Frame in New Tab"
-msgstr "Otvoriť _rám na novej karte"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-view.c:2946
-msgid "Open or download file"
-msgstr "Otvoriť alebo stiahnuť súbor"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "Stiahnutý súbor obsahuje chyby."
 
-#: ../midori/midori-view.c:2966
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Typ súboru: '%s'"
+#: ../midori/midori-download.vala:221
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"Kontrolný súčet nie je zhodný s tým, ktorý bol priložený ku sťahovanému "
+"súboru. To znamená, že stiahnutý súbor pravdepodobne nie je kompletný alebo "
+"bol zmenený."
 
-#: ../midori/midori-view.c:2968
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Typ súboru: %s ('%s')"
+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-view.c:2972
-#, c-format
-msgid "File Name: %s"
-msgstr "Typ súboru: %s"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Nemáte oprávnenia k zápisu."
 
-#: ../midori/midori-view.c:2999
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "Otvoriť %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Nie je dosť miesta pre stiahnutie \"%s\"."
 
-#: ../midori/midori-view.c:3622
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Inšpekcia stránky - %s"
+msgid "The file needs %s but only %s are left."
+msgstr "Potrebuje %s, ale k dispozícií je iba %s."
 
-#: ../midori/midori-view.c:3969
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Rýchly prístup"
 
-#: ../midori/midori-view.c:3970 ../midori/midori-view.c:4066
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Kliknite pre pridanie odkazu"
 
-#: ../midori/midori-view.c:3971
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Zadajte adresu skratky"
 
-#: ../midori/midori-view.c:3972
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Zadajte titulok skratky"
 
-#: ../midori/midori-view.c:3973
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Naozaj chcete zmazať túto záložku?"
 
-#: ../midori/midori-view.c:4135
-#, 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
-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
-msgid "Page loading delayed"
-msgstr "Načítanie stránky oneskorené"
-
-#: ../midori/midori-view.c:4340
-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
-msgid "Load Page"
-msgstr "Načítať stránku"
-
-#: ../midori/midori-view.c:4507
-msgid "Blank page"
-msgstr "Prázdnu stránku"
-
-#: ../midori/midori-view.c:4769
-msgid "_Duplicate Tab"
-msgstr "Z_dvojiť kartu"
-
-#: ../midori/midori-view.c:4774
-msgid "Show Tab _Label"
-msgstr "Zobraziť _popisok karty"
-
-#: ../midori/midori-view.c:4774
-msgid "Show Tab _Icon Only"
-msgstr "Zobraziť len _ikonu karty"
-
-#: ../midori/midori-view.c:4780
-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
-msgid "previous"
-msgstr "predchádzajúce"
-
-#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5612
-msgid "next"
-msgstr "nasledujúce"
-
-#: ../midori/midori-view.c:5625
-msgid "Print background images"
-msgstr "Tlačiť obrázky na pozadí"
-
-#: ../midori/midori-view.c:5626
-msgid "Whether background images should be printed"
-msgstr "Či tlačiť obrázky na pozadí"
-
-#: ../midori/midori-view.c:5658
-msgid "Features"
-msgstr "Funkcie"
-
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Spustenie"
 
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Pri spustení Midori:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Domovská stránka:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Použiť _aktívnu stránku"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Použiť aktuálnu ako domovskú stránku"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Písma"
 
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Proporcionálne písmo"
 
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Predvolená rodina písma použitá pre zobrazenie textu"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Predvolená veľkosť písma použitá pre zobrazenie textu"
 
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Rodina neproporciálneho písma"
 
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Písmo použité pri zobrazovaní písma z rovnakou šírkou písmen"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
-msgstr "Veľkosť písma použitá pre zobrazovanie písma s rovnakou šírkou písmen"
+msgstr ""
+"Veľkosť písma použitá pre zobrazovanie písma s rovnakou šírkou písmen"
 
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Minimálna veľkosť písma"
 
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Minimálna veľkosť písma použitá na zobrazenie textu"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Preferované kódovanie"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Správanie"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Automaticky načítať obrázky"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Povoliť kontrolu pravopisu"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Povoliť skripty"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "Povoliť podporu WebGL"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zväčšovať text aj obrázky"
+
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "Povoliť skriptom otvárať vyskakovacie okná"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Či skripty môžu otvárať vyskakovacie okná automaticky"
 
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Predvolená úroveň priblíženia"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Uprednostňované jazyky"
+
+#: ../midori/midori-preferences.c:426
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"Čiarkou oddelený zoznam jazykov pre viacjazyčné weby, napríklad \"de\", "
+"\"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Uložiť stiahnuté súbory do:"
+
 #. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Prehliadanie"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Štýl panelu s nástrojmi:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Otvárať nové stránky v:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "Správanie novej karty:"
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Zatváracie tlačidlá na kartách"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Otvoriť karty vedľa aktívnej"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Otvárať karty na pozadí"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Textový editor"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Čítačka RSS"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Sieť"
 
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Počítač"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Proxy server"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "Podporované typy proxy:"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Vyrovnávacia pamäť stránok"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Maximálna veľkosť vyrovnávacej pamäte stránok na disku"
+
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:902
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Identifikovať sa ako"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Súkromie"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Zmazať staré cookies po:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Maximálny počet dní, pre ktoré sú cookies platné"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Prijať cookies len z navštívených stránok"
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Zablokovať cookies odoslané stránkami tretích strán"
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"V cookies sa ukladajú prihlasovacie údaje, zostavy hier alebo používateľské "
+"dáta pre reklamu."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Povoliť cache pre offline aplikácie"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "Povoliť miestne úložisko pre HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+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-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Zmazať stránky z histórie po:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+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-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Rozšírenia"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Správca vyhľadávacích modulov"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Pridať vyhľadávací modul"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Upraviť vyhľadávací modul"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Názov:"
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Poznámka:"
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresa:"
 
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Token:"
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Správca vyhľadávacích modulov"
 
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Použiť ako _predvolený"
 
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Otvoriť pomocou"
+#: ../midori/midori-searchaction.c:1619
+#, 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/sokoke.c:362
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Vyberte aplikáciu alebo príkaz pre otvorenie \"%s\":"
+msgid "The search engines couldn't be saved. %s"
+msgstr "Vyhľadávače sa nepodarilo uložiť. %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 "Nie je možné spustiť externý program"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Záložky a história"
 
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hodín"
-msgstr[1] "%d hodina"
-msgstr[2] "%d hodiny"
+msgid "Search for %s"
+msgstr "Hľadať %s"
 
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minút"
-msgstr[1] "%d minúta"
-msgstr[2] "%d minúty"
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/sokoke.c:1597
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekúnd"
-msgstr[1] "%d sekunda"
-msgstr[2] "%d sekundy"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Hľadať pomocou…"
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s z %s"
+msgid "Search with %s"
+msgstr "Hľadať s %s"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Otvoriť pomocou"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Vyberte aplikáciu alebo príkaz pre otvorenie \"%s\":"
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
-#, c-format
-msgid " - %s remaining"
-msgstr " - %s ostáva"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Nie je možné spustiť externý program"
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "Neplatná URI"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "_Rýchle hľadanie"
 
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Predchádzajúce"
 
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Ďalšie"
 
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Rozlišovať veľkosť písma"
 
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Zvýrazniť"
-
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Zatvoriť vyhľadávaciu lištu"
 
-#: ../toolbars/midori-transferbar.c:122
-#, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Súbor '<b>%s</b>' bol stiahnutý."
-
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Prenos dokončený"
-
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "Stiahnutý súbor obsahuje chyby."
-
-#: ../toolbars/midori-transferbar.c:194
-msgid ""
-"The checksum provided with the link did not match. This means the file is "
-"probably incomplete or was modified afterwards."
-msgstr ""
-"Kontrolný súčet nie je zhodný s tým, ktorý bol priložený ku sťahovanému "
-"súboru. To znamená, že stiahnutý súbor pravdepodobne nie je kompletný alebo "
-"bol zmenený."
-
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "Zmazať všetko"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
-msgid "Some files are being downloaded"
-msgstr "Ešte sa sťahujú nejaké súbory"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:377
-msgid "_Quit Midori"
-msgstr "_Ukončiť Midori"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Prázdny priečinok"
 
-#: ../toolbars/midori-transferbar.c:379
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Ukončením Midori budú prenosy zrušené."
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Priečinok obsahuje %s a žiadne záložky"
 
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Záložky"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Priečinok obsahuje %s"
 
-#: ../panels/midori-bookmarks.c:257
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Záložku sa nepodarilo pridať: %s\n"
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:435
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Upraviť vybranú záložku"
 
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Vymazať označenú záložku"
 
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Pridať nový priečinok"
 
-#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Oddeľovač</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otvoriť na novej _karte"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Hľadať v záložkách"
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "História"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Dnes"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Včera"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2177,42 +1988,35 @@ 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Pred týždňom"
 
-#: ../panels/midori-history.c:232
+#: ../panels/midori-history.c:185
 #, 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:360
+#: ../panels/midori-history.c:312
 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:358
 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:367
 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:375
 msgid "Clear the entire history"
 msgstr "Zmazať celú históriu"
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
-msgstr "Prenosy"
-
-#: ../panels/midori-transfers.c:469
-msgid "Open Destination _Folder"
-msgstr "Otvoriť cieľový _priečinok"
-
-#: ../panels/midori-transfers.c:472
-msgid "Copy Link Loc_ation"
-msgstr "Kopírovať _umiestnenie"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "História hľadania"
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2236,192 +2040,151 @@ msgstr "Heslo"
 msgid "_Remember password"
 msgstr "Zapamätať _heslo"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Ikona „%s“ nemôže byť načítaná"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Uložená ikona „%s“ nemôže byť načítaná"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Snímky animácie sú porušené"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Žiadne"
 
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:529
 #, 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:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Vyberte súbor"
 
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Vyberte priečinok"
 
-#: ../katze/katze-utils.c:610
-msgid "None"
-msgstr "Žiadne"
-
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 hodine"
 
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 dni"
 
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 týždni"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 mesiaci"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 roku"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Predvoľby pre %s"
 
-#: ../extensions/adblock.c:473
-msgid "Configure Advertisement filters"
-msgstr "Nastaviť filtre na reklamu"
-
-#: ../extensions/adblock.c:504
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Vložte adresu dopredu pripravených filtrov do textového poľa a kliknutím na "
-"\"Pridať\" ju pridáte do zoznamu. Viac pripravených filtrov nájdete na "
-"adrese %s."
-
-#: ../extensions/adblock.c:882
-msgid "Edit rule"
-msgstr "Upraviť pravidlo"
-
-#: ../extensions/adblock.c:896
-msgid "_Rule:"
-msgstr "_Pravidlo:"
-
-#: ../extensions/adblock.c:950
-msgid "Bl_ock image"
-msgstr "_Blokovať obrázok"
-
-#: ../extensions/adblock.c:955
-msgid "Bl_ock link"
-msgstr "_Blokovať odkaz"
-
-#: ../extensions/adblock.c:1670
-msgid "Advertisement blocker"
-msgstr "Blokovač reklamy"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "Kontrolný súčet MD5:"
 
-#: ../extensions/adblock.c:1671
-msgid "Block advertisements according to a filter list"
-msgstr "Blokovať reklamy podľa zoznamu filtorv"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "Kontrolný súčet SHA1"
 
 #. 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?"
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Zdá sa, že na práve prezeranej stránke je používateľský skript. Má sa "
 "spustiť jeho inštalácia?"
 
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
 msgid "_Install user script"
 msgstr "_Inštalovať používateľský skript"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
 msgid "This page appears to contain a user style. Do you wish to install it?"
 msgstr ""
 "Zdá sa, že na práve prezeranej stránke je používateľský štýl. Má sa spustiť "
 "jeho inštalácia?"
 
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
 msgid "_Install user style"
 msgstr "_Inštalovať používateľský štýl"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Neinštalovať"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Užívateľské skripty"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Užívateľské štýly"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Chyba"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "Želáte si zmazať '%s'?"
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Zmazať používateľský skript"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Zmazať používateľský skript"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Súbor <b>%s</b> bude zmazaný."
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Otvoriť v textovom editore"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Otvoriť cieľový priečinok"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Pridať nový plugin"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Odstrániť vybraný plugin"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Používateľove rozšírenia"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Nemôžem sledovať priečinok: '%s': %s"
 
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Podpora pre userscripts a userstyles"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Ofarebné karty"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Ofarbiť každú kartu samostatne"
 
@@ -2430,11 +2193,11 @@ msgstr "Ofarbiť každú kartu samostatne"
 msgid "Cookie Manager"
 msgstr "Správca cookies"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Odstrániť všetky"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2442,31 +2205,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:116
 msgid "Expand All"
 msgstr "Rozbaliť všetko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Zbaliť všetko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Otázka"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 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:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2483,15 +2246,16 @@ msgstr ""
 "<b>Bezpečný</b>: %s\n"
 "<b>Vyprší</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Áno"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nie"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2500,74 +2264,129 @@ msgstr ""
 "<b>Doména</b>: %s\n"
 "<b>Cookies</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Názov"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Rozbaliť všetko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Zbaliť všetko"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Vložte reťazec, podľa ktorého sa budú cookies filtrovať. Filtruje sa podľa "
-"názvu alebo domény"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Hľadať cookies podľa názvu alebo domény"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
 msgstr "Zoznam, detaily a mazanie cookies"
 
-#: ../extensions/copy-tabs.c:38
+#: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
 msgstr "Kopírovať _adresu karty"
 
-#: ../extensions/copy-tabs.c:95
+#: ../extensions/copy-tabs.c:96
 msgid "Copy Addresses of Tabs"
 msgstr "Kopírovať adresy z kariet"
 
-#: ../extensions/copy-tabs.c:96
+#: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopíruje adresy všetkých kariet do schránky"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Nepodarilo sa nájsť požadované prvky Atom \"entry\" v dátach XML."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Nepodarilo sa nájsť požadované prvky Atom \"feed\" v dátach XML."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:387
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Posledná aktualizácia: %s"
 
-#: ../extensions/feed-panel/feed-panel.c:653
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Kanály"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Pridať nový kanál"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Odstrániť kanál"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Kanály"
 
@@ -2576,60 +2395,60 @@ msgstr "_Kanály"
 msgid "Failed to find root element in feed XML data."
 msgstr "Chyba pri hľadaní koreňového elementu v XML dátach."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Nepodporovaný formát kanálu."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Zlyhalo načítanie XML kanála: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Nepodarilo sa nájsť prvok \"channel\" v RSS dátach XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Našla sa nepodporovaná verzia RSS"
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Nepodarilo sa nájsť požadované prvky RSS \"item\" v dátach XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Nepodarilo sa nájsť požadované prvky RSS \"channel\" v dátach XML."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Kanál \"%s\" je už pridaný"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Chyba pri načítavaní kanálu \"%s\""
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Panel kanálov"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Čítač Atom/RSS kanálov"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, 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
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
 msgstr "História formulára"
 
-#: ../extensions/formhistory/formhistory.c:112
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
@@ -2637,758 +2456,1036 @@ msgstr ""
 "Pre otvorenie databázy hesiel je požadované \n"
 "hlavné používateľské meno a heslo"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Zapamätať si heslo pre túto stránku?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Zapamätať"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Teraz nie"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Nikdy pre túto stránku"
 
-#: ../extensions/formhistory/formhistory.c:437
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Stav prepnutia histórie formulárov"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 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
-#, 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
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "Aktivovať len históriu formulárov cez horúcu klávesu (Ctrl+Shift+F) na karte"
 
-#: ../extensions/formhistory/formhistory.c:668
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Ukladanie hodnôt vo formulári"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 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/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Nepodarilo sa vybrať návrh\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Žiadne nenavštívené karty"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Zoznam histórie"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Správanie zatvárania kariet"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Nerobiť nič"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Prepnúť na naposledy zobrazenú kartu"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Prepnúť na najnovšiu kartu"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Zablysnúť oknom prehliadača pri kartách na pozadí"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Ďalšia nová karta (v histórii)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Zvolí ďalšiu novú kartu z histórie"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Predchádzajúca nová karta (v histórii)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Zvolí predchádzajúcu novu kartu z histórie"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Zobraziť kartu v pozadí (Zoznam histórie)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Zobraziť aktuálne zvolenú kartu v pozadí"
 
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "História"
 
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Pri prepínaní alebo zatváraní presunúť na naposledy použitú kartu"
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
-msgstr "Gesta myšou"
-
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
-msgstr "Ovládanie Midori pomocou myši"
-
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "Obnoviť stránku alebo zastaviť načítanie"
-
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
-msgstr "Nastavenie klávesových skratiek"
-
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts…"
-msgstr "Nastavenie skratky…"
-
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
-msgstr "Skratky"
-
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "Zobraziť a upraviť klávesové skratky"
-
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
-msgstr "Hodiny v stavovom riadku"
-
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
-msgstr "Zobrazuje dátum a čas v stavovom riadku"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:131
-msgid "Images"
-msgstr "Obrázky"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:140
-msgid "Scripts"
-msgstr "Skritpy"
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:151
-msgid "Netscape plugins"
-msgstr "Pluginy Netscape"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:199
-msgid "Statusbar Features"
-msgstr "Rožšírenie stavového riadka"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:200
-msgid "Easily toggle features on web pages on and off"
-msgstr "Jednoducho zapína a vypína rozšírenia webových stránok"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
 
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
-msgid "Tab Panel"
-msgstr "Panel záložiek"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/tab-panel.c:663
-msgid "T_ab Panel"
-msgstr "Panel _záložiek"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/tab-panel.c:681
-msgid "Show tabs in a vertical panel"
-msgstr "Zobraziť karty vo vertikálnom panely"
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "Na kartách zobrazovať len ikony"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "Nové karty nebudú mať popisok"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:393
-msgid "Customize Toolbar"
-msgstr "Upraviť panel"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/nojs/nojs-preferences.c:866
 msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
 msgstr ""
-"Vybrané položky sa zobrazia na lište. Zmenu poradia vykonáte spôsobom "
-"\"potiahni a pusť\"."
 
-#: ../extensions/toolbar-editor.c:425
-msgid "Available Items"
-msgstr "Dostupné položky"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:446
-msgid "Displayed Items"
-msgstr "Zobrazené položky"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar…"
-msgstr "Upraviť _panel…"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize…"
-msgstr "_Vlastný…"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:627
-msgid "Toolbar Editor"
-msgstr "Editor panelu nástrojov"
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:628
-msgid "Easily edit the toolbar layout"
-msgstr "Umožňuje jednoducho zmeniť panel"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Kešuje (ukladá) HTTP komunikáciu na disk"
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
 
-#~ msgid "The bookmarks couldn't be saved. %s"
-#~ msgstr "Záložky sa nepodarilo uložiť. %s"
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Vybraný konfiguračný priečinok nie je platný."
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#~ msgid "Cookies"
-#~ msgstr "Cookies"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Cookies z Flash"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 _databázy"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "Vyrovnávacia pamäť offline aplikácie"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "Ľahký internetový prehliadač"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
 
-#~ msgid "Not available: %s"
-#~ msgstr "Nie je k dispozícii: %s"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Nie sú nainštalované súbory so zdrojom"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
 
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Neukladať pri prehliadaní žiadne súkromné dáta"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
 
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Pridať odkaz do rýchleho prístupu"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
 
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Pridá záložku na plochu"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
 
-#~ msgid "Create a launcher"
-#~ msgstr "Vytvoriť spúšťač"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
 
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Pridá tento kanál do odoberaných kanálov"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
 
-#~ msgid "Close this window"
-#~ msgstr "Zatvoriť toto okno"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
 
-#~ msgid "Close all open windows"
-#~ msgstr "Zatvoriť všetky otvorené okná"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
 
-#~ msgid "Undo the last modification"
-#~ msgstr "Vrátiť poslednú zmenu"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
 
-#~ msgid "Redo the last modification"
-#~ msgstr "Znova použiť poslednú zmenu"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
 
-#~ msgid "Cut the selected text"
-#~ msgstr "Vystrihnúť vybraný text"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
 
-#~ msgid "Copy the selected text"
-#~ msgstr "Kopírovať vybraný text"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
 
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Prilepiť vybraný text"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
 
-#~ msgid "Delete the selected text"
-#~ msgstr "Odstrániť označený text"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
 
-#~ msgid "Select all text"
-#~ msgstr "Vybrať všetok text"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
 
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Hľadať ďalší výskyt slova alebo frázy"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Hľadať predchádzajúce slovo alebo frázu"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
 
-#~ msgid "Reset the zoom level"
-#~ msgstr "Nastaviť pôvodné priblíženie"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "View the source code of the page"
-#~ msgstr "Zobraziť zdrojový kód stránky"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
 
-#~ msgid "Scroll to the left"
-#~ msgstr "Posunúť pohľad vľavo"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
 
-#~ msgid "Scroll down"
-#~ msgstr "Posunúť pohľad dole"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
 
-#~ msgid "Scroll up"
-#~ msgstr "Posunúť pohľad hore"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
 
-#~ msgid "Scroll to the right"
-#~ msgstr "Posunúť pohľad vpravo"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Zmaže zoznam zatvorených kariet"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Otvoriť naposledy zatvorenú kartu"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Pridať nový priečinok do záložiek"
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Gesta myšou"
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Pridáva, upravuje a maže vyhľadávacie moduly…"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Ovládanie Midori pomocou myši"
 
-#~ msgid "Clear private data…"
-#~ msgstr "Odstráni súkromné údaje…"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Obnoviť stránku alebo zastaviť načítanie"
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Zobrazí stránku vo vývojárskom nástroji…"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Nastavenie klávesových skratiek"
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Prepnúť na predchádzajúcu kartu"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Nastavenie skratky…"
 
-#~ msgid "Switch to the next tab"
-#~ msgstr "Prepnúť na nasledujúcu kartu"
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Skratky"
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Presunie kartu za predchádzajúcu"
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Zobraziť a upraviť klávesové skratky"
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Presunie kartu pred nasledujúcu"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "Hodiny v stavovom riadku"
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Zameria aktuálnu kartu"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Zobrazuje dátum a čas v stavovom riadku"
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "Prepnúť na ďalší pohľad v poradí"
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Obrázky"
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Zobraziť iba ikonu aktuálnej karty"
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skritpy"
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Obsah aktuálnej karty otvorí v novej karte"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Pluginy Netscape"
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Zatvorí všetky karty okrem aktuálnej"
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Povoliť pluginy z Netscape (Mozilly)"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Otvorí karty uložené pri poslednom sedení"
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Rožšírenie stavového riadka"
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Zobraziť Často kladené otázky"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Jednoducho zapína a vypína rozšírenia webových stránok"
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Otvorí stránku pre hlásenie chýb"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Panel záložiek"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Zobrazí informácie o programe"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Panel _záložiek"
 
-#~ msgid "Show menubar"
-#~ msgstr "Zobraziť panel ponuky"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Zobraziť karty vo vertikálnom panely"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Zobraziť navigačný panel"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Na kartách zobrazovať len ikony"
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Zobraziť bočný panel"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Nové karty nebudú mať popisok"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Zobraziť panel záložiek"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Upraviť panel"
 
-#~ msgid "Show statusbar"
-#~ msgstr "Zobraziť stavový riadok"
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Vybrané položky sa zobrazia na lište. Zmenu poradia vykonáte spôsobom "
+"\"potiahni a pusť\"."
 
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Kontrolný súčet MD5:"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Dostupné položky"
 
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Kontrolný súčet SHA1"
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Zobrazené položky"
 
-#~ msgid "No filename specified"
-#~ msgstr "Nebol zadaný názov súboru"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "Upraviť pane_l nástrojov…"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Zmeniť počet stĺpcov a riadkov"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Editor panelu nástrojov"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Vložte počet stĺpcov a riadkov"
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Umožňuje jednoducho zmeniť panel"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Nesprávna hodnota veľkosti rýchleho prístupu"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Odstrániť súkromné údaje"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Veľkosť náhľadov:"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Odstrániť súkromné údaje"
 
-#~ msgid "Small"
-#~ msgstr "Malá"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Odstrániť nasledujúce údaje:"
 
-#~ msgid "Medium"
-#~ msgstr "Stredná"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Naposledy otvorené _karty"
 
-#~ msgid "Big"
-#~ msgstr "Veľká"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Odstrániť súkromné údaje pri _ukončení Midori"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "Vymazať posledne _sedenie"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Uložené _prihlasovacie mená a heslá"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Nenašlo sa - %s"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookies a dáta webstránky"
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokument nemôže byť zobrazený"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikony webových stránok"
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Vynútiť 96 bodov na palec"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "_Blokovanie reklamy"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Nepodarilo sa zmazať históriu: %s\n"
 
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "Prepnúť karty zoradené podľa posledného použitia pomocou Ctrl+Tab"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Nepodarilo sa odstrániť staré položky histórie: %s\n"
 
-#~ msgid "Web Cookies"
-#~ msgstr "Webové Cookies"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Záložku sa nepodarilo pridať: %s\n"
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Odstrániť súkromné údaje pri _ukončení Midori"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Nepodarilo sa spustiť databázový príkaz\n"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#~ msgid "All cookies"
-#~ msgstr "Všetky cookies"
+#: ../midori/midori-session.c:217
+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é."
 
-#~ msgid "Session cookies"
-#~ msgstr "Cookies sedenia"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Nastavenie sa nepodarilo uložiť. %s"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Zobraziť stav prenosu"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Zoznam zavretých kariet sa nepodarilo uložiť %s"
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Zobrazovať výsledky hľadania pri zadávaní adresy"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Zobrazovanie výsledkov vyhľadávania pri zadávaní adresy"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Zmeniť _predvoľby"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Zobraziť zoznam nástrojov"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Zakázať všetky _rozšírenia"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Má zobrazovať zoznam nástrojov?"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Zobrazí dialóg po spadnutí Midori"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Zobraziť rýchly prístup na nových kartách"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Zahodiť staré karty"
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Zobrazí rýchly prístup v novo otvorených kartách"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#~ msgid "Download Manager"
-#~ msgstr "Správca sťahovania"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#~ msgid "An external download manager"
-#~ msgstr "Externý správca sťahovania"
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Midori síce beží, ale neodpovedá.\n"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Otvárať externé stránky v:"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Záložky nemôžu byť načítané: %s\n"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Kde sa budú otvárať externé stránky"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sedenie nie je možné načítať: %s\n"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Povoliť cookies"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Zatvorené karty nemôžu byť načítane: %s\n"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Ktorý typ cookies prijímať"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Históriu nie je možné načítať: %s\n"
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "Uchovávať cookies maximálne"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Došlo k nasledujúcim chybám:"
 
-#~ msgid "Maximum history age"
-#~ msgstr "Maximálna dĺžka histórie"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Ignorovať"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Pamätať si naposledy stiahnuté súbory"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "General"
-#~ msgstr "Hlavné"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Appearance"
-#~ msgstr "Vzhľad"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "Font settings"
-#~ msgstr "Nastavenia písma"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Rozhranie"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "Navigationbar"
-#~ msgstr "Navigačný panel"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s z %s"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Karta histórie"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Karta histórie"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Nepodarilo sa vybrať z histórie\n"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% načítaný"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Quit the application"
-#~ msgstr "Ukončiť aplikáciu"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "_Contents"
-#~ msgstr "_Obsah pomocníka"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "Show the documentation"
-#~ msgstr "Zobraziť dokumentáciu"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "_Transferbar"
-#~ msgstr "Stav _prenosu"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Show transferbar"
-#~ msgstr "Zobraziť stav prenosu dát"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Nedávno navštívené stránky"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Znovu otvorí stránky, ktoré ste už navštívili"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Oddeliť vybraný panel od okna"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "Hide operating controls"
-#~ msgstr "Schovať ovládacie prvky"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "Show Blank page"
-#~ msgstr "Zobraziť prázdnu stránku"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Zobraziť priebeh v riadku adresy"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Spýtať sa na cieľový priečinok"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "Original cookies only"
-#~ msgstr "Len originálne cookies"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Zapamätať si naposledy navštívené stránky"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Zistiť proxy server automaticky"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Povolí automatické zisťovanie proxy servera"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "_Save Link destination"
-#~ msgstr "_Uložiť cieľ odkazu"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "_Download Link destination"
-#~ msgstr "_Stiahnuť cieľ odkazu"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Stiahnuť pomocou _správcu sťahovania"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid "Download I_mage"
-#~ msgstr "Stiahnuť o_brázok"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "_Restore Tab"
-#~ msgstr "_Obnoviť kartu"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimalizovať kartu"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Aplikácie"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Kontrola pravopisu"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Slovníky pre kontrolu pravopisu:"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. "
-#~ "\"sk_SK, en_GB\""
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Applications"
-#~ msgstr "Aplikácie"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "Externé aplikácie"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ msgid "Console"
-#~ msgstr "Konzola"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Vytvoriť _spúšťač"
 
-#~ msgid "Copy _All"
-#~ msgstr "Kopírovať _všetko"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid "Copy All"
-#~ msgstr "Kopírovať všetko"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Chyba v nastavení času"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Prenosy"
 
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Hodiny meškajú. Skon"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Zmazať všetko"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "Správca _cookies"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "Užívateľská stránka"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Otvoriť cieľový _priečinok"
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Užívateľská stránka"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopírovať _umiestnenie"
 
-#~ msgid "Minimize new Tabs"
-#~ msgstr "Minimalizovať otvorené karty"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Súbor '<b>%s</b>' bol stiahnutý."
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Zmeniť počet záložiek"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Vložte počet záložiek"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Prenos dokončený"
 
-#~ msgid "Open _Link"
-#~ msgstr "Otvoriť _odkaz"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Ešte sa sťahujú nejaké súbory"
 
-#~ msgid "Open Image in New Wi_ndow"
-#~ msgstr "Otvoriť obrázok v novom o_kne"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "_Ukončiť Midori"
 
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Skopíruje užívateľské skripty do priečinka %s a užívateľské štýly do "
-#~ "priečinka %s"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Ukončením Midori budú prenosy zrušené."
 
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Nepodarilo sa zistiť aktuálny čas: %s\n"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Zobraziť _titulky panelov"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Options"
-#~ msgstr "Voľby"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "Not available on this platform"
-#~ msgstr "Nie je k dispozícii pre túto platformu"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "View Selection Source"
-#~ msgstr "Zobraziť zdrojový kód výberu"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Zobraziť zdrojový kód vybraného textu"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Pamätať si vložený text"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Povoli pamätanie si vloženého textu do vstupných polí"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Veľkosť vyrovnávacej pamäte (cache)"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Povolená veľkosť vyrovnávacej pamäte"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Encoding"
-#~ msgstr "Kódovanie"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Kódovanie, ktoré sa použije ako predvolené"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Automaticky zmenšovať obrázky"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Automaticky zmenší obrázky, aby sa zmestili"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Roztiahnuteľné oblasti pre text"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Povolí rozťahovanie textových oblastí podľa potreby"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Povoliť vývojárske nástroje"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Povoliť špeciálne rozšírenia pre vývojárov"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "User_styles"
-#~ msgstr "_Užívateľské štýly"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Tint tabs distinctly"
-#~ msgstr "Ofarbiť karty"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Oboje"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Oboje vodorovne"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Načítať pri spustení"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Rýchle hľadanie"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Blokovač reklamy"
 
-#~ msgid "P_lugins"
-#~ msgstr "P_luginy"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blokovať reklamy podľa zoznamu filtorv"
 
-#~ msgid "_Enable"
-#~ msgstr "_Povolené"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Nastaviť filtre na reklamu"
 
-#~ msgid "Enable"
-#~ msgstr "Povolené"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "_Blokovať obrázok"
 
-#~ msgid "_Disable"
-#~ msgstr "_Zakázané"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "_Blokovať odkaz"
 
-#~ msgid "Disable"
-#~ msgstr "Zakázané"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Upraviť pravidlo"
 
-#~ msgid "Plugins"
-#~ msgstr "Pluginy"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Pravidlo:"
diff --git a/po/sl.po b/po/sl.po
new file mode 100644 (file)
index 0000000..2ba0ef3
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,3429 @@
+# Slovenian translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-29 23:11+0000\n"
+"Last-Translator: Rok Fajfar <Unknown>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2014-12-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Spletni brskalnik"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Brskalnik Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Brskajte po spletu"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Nov zavihek"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Novo okno"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Novo zasebno okno"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Zasebno brskanje Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Zasebno brskanje"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Odprite novo okno zasebnega brskanja"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Posnetek shranjen v: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Poženi NASLOV kot spletno aplikacijo"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "NASLOV"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Uporabi MAPO kot mapo za nastavitve"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "MAPA"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Zasebno brskanje, nobene spremembe ne bodo shranjene"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Prenosni način, vse runtime datoteke so shranjene na enem mestu"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Samostojni GTK+ okna z WebKit, sorodno GtkLauncher-ju"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "Pokaži diagnostično okno"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "Poženi znotraj gdb in shrani podrobnosti ob sesutju"
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Poženi navedeno datoteko kot JavaScript skripto"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr "Naredi posnetek navedenega URI-ja"
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Izvedi navedeni ukaz"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Izpiši razpoložljive ukaze za zagon s -e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Pokaži različico programa"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Naslovi"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blokiraj URI-je po sledečem regularnem izrazu VZOREC"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "VZOREC"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Ponastavi Midori po SECONDS sekundah odsotnosti"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SEKUNDE"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Napaka: \"gdb\" ni mogoče najti\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Prosim poročaj komentarje, predloge in hrošče:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Preveri za nove različice:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Prišlo je do neznane napake"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Zaznamki"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Dodaj Zaz_namek"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Razširitve"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Zgodovina"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "_Uporabniške skripte"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Uporabnikovi_stili"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Nov _zavihek"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "_Prenosi"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape v_tičniki"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "_Zaprti zavihki"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "Novo _okno"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Nova _mapa"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Naslovi]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Datoteke ni mogoče najti."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Popačen dokument."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Neprepoznaven format zaznamka."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Pojdi naprej na naslednjo stran"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Pojdi na naslednjo pod-stran"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Spletno iskanje..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Znova naloži trenutno stran"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Ustavi nalaganje trenutne strani"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Posodobitev naziva ni uspela: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Vrednost '%s' je neveljavna za %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Nepričakovana nastavitev '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Nepričakovano dejanje '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Zasebno brskanje)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Vstavljanje zgodovinskega elementa ni uspelo: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Izberi [besedilo]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Zaznamki"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Nova mapa"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Uredi mapo"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Nov zaznamek"
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Uredi zaznamek"
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Določi ime in lokacijo zaznamka."
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Določi ime in lokacijo mape."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Pokaži v Menuju_Zaznamki"
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Dodaj pod _Hitri Dostop"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Shrani datoteko kot"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Odprlo se je novo okno"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Odprl se je nov zavihek"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Napaka ob odpiranju slike!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Označene slike ne morem odpreti v privzetem pregledovalniku."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Napaka pri prenosu slike!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Prenos slike je onemogočen."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Shrani datoteko"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Odpri datoteko"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Nov vir"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Dodaj nov zaznamek"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Prazno"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Odp_ri v novem oknu"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "_Program:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Uvozi iz datoteke"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Martin Srebotnjak https://launchpad.net/~miles\n"
+"  Rok Fajfar https://launchpad.net/~rfajfar\n"
+"  Tine Jozelj https://launchpad.net/~tine1386\n"
+"  t r https://launchpad.net/~t333to"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Odpri novo okno"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Odpri nov zavihek"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr "Novo okno _zasebnega brskanja"
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Odpri datoteko"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Shrani v datoteko ..."
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "_Zapri zavihek"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Zapri trenutni zavihek"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "_Zapri okno"
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Natisni trenutno stran"
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr "Na strani poišči besedo ali izraz"
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr "Najdi _naslednje"
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr "Najdi _predhodne"
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr "_Orodne vrstice"
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr "_Nabor znakov"
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Domača stran"
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Izprazni smeti"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr "_Predhodni zavihek"
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr "_Naslednji zavihek"
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "Po_moč"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "O_rodja"
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "_Vrstica stanja"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Samodejno"
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr "Korejsko (EUC-KR)"
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Zahodno (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr "_Meni"
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr "Meni"
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Pokaži zadnje odprte zavihke"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Pokaži zadnje zavihke brez nalaganja"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "Nov zavihek"
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "Novo okno"
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikone"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Majhne ikone"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Besedilo"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Ikone in besedilo"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Besedilo ob ikonah"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Dovoli"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Poskusite znova"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Odpri povezavo v novem _zavihku"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Odpri povezavo v _novem oknu"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "_Preišči splet"
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Preuči _predmet"
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Odpri %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Prazna stran"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr "%s od %s"
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Domača stran:"
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr "Pisave"
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr "Najmanjša velikost pisave"
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Vedenje"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Omogoči preverjanje črkovanja"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Brskanje"
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Urejevalnik besedil"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Omrežje"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Vrata"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Zasebnost"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Omogoči predpomnilnik za brskanje vsebine brez povezave"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr "Dodaj iskalnik"
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Opis:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "N_aslov:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr "Išči %s"
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Odpri z"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Ujemanje velikosti črk"
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Odpri v novem _zavihku"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Zgodovina"
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Danes"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Včeraj"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "Potrebna je overitev"
+
+#: ../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 "Uporabniško ime"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "Geslo"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "_Zapomni si geslo"
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "Izberite datoteko"
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr "Izbor mape"
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Napaka"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr "Izbriši vse"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr "Razširi vse"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Zloži vse"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Vprašanje"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr "Da"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr "Ne"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Ime"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr "_Razširi vse"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr "_Zloži vse"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr "Viri"
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr "Zgodovina obrazcev"
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "Pomni"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Ne zdaj"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr "Ne stori ničesar"
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Tipkovne bližnjice"
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Slike"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Skripti"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Razpoložljivi predmeti"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Urejevalnik orodnih vrstic"
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Počisti zasebne podatke"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikone spletišč"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Onemogoči vse _razširitve"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Zavrzi stare zavihke"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Prezri"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Prenosi"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Počisti vse"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopiraj mesto _povezave"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Prenos je zaključen"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Uredi pravilo"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
new file mode 100644 (file)
index 0000000..21fedb1
--- /dev/null
+++ b/po/sq.po
@@ -0,0 +1,3428 @@
+# Albanian translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-04-08 16:38+0000\n"
+"Last-Translator: Indrit Bashkimi <indrit.bashkimi@gmail.com>\n"
+"Language-Team: Albanian <sq@li.org>\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-Launchpad-Export-Date: 2015-04-09 05:14+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Shfletues Interneti"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori - Shfletuesi i Internetit"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Shfleto Internetin"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Skedë e re"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Dritare e re"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Dritare e re shfletuesi privat"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Shfletuesi Privat Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Shfletuesi Privat"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Hap një dritare të re për shfletim privat"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADRESA"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Shfletimi Privat, ndryshimet nuk janë ruajtur"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Ekzekuto komandën e përcaktuar"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Shfaq versionin e programit"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Adresat"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "MODELI"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "Gabim: \"gdb\" nuk mund të gjendet\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Kontrollo për versione të reja në:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Ndesha në një gabim të panjohur"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Shto Boo_kmark"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "_Prapashtesat"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Historia"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Tabelë e _Re"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Dritare e re"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "_Dosje e re"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Skedari nuk u gjet."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "Ueb Kërkim ..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Rifresko faqen e tanishme"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Ndalo ngarkimin e faqes së tanishme"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Deshtoj ne perditesimin title: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Vlera '%s' është e pavlefshme për %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Shfletim Privat)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Dosje e re"
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Ndryshoje dosjen"
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Shkruaj një emër për këtë dosje, dhe zgjidh ku ta mbash atë."
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Ruaj file si"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Një dritare e re është hapur"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Gabim gjatë hapjes së imazhit!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Gabim gjatë shkarkimit të imazhit!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Ruaj skedarin"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Hap një skedar"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Bosh"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Hap në një _dritare të re"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Importo nga një skedar XBEL ose HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Importo nga një skedar"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr "Shiko about:version për informacione mbi versionin."
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Gim  https://launchpad.net/~g1m\n"
+"  Indrit Bashkimi https://launchpad.net/~indritbsh\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  ing.tani https://launchpad.net/~ing-tani"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Dyfisho skedën aktuale"
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Skedari"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Hap një dritare të re"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Hap një skedë të re"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Hap një skedar"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr "_Ruaje faqen si..."
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Ruaje në një skedar"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr "_Gjej..."
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr "Shiko b_urimin"
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr "Boshatis koshin"
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr "Shto një _dosje të re"
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Ndihmë"
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr "_Ndarës"
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr "Jo e verifikuar"
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr "Lidhje e verifikuar dhe e shifruar"
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Shfaq skedat e hapura së fundmi"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikona"
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr "Ikona të vogla"
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Tekst"
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr "Ikona dhe tekst"
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr "Tekst përbri ikonave"
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Moho"
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "_Lejo"
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s dëshiron të dijë vendndodhjen tënde"
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Provo përsëri"
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Provo përsëri"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Hap lidhjen në një _skedë të re"
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Hap lidhjen në një _dritare të re"
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr "Ru_aj si..."
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Ruaj i_mazhin"
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Kërko _me"
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Emri i skedarit: %s"
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Madhësia: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Hap %s"
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d orë"
+msgstr[1] "%d orë"
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutë"
+msgstr[1] "%d minuta"
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekondë"
+msgstr[1] "%d sekonda"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Skedari \"%s\" nuk mund të ruhet në këtë dosje."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr "Sjellja"
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Zmadho tekstin dhe imazhet"
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Ruaj skedarët e shkarkuar në:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr "Rrjeti"
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr "MB"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Prapashtesat"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr "_Emri:"
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Përshkrimi:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresa:"
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Kërko me..."
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr "Kërko me %s"
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Hap me"
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s dhe %s"
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr "<i>Ndarës</i>"
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Hap në një _skedë të re"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Sot"
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Dje"
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ditë më parë"
+msgstr[1] "%d ditë më parë"
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr "Një javë më parë"
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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 "Fjalëkalimi"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr ""
+
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr "1 ore"
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr "1 dite"
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr "1 jave"
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr "1 muaji"
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr "1 viti"
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr "Mos instalo"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Gabim"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr "Emri"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "Jo tani"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 154cbc5779e49e079ffa7cf8e6300194bb041252..fbfbec47242a93b63829b5628bee39f4acefc59a 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
 # This file is distributed under the same license as the midori package.
 # Милош Поповић <gpopac@gmail.com> 2009
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012, 2013.
-# Саша Петровић <salepetronije@gmail.com>, 2012, 2013.
-# 
+# Саша Петровић <salepetronije@gmail.com>, 2012, 2013, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-23 03:31+0000\n"
-"PO-Revision-Date: 2013-03-03 14:22+0100\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-01-20 10:52+0000\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
-"Language-Team: српски <>\n"
+"Language-Team: српски <српски <xfce-i18n@xfce.org>>\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-Launchpad-Export-Date: 2015-01-21 05:36+0000\n"
+"X-Generator: Launchpad (build 17306)\n"
 "Language: sr\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: Gtranslator 2.91.6\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Прегледајте веб"
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Мидори"
 
 #: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82\92Ð\92Ð\92\98Ñ\81Ñ\82Ñ\80аживаÑ\87"
+msgid "Web Browser"
+msgstr "Ð\92еб Ð¿Ñ\80егледник"
 
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
-msgid "Midori"
-msgstr "Мидори"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Веб прегледник Мидори"
 
 #: ../data/midori.desktop.in.h:4
-msgid "Midori Web Browser"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82 Ð¿Ñ\80егледник Ð\9cидоÑ\80и"
+msgid "Browse the Web"
+msgstr "Ð\9fÑ\80егледаÑ\98Ñ\82е Ð²ÐµÐ±"
 
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Ð\9dови Ð¿Ñ\80озоÑ\80 Ð¿Ñ\80иваÑ\82ног Ð¿Ñ\80егледаÑ\9aа"
+msgid "Internet;WWW;Explorer"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82\92Ð\92Ð\92\98Ñ\81Ñ\82Ñ\80аживаÑ\87"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Нови лист"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Нови прозор"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ð\98нÑ\82еÑ\80неÑ\82 Ð¿Ñ\80егледник"
+msgid "New Private Browsing Window"
+msgstr "Ð\9dови Ð¿Ñ\80озоÑ\80 Ð¿Ñ\80иваÑ\82ног Ð¿Ñ\80егледаÑ\9aа"
 
 #: ../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:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Приватно прегледање"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Отворите нови прозор приватног прегледања"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Снимак је сачуван у: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Покреће АДРЕСУ као веб програм"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРЕСА"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Користи ФАСЦИКЛУ за чување подешавања"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ФАСЦИКЛА"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Приватно разгледање, никакве измене се не чувају"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr "Преносни режим, све датотеке су смештене на једном месту"
+msgstr "Преносни облик, све извршне датотеке су смештене на једном месту"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Чист ГТК+ прозор са ВебКитом, сличан ГткПокретачу"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Приказује прозорче за дијагнозу"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Покрени са „gdb“ и сачувај запис при рушењу"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Покреће изабрану датотеку као јава скрипту"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Прави снимак изабране адресе"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Извршава наведену наредбу"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Исписује доступне наредбе за извршавање са -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Исписује издање програма"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адресе"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Блокира адресе сходно ОБРАСЦУ регуларног израза"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "ОБРАЗАЦ"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Поново покреће Мидори након СЕКУНДЕ секунди мировања"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "СЕКУНДЕ"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Грешка: Нисам успео да пронађем „gdb“\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Пошаљите примедбе, предлоге и грешке на:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Преузмите новије издање са:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Догодила се непозната грешка"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Забелешке"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Додај забелешку"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "П_роширења"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Историјат"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "Личне _скрипте"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Лични с_тилови"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Нови _лист"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "Пр_еноси"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Нетскејп _додаци"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Затворени листови"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
-msgstr "_Нови прозор"
+msgstr "Нови прозор"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Нова _фасцикла"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адресе]"
 
@@ -231,134 +232,146 @@ msgstr "Документ је лоше форматиран."
 msgid "Unrecognized bookmark format."
 msgstr "Непознат формат забелешки."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Идите на следећу страницу"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Идите на следећу садржану страницу"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Веб претрага…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Поново учитајте тренутну страницу"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Зауставите учитавање тренутне странице"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Нисам успео да освежим наслов: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Вредност „%s“ је неисправна за %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Неочекивана поставка „%s“"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Неочекивана радња „%s“."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Приватно прегледање)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Не могу да уметнем нову ставку историјата: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Изаберите [текст]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Забелешке"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Нова фасцикла"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Уреди фасциклу"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Уредите фасциклу"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Нова забелешка"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
-msgstr "Уреди забелешку"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr "Уредите забелешку"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "УкÑ\83Ñ\86аÑ\98Ñ\82е Ð¸Ð¼Ðµ Ð·Ð° Ð¾Ð²Ñ\83 Ð·Ð°Ð±ÐµÐ»ÐµÑ\88кÑ\83 Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ\80иÑ\82е Ð¼ÐµÑ\81Ñ\82о Ñ\87Ñ\83ваÑ\9aа."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "УкÑ\83Ñ\86аÑ\98Ñ\82е Ð¸Ð¼Ðµ Ð¾Ð²Ðµ Ð·Ð°Ð±ÐµÐ»ÐµÑ\88ке Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ\80иÑ\82е Ð³Ð´Ðµ Ñ\9bеÑ\82е Ñ\98е Ñ\81меÑ\81Ñ\82иÑ\82и."
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Ð\94одаÑ\98 Ñ\83 _бÑ\80зе Ð¿Ð¾Ñ\81еÑ\82е"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "УкÑ\83Ñ\86аÑ\98Ñ\82е Ð¸Ð¼Ðµ Ð·Ð° Ð¾Ð²Ñ\83 Ñ\84аÑ\81Ñ\86иклÑ\83 Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ\80иÑ\82е Ð³Ð´Ðµ Ñ\9bеÑ\82е Ñ\98е Ñ\81меÑ\81Ñ\82иÑ\82и."
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Ð\9fÑ\80икажи Ñ\83 Ñ\82Ñ\80аÑ\86и _алаÑ\82а"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Ð\9fÑ\80иказÑ\83Ñ\98 Ñ\83 _Ñ\82Ñ\80аÑ\86и Ð·Ð°Ð±ÐµÐ»ÐµÑ\88ки"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Ð\9fокÑ\80ени ÐºÐ°Ð¾ _веб Ð¿Ñ\80огÑ\80ам"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Ð\94одаÑ\98 Ñ\83 _бÑ\80зе Ð¿Ð¾Ñ\81еÑ\82е"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Сачувај датотеку као"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Сачувај придружени _садржај"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Нови прозор је отворен"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Нови лист је отворен"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Грешка приликом отварања слике!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Не могу да отворим изабрану слику у основном прегледачу."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Грешка у преузимању слике!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Не могу да преузмем изабрану слику."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Сачувај датотеку"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Учитај страницу без причувавања"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Отворите датотеку"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -367,36 +380,29 @@ msgid ""
 "automatically."
 msgstr ""
 "Да користите горњу адресу отворите придруживача вести. Постоји обично "
-"изборник или дугме „New Subscription“ (Нова претплата), „New News "
-"Feed“ (Нови довод вести) или слично.\n"
+"изборник или дугме „New Subscription“ (Нова претплата), „New News Feed“ "
+"(Нови довод вести) или слично.\n"
 "Или идите на „Поставке, Разгледање“ у Мидорију, и изаберите „Читач вести“. "
 "Следећи пут када кликнете на иконицу довода вести, биће аутоматски додат."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Нови довод"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Додајте нову забелешку"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Дели ову страницу"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Празно"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Искључује навигацију текста курсором"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -404,110 +410,99 @@ msgstr ""
 "Притисак на Ф7 пребацује прегледање курсором. Када је активан, текстуални "
 "курсор се појављује на свим веб странама."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_Укључи прегледање курсором"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Не могу да уметнем нову ставку историјата: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Отвори с_ве у листовима"
 
-# bug: no plural-forms
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Отвори у новом _листу"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Отвори у _новом прозору"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Арора"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Кејзхакејз"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Опера"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "К-освајач"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Спознаја"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Фајерфокс (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Мидори 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Увези забелешке…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "Увези _забелешке"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Програм:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Увези из ИксБЕЛ или ХТМЛ датотеке"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Увези из датотеке"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Нисам успео да увезем обележиваче"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "ИксБЕЛ обележивачи"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Нетскејп обележивачи"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Мидори може само да извезе у ИксБЕЛ (*.xbel) и Нетскејп (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Нисам успео да извезем обележиваче"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Једноставан Интернет прегледник."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Погледајте „about:version“ за податке о издању."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -519,369 +514,387 @@ msgstr ""
 "слободног софтвера; било верзије 2.1 те лиценце, или (према вашем мишљењу) "
 "било које новије верзије."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Милош Поповић <gpopac@gmail.com>\n"
 "\n"
-"http://prevod.org — превод на српски језик."
+"http://prevod.org — превод на српски језик.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Miloš Popović https://launchpad.net/~gpopac\n"
+"  Мирослав Николић https://launchpad.net/~lipek\n"
+"  Саша Петровић https://launchpad.net/~salepetronije"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Удвостручи тренутни лист"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Отворите нови прозор"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
-msgstr "Отворите нови лист"
+msgstr "Отвори нови лист"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Нови прозор _приватног прегледања"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Отворите датотеку"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Сачувај страницу као…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Сачувајте у датотеку"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Додај у _брзе посете"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Претплати се на _довод вести"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "З_атвори лист"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
-msgstr "Затворите тренутни лист"
+msgstr "Затвори тренутни лист"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "_Затвори прозор"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Дели"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Штампајте тренутну страницу"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Затвори _све прозоре"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Пронађи…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Пронађите жељену реч или израз унутар странице"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Нађи _следеће"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Нађи _претходно"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Подесите поставке програма"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
-msgstr "П_реглед"
+msgstr "Приказ"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Траке _алата"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Учитај страницу без причувавања"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Увећајте ниво приказа"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Умањите ниво приказа"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Кодирање"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Прикажи _извор"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Прегледај изворni код _ДОМ"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Прегледање _курсором"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Пребаците приказ преко целог екрана"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Клизај ле_во"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Клизај до_ле"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Клизај го_ре"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Клизај де_сно"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Читљив"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Иди"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Идите на претходну страницу"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Идите на претходну садржану страницу"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "следеће или напред"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Иди на следећу подстраницу или страницу историје"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "По_четна страница"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Идите на почетну страницу"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Испразни смеће"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "_Опозови затварање листа"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Додај нову _фасциклу"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Ð\98звези Ð·Ð°Ð±ÐµÐ»ÐµÑ\88ке"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Увези Ð·Ð°Ð±ÐµÐ»ÐµÑ\88кеâ\80¦"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "По_деси погоне претраге"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "_Извези забелешке…"
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "_Управљај погонима претраге…"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "Очисти _личне податке"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "_Очисти личне податке…"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "_Прегледај страницу"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Претходни лист"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Следећи лист"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
-msgstr "Помери лист на _прво место"
+msgstr "Премести лист на _прво место"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Премести лист уна_зад"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Премести лист уна_пред"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Помери лист на _задње место"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
-msgstr "Приближи _тренутни лист"
+msgstr "Пажња на _тренутни лист"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Приближи _следећи преглед"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Прикажи само иконицу _тренутног листа"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Удвостручи тренутни лист"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "Затвори _друге листове"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Отвори последњу _сесију"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Честа питања"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Пријавите _проблем…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Алати"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Трака _избора"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Трака _кретања"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Бочна _површ"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Бочна површ"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Трака _забелешки"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Трака _стања"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Самостално"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Кинески Традиционални (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Кинески поједностављени (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Јапански (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Корејски (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Руски (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-_8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Западни (I_SO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Прилагођено…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Не могу да покренем историјат: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Раздвајач"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "На _адресу…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Отворите нарочиту адресу"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "П_ретражи веб…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Покрените претрагу веба"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Вратите претходно затворене прозоре или листове"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Прикажите сачуване обележиваче"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Листови"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
-msgstr "Прикажите списак свих отворених листова"
+msgstr "Прикажи списак свих отворених листова"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Изборник"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Изборник"
 
@@ -890,75 +903,75 @@ msgstr "Изборник"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Подешавање проширења „%s“ не може бити учитано: %s\n"
 
-#: ../midori/midori-extension.c:876 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Подешавање проширења „%s“ не може бити сачувано: %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Извези уверење"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Власништво потписаног уверења није познато."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
-"Сертификат се не подудара са очекиваним идентитетом цајта са ког је добавље"
-"+ен"
+"Сертификат се не подудара са очекиваним идентитетом цајта са ког је "
+"добавље+ен"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Време почетка важења уверења је у будућности."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Уверење је истекло"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr "Уверење је повучено у складу са списком повлачења уверења ГТлс веза."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгоритам уврења се сматра несигурним."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Неке друге грешке су се десиле приликом провере уверења."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Извоз уверења"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Са сопственим потписом"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Безбедносни детаљи"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Налепи и _настави"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Непроверено"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Проверена и шифрована веза"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Отворена, нешифрована веза"
 
@@ -975,426 +988,440 @@ msgstr "Затворите површ"
 msgid "Align sidepanel to the left"
 msgstr "Поставите бочну површ на леву страну"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Прикажи брзе посете"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Прикажи почетну страницу"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
-msgstr "Прикажи последње отворене језичке"
+msgstr "Прикажи последње отворене листове"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
-msgstr "Прикажи последње језичке без учитавања"
+msgstr "Прикажи последње листове без учитавања"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Прикажи празну страницу"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Прикажи подразумевани погон претраге"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Прикажи прилагођену страницу"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Јапански (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
-msgstr "новом листу"
+msgstr "Ð\9dовом листу"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "новом прозору"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
-msgstr "тренутном листу"
+msgstr "Тренутном листу"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
-msgstr "УобиÑ\87аÑ\98ено"
+msgstr "Ð\9fодÑ\80азÑ\83мевано"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Иконице"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Мале иконице"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Текст"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Иконице и текст"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Текст поред иконица"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Самостално (Гном или окружење)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "ХТТП сервер посредник"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Без посредничког сервера"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Кром"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Сафари"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "Ајфон"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Фајерфокс"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Интернет експлорер"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Одређује изглед траке алата"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Увек користи моје изборе словног лика"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
-"Ð\9fÑ\80епиÑ\81Ñ\83Ñ\98е Ñ\81ловне Ð»Ð¸ÐºÐ¾Ð²Ðµ Ð¸Ð·Ð°Ð±Ñ\80ане Ð²ÐµÐ± Ñ\81аÑ\98Ñ\82овима оним које изабере корисник"
+"Ð\97амени Ñ\81ловне Ð»Ð¸ÐºÐ¾Ð²Ðµ ÐºÐ¾Ñ\98е Ð¾Ð´Ñ\80еÑ\92Ñ\83Ñ\98Ñ\83 Ð\92еб Ñ\81Ñ\82Ñ\80аниÑ\86е оним које изабере корисник"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Не могу да учитам подешавања: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Неисправна је вредност „%s“ у подешавањима"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "Не могу да уметнем пресвлаку: %s"
+msgstr "Нисам успео да уметнем пресвлаку: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Прикажи _натпис листа"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Прикажи само _иконицу листа"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Затвори десни лист"
+msgstr[1] "Затвори десне листове"
+msgstr[2] "Затвори десне листове"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Затвори _други лист"
+msgstr[1] "Затвори _остале листове"
+msgstr[2] "Затвори _остале листове"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Верујте овом веб сајту"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Непозната безбедност"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
-msgstr "%s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ñ\81аÑ\87Ñ\83ва Ð¥Ð¢Ð\9cÐ\9b5 Ð±Ð°Ð·Ñ\83 Ð¿Ð¾Ð´Ð°Ñ\82дака."
+msgstr "%s жели да сачува ХТМЛ5 базу података."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Одбиј"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Допусти"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
-msgstr "%s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð·Ð½Ð° Ð²Ð°Ñ\88е Ð¼ÐµÑ\81Ñ\82о."
+msgstr "%s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð·Ð½Ð° Ð\92аÑ\88 Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ\98."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Ð\93Ñ\80еÑ\88ка â\80\94 %s"
+msgid "'%s' can't be found"
+msgstr "Ð\9dиÑ\81ам Ñ\83Ñ\81пео Ð´Ð° Ð¿Ñ\80онаÑ\92ем â\80\9e%sâ\80\9c"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Ð\9dе Ð¼Ð¾Ð³Ñ\83 Ð´Ð° Ñ\83Ñ\87иÑ\82ам Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\83 â\80\9e%sâ\80\9c."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Ð\9dиÑ\81ам Ñ\83Ñ\81пео Ð´Ð° Ñ\83Ñ\87иÑ\82ам Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\83 â\80\9e%sâ\80\9c:"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Покушај поново"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Проверите да ли има грешака у писању адресе"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Проверите да ли је мрежни кабал утакнут или покренута картица бежичне везе"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Проверите да ли су поставке мреже исправне"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Покушајте поново"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Грешка - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Нешто је пошло наопако са „%s“"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Покушај поново"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Пошаљи поруку %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Додајте погон претраге"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Ð\9fÑ\80овеÑ\80и _елеменÑ\82"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ð\9eÑ\82воÑ\80и _везÑ\83"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Отвори везу у новом _листу"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Отвори везу у про_челном листу"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Отвори везу у по_задинском листу"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Отвори везу у _новом прозору"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Отвори везу као веб _програм"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Умножи _одредиште везе"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "Сачувај _као…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Отвори _слику у новом прозору"
 
 # bug: no plural-forms
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Отвори слику у _новом листу"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Умножи _слику"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Сачувај _слику"
 
 # bug: no plural-forms
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Отвори у _прегледнику слика"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Умножи _адресу снимка"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Сачувај _снимак"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Преузми _снимак"
 
-#: ../midori/midori-view.c:2832
+# bug: no plural-forms
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Отвору адресу у новом _листу"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Пре_тражи са"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "П_ретражи Интернет"
 
 # bug: no plural-forms
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Отвору адресу у новом _листу"
-
-# bug: no plural-forms
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Отвори кадар у новом _листу"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Провери _елемент"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Отворите или преузмите датотеку из %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Назив датотеке: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Врста датотеке: „%s“"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Врста датотеке: %s („%s“)"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Величина: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Отворите %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Провера странице — %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Није инсталирана помоћ"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Мидори не чува никакве личне податке:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Нису сачувани ни историјат ни веб колачићи."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Проширења су искључена."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr ""
 "ХТМЛ5 скалдиштење, месна база података и причувавања програма су искључена."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Мидори спречава веб сајтове да прате корисника:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Адресе преусмеривача су отцепљене на назив домаћина."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "ДНС довлачење је искључено."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Језик и временска зона нису откривени веб сајтовима."
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Веб сајтови не могу да излистају Флеш или друге Нетскејп прикључке."
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "Бројеви издања у заградама приказују издање коришћено за време покретања."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "УÑ\87иÑ\82аваÑ\9aе Ñ\81Ñ\82Ñ\80аниÑ\86е Ñ\98е Ð¾Ð´Ð»Ð¾Ð¶ÐµÐ½Ð¾"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "УÑ\87иÑ\82аваÑ\9aе Ñ\81Ñ\82Ñ\80аниÑ\86е Ñ\98е Ð¾Ð¾Ð´Ð»Ð¾Ð¶ÐµÐ½Ð¾:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 "Учитавање је одложено или због недавног пада програма или због поставки "
 "покретања."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Учитај страницу"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Празна страница"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Удвостручи лист"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Прикажи _натпис листа"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Прикажи само _иконицу листа"
-
-#: ../midori/midori-view.c:4904
-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:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "Претходно"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "Следеће"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Прикажи позадинске слике"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Одређује да ли треба приказати слике за позадину"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Могућности"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s од %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1402,7 +1429,7 @@ msgstr[0] "%d сат"
 msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1410,7 +1437,7 @@ msgstr[0] "%d минут"
 msgstr[1] "%d минута"
 msgstr[2] "%d минута"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1419,27 +1446,27 @@ msgstr[1] "%d секунде"
 msgstr[2] "%d секунди"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " — преостало време: %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Преузета датотека је погрешна."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1447,131 +1474,127 @@ msgstr ""
 "Сума за проверу обезбеђена везом не одговара. Ово значи да је датотека "
 "вероватно непотпуна или да је касније измењена."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Датотека „%s“ не може бити сачувана у овој фасцикли."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Немате дозволу да пишете овде."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Нема довољно слободног места за преузимање „%s“."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Датотека захтева %s али је преостало само %s."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Брзе посете"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Кликните да додате пречицу"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Унесите адресу за пречицу"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Унесите наслов за пречицу"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Да ли заиста желите да обришете ову пречицу?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Покретање"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Када се Мидори покрене:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Матична страница:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Користи _тренутну страницу"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Искористи тренутну страницу као почетну"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Породица сразмерног писма"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Основна породица писма за приказ текста"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Основна величина писма за приказ текста"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Породица писма сталне ширине"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Породица писма за приказ текста сталне ширине"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Величина писма за приказ текста сталне ширине"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Најмања величина писма"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Најмања величина писма за приказ текста"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Омиљено кодирање"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Понашање"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Сам учитај слике"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Укључи проверу писања"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Укључи скрипте"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Укључи ВебГЛ подршку"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Укључи прикључке Нетскејпа"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Увећај текст и слике"
@@ -1585,11 +1608,19 @@ msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr ""
 "Да ли ће скриптама бити допуштено да самостално отварају искачуће прозоре"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Подразумевано увећање"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Почетни множилац увећања новоотворених листова"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Пожељни језици"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1597,117 +1628,117 @@ msgstr ""
 "Зарезом одвојен списак пожељних језика за исцртавање вишејезичних веб "
 "страница, на пример „de“, „ru,nl“ или „en-us;q=1.0, fr-fr;q=0.667“"
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Сачувај преузете датотеке у:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Разгледање"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Тема:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
-msgstr "СÑ\82ил траке алата:"
+msgstr "Ð\98зглед траке алата:"
 
 # bug(slobo): једноставно разлистај?
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Отвори нове странице у:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Понашање новог језичка:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Дугме за затварање листова"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Увек прикажи листове"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Отворите листове поред тренутног"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "Да ли да отвори нове листове поред текућег или након последњег листа"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Отворите листове у позадини"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Уређивач текста"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Читач вести"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Сервер посредник"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Ð\94омаÑ\9bин"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "Ð\90дÑ\80еÑ\81а"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Прикључак"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Подржане врсте посредника"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
-msgstr "Ð\92еб ÐºÐµÑ\88"
+msgstr "Ð\92еб Ð¾Ñ\81Ñ\82ава"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Највећа величина причуваних страница на диску"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Представи се као"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Приватност"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Обриши старе колачиће након:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Највећи број дана за које ће бити причувани колачићи"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Прихвати колачиће само са сајтова које посетим"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Блокира колачиће које пошаљу веб сајтови трећих страна"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1715,123 +1746,123 @@ msgstr ""
 "Колачићи чувају податке пријава, сачуване игре, или корисничке профиле за "
 "сврхе оглашавања."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Укључи тренутну меморију веб програма ван мреже"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Укључи подршку ХТМЛ5 месног скалдиштења"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Отцепи податке преусмеривача послате веб сајтовима"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Да ли заглавље преусмеривача треба да буде скраћено на назив домаћина"
+msgstr ""
+"Да ли заглавље преусмеривача треба да буде скраћено на назив домаћина"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Обриши странице из историјата након:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Највећи број дана за које ће бити причуван историјат"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Проширења"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "По_деси погоне претраге"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Додајте погон претраге"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Уреди погон претраге"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Назив:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Опис:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Израз:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Подеси погоне претраге"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "_Постави за основни"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Не могу да учитам погоне претраге. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Не могу да сачувам погоне претраге. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Ð\98Ñ\81Ñ\82оÑ\80иÑ\98аÑ\82"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Ð\97абелеÑ\88ке Ð¸ Ð¸Ñ\81Ñ\82оÑ\80иÑ\98а"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Ð\9dе Ð¼Ð¾Ð³Ñ\83 Ð´Ð° Ð¿Ð¾ÐºÑ\80енем Ð¸Ñ\81Ñ\82оÑ\80иÑ\98аÑ\82: %s"
+msgid "Search for %s"
+msgstr "Ð\9fоÑ\82Ñ\80ажи %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Нисам успео да изаберем из историјата: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Потражи %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Претражи помоћу…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Претражи помоћу %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Отвори програмом"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Изаберите програм или наредбу којом ће бити отворено „%s“:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Не могу да покренем спољни програм."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Неисправна УРИ адреса"
 
@@ -1856,46 +1887,106 @@ msgstr "Упореди велчину слова"
 msgid "Close Findbar"
 msgstr "Затворите траку за претрагу"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Нисам успео да додам ставку забелешки: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d забелешка"
+msgstr[1] "%d забелешке"
+msgstr[2] "%d забелешки"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Нисам успео да додам ставку забелешки: %s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d подфасцикла"
+msgstr[1] "%d подфасцикле"
+msgstr[2] "%d подфасцикли"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Празна фасцикла"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Фасцикла садржи %s и нема забележака"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Фасцикла садржи %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Фасцикла садржи %s и %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Забелешка води ка: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s и нема забележака"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s и %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Уредите изабрану забелешку"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Уклоните изабрану забелешку"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Додајте нову фасциклу"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Раздвајач</i>"
 
+# bug: no plural-forms
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Отвори у новом _листу"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Тражи забелешке"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Историјат"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Данас"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Јуче"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1903,33 +1994,33 @@ msgstr[0] "Пре %d дан"
 msgstr[1] "Пре %d дана"
 msgstr[2] "Пре %d дана"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Пре недељу дана"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Не могу да уклоним ставку историјата: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Да ли заиста желите да уклоните све ставке из историјата?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Обележите изабрану ставку историјата"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Уклоните изабрану ставку из историјата"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Очистите сав историјат"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Историја претраге"
 
@@ -1957,120 +2048,70 @@ msgstr "Лозинка"
 msgid "_Remember password"
 msgstr "_Запамти лозинку"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Именована иконица „%s“ не може бити учитана"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Стек иконица „%s“ не може бити учитана"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Оквири са анимацијама су неисправни"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Ништа"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Вредност „%s“ није исправна за %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Изаберите датотеку"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Изаберите фасциклу"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 сата"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 дана"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 недеље"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 месеца"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 године"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Поставке за %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "МД5 сума провере:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "СХА1 сума провере:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Подесите пропуснике реклама"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"УпиÑ\88иÑ\82е Ð°Ð´Ñ\80еÑ\81Ñ\83 Ð¿Ñ\80еÑ\82подеÑ\88еног Ñ\81пиÑ\81ка Ñ\84илÑ\82еÑ\80а Ñ\83 Ð¿Ð¾Ñ\99е Ð·Ð° Ñ\83ноÑ\81 Ñ\82екÑ\81Ñ\82а Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ\82е "
-"„Додај“ да га додате на списак. Више спискова можете да пронађете на %s."
+"Ð\9eва Ñ\81Ñ\82Ñ\80аниÑ\86а Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ\81адÑ\80жи ÐºÐ¾Ñ\80иÑ\81ниÑ\87кÑ\83 Ñ\81кÑ\80ипÑ\82Ñ\83. Ð\94а Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ\82е Ð´Ð° Ñ\98е "
+"инсталирате?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Измени правило"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Правило:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Блокирај _слику"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Блокирај _везу"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Зауставник реклама"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr ""
-"Ова страница изгледа да садржи корисничку скрипту. Да ли желите да је "
-"инсталирате?"
-
-#: ../extensions/addons.c:223
-msgid "_Install user script"
-msgstr "_Инсталирај корисничку скрипту"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Инсталирај корисничку скрипту"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
@@ -2087,16 +2128,16 @@ msgstr "_Инсталирај кориснички стил"
 msgid "Don't install"
 msgstr "Немој инсталирати"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Личне скрипте"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Лични стилови"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Грешка"
 
@@ -2118,40 +2159,40 @@ msgstr "Обриши кориснички стил"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Датотека <b>%s</b> ће бити неповратно обрисана."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Отворите у уређивачу текста"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Отворите циљну фасциклу"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Додајте нови додатак"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Уклоните изабрани додатак"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Кориснички додаци"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Не могу да надгледам фасциклу „%s“: %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Подршка за корисничке скрипте и корисничке стилове"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Листови у боји"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Обојите сваки лист другачије"
 
@@ -2160,11 +2201,11 @@ msgstr "Обојите сваки лист другачије"
 msgid "Cookie Manager"
 msgstr "Управник колачићима"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Обриши све"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2172,31 +2213,31 @@ msgstr ""
 "Обришите све приказане колачиће. Уколико је постављен филтер, биће обрисани "
 "само колачићи који се поклапају са филтером."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Прошири све"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Сакупи све"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Да ли желите да обришете све колачиће?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Питање"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Биће обрисани само колачићи који се поклапају са задатим филтером."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "На крају сесије"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2214,15 +2255,15 @@ msgstr ""
 "<b>Истиче</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Да"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Не"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2231,20 +2272,20 @@ msgstr ""
 "<b>Домен</b>: %s\n"
 "<b>Колачићи</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Назив"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Прошири све"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Сакупи све"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Тражи колачиће по имену или домену"
 
@@ -2265,25 +2306,45 @@ msgstr "Умножте адресе листова"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Умножите адресе свих листова у оставу"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Одложено учитавање"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Одлагање у секундама пре учитавања странице:"
-
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Одложено учитавање странице док не отворите лист."
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Двокликните за више података"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "Развојни љубимац"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Ово проширење приказује глиб поруке у обавештајној области."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Десила се грешка приликом покушаја преузимања датотеке следећим прикључком\n"
+"Десила се грешка приликом покушаја преузимања датотеке следећим прикључком:\n"
+"%s\n"
+"\n"
+"Грешка:\n"
+"%s\n"
+"\n"
+"Настављам без тог прикључка."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2325,25 +2386,25 @@ msgstr ""
 "Нисам успео да пронађем потребне Атом „feed“ елементе у ИксМЛ подацима."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Последње ажурирање: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Доводи"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Додајте нови довод"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Обриши довод"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Доводи"
 
@@ -2362,37 +2423,38 @@ msgstr "Није подржан формат довода."
 msgid "Failed to parse XML feed: %s"
 msgstr "Не могу да обрадим ИксМЛ довод: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Не могу да нађем елемент „channel“ међу РСС ИксМЛ подацима."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Пронађено је неподржано издање вести."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Не могу да нађем потребни „item“ елемент вести међу ИксМЛ подацима."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Не могу да нађем потребни „channel“ елемент вести међу ИксМЛ подацима."
+msgstr ""
+"Не могу да нађем потребни „channel“ елемент вести међу ИксМЛ подацима."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Довод „%s“ већ постоји"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Грешка учитавања додова „%s“"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Површ са доводима"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Чита Атоме / доводе са вестима"
 
@@ -2413,122 +2475,406 @@ msgstr ""
 "Потребна је главна лозинка\n"
 "за отварање базе лозинки"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Да запамтим лозинку на овој страници?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Не сада"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Никада за ову страницу"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Пребаци стање историјата обрасца"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Укључите или искључите историјат обрасца за текући лист."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Не могу да отворим базу података: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Не могу да покренем тврдњу из базе података: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "Укључи историјат обрасца само путем пречице (Ктрл+Шифт+Ф) по листу"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Пропусник историјата обрасца"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Складишти историјат унесених података обрасца"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Нисам успео да изаберем предлоге\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Нема непосећених листова"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Списак историјата"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Понашање затварања листа"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Не ради ништа"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Пребаци на последњи виђени лист"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Пребаци на најновији лист"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Трепни прозором на позадинским листовима"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Следећи нови лист (списак историјата)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Следећи нови лист из историјата"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Претходни нови лист (списак историјата)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Претходни нови лист из историјата"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Прикажи лист у позадини (списак историјата)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Прикажи текући изабрани лист у позадини"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Списак историјата"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Прелази на последње коришћени лист приликом пребацивања или затварања листова"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "СКуЛ грешка: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Прихвати"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Прихвати за ову сесију"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Забрани"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Нисам успео да отворим складиште проширења: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Нисам успео да извршим тврдњу базе података: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Да ли желите да обришете све дозволе Јава скрипата?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Да ли да обришем све дозволе Јава скрипата?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Ова радња ће избрисати све дозволе Јава скрипата. Бићете поново упитани за "
+"свако посећено веб место."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Примерак управника"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Примерак општег управника Без скрипата (NoJS)"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Подеси рад без скрипата (NoJS)"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Испод је списак свих веб страница и подешених смернице понашања према њима. "
+"Можете брисати смернице означавањем ставки и кликом на <i>Обриши</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Домен"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Правило"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Обриши _све"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "_Дозволи скрипте на свим страницама"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Подразумевано забрани скрипте на непознатим страницама"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "По_стави дозволе на другом ступњу домена"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Одбиј %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Допусти %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Прихвати %s за ову сесију"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Прозор прегледника"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Примерак програма Мидори коме овај приказ припада"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Приказ"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Примерак програма Мидори коме овај приказ припада"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Стање иконица изборника"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Стање приказа иконица изборника"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Неодређено"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Дозвољено"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Мешовито"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Одбијено"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Десила се кобна грешка која спречава НоЈС проширење да настави. Требало би "
+"да га онемогућите."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Десила се грешка у НоЈС проширењу"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Разлог"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Нисам успео да образујем фасциклу поставки за проширење: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Нисам успео да образујем фасциклу проширења."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Нисам успео да отворим базу података."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Нисам успео да поставим грађу проширења."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Примерак проширења"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Примерак проширења Мидорија за ово проширење"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Примерак програма"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Примерак програма Мидори коме ово проширење припада"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Примерак базе података"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Показивач на базу података „sqlite“ коришћен овим проширењем"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Путања базе података"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Путања ка бази података „sqlite“ коришћена овим проширењем"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Дозволи свим страницама"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Ако је означено, ово проширење неће проверавати смернице дозвола за сваку "
+"страницу, већ ће свима бити одобрено."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Само други ступањ"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Ако је означено, ово проширење че скратити назив домена на други ступањ "
+"(www.primer.org ће скратити на primer.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Непознато правило за назив домена"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Смернице за непознате домене."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Прихвати привремено"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Гестови миша"
@@ -2557,11 +2903,11 @@ msgstr "Пречице"
 msgid "View and edit keyboard shortcuts"
 msgstr "Приказује и уређује пречице тастатуре"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Сат у траци стања"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Приказује датум и време у траци стања"
 
@@ -2577,6 +2923,10 @@ msgstr "Скрипте"
 msgid "Netscape plugins"
 msgstr "Нетскејп прикључци"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Укључи прикључке Нетскејпа"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Могућности траке стања"
@@ -2585,15 +2935,15 @@ msgstr "Могућности траке стања"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Једноставно укључује и искључује опције на веб страницама"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Бочна површ"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Бочна _површ"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Приказује листове у усправној површи"
 
@@ -2605,11 +2955,11 @@ msgstr "Само иконице на листовима по задатим по
 msgid "New tabs have no label by default"
 msgstr "Нови листови немају ознаку по задатим поставкама"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Прилагоди траку алата"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2617,67 +2967,58 @@ msgstr ""
 "Изаберите ставке које ће бити приказане на траци алата. Ставкама може бити "
 "промењено место превлачењем и увацивањем."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Доступне ставке"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Приказане ставке"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "_Подеси траку алата…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Уређивач траке алата"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Лако мењајте распоред траке алата"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Причувај ХТТП објављивања на диск"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Нисам успео да учитам колачиће\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Очистите личне податке"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "О_чисти личне податке"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Очисти следеће податке:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Последњи отворени _листови"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Очисти приватне податке приликом _напуштања Мидорија"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Сачувана пријављивања и _лозинке"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Колачићи и подаци веб сајта"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Иконице веб сајта"
 
@@ -2685,190 +3026,132 @@ msgstr "Иконице веб сајта"
 msgid "Open tabs"
 msgstr "Отворите лист"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Још отворених листова"
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Не могу да очистим историјат: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Не могу да уклоним старе ставке из историјата: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "нисам успео да налепим стару бп"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "нисам успео да увезем из старе бп"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "нисам успео да повратим пренос"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "нисам успео да ОДЛЕПИМ"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Ð\9dиÑ\81ам Ñ\83Ñ\81пео Ð´Ð° Ð½Ð°Ð¿Ñ\80авим Ñ\82аблиÑ\86у забелешки: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Ð\9dиÑ\81ам Ñ\83Ñ\81пео Ð´Ð° Ð´Ð¾Ð´Ð°Ð¼ Ñ\81Ñ\82авку забелешки: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Нисам успео да увезем стару базу података: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Нисам успео да освежим забелешку:  %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ð\9dе Ð¼Ð¾Ð³Ñ\83 Ð´Ð° Ñ\81аÑ\87Ñ\83вам Ð¾Ð±ÐµÐ»ÐµÐ¶Ð¸Ð²Ð°Ñ\87е. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Ð\9dиÑ\81ам Ñ\83Ñ\81пео Ð´Ð° Ñ\83клоним Ñ\81Ñ\82авкÑ\83 Ð·Ð°Ð±ÐµÐ»ÐµÑ\88ки: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "Није доступна корена датотека уверења. ССЛ уверења не могу бити проверена."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Не могу да сачувам подешавања. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Не могу да учитам сесију: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Не могу да сачувам сесију. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Не могу да сачувам документ. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Ð\98згледа Ð´Ð° Ñ\98е Ð\9cидоÑ\80и Ð½ÐµÐ¸Ñ\81пÑ\80авно Ð·Ð°Ð²Ñ\80Ñ\88ио Ñ\80ад Ð¿Ñ\80иликом Ð¿Ð¾Ñ\81ледÑ\9aег Ð¿Ð¾ÐºÑ\80еÑ\82аÑ\9aа. "
-"Уколико се ово често понавља покушајте неки од понуђених предлога."
+"Ð\9cидоÑ\80и Ñ\81е Ñ\81Ñ\80Ñ\83Ñ\88ио Ð¿Ñ\80иликом Ð¿Ð¾Ñ\81ледÑ\9aег Ð¿Ð¾ÐºÑ\80еÑ\82аÑ\9aа. Ð\9cожеÑ\82е Ð¿Ñ\80иÑ\98авиÑ\82и Ð¿Ð¾Ñ\82еÑ\88коÑ\9bе Ð½Ð° "
+"%s."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Измени пос_тавке"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Онемогући сва п_роширења"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Приказује прозорче након пада Мидорија"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Одбаци старе језичке"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Прикажи последњи _дневник грешака"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Покрени уз _праћење грешака"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
-msgstr ""
-"Један примерак Мидорија је већ покренут али не даје одзив.\n"
-"\n"
+msgstr "Један примерак Мидорија је већ покренут али не даје одзив.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Не могу да учитам забелешку: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Не могу да учитам сесију: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Не могу да учитам смеће: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Не могу да учитам историјат: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Јавиле су се следеће грешке:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Занемари"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "СКуЛ грешка: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Прихвати"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Прихвати за ову сесију"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Забрани"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Не могу да отворим базу података са наставко,: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Нисам успео да извршим тврдњу базе података: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Да ли желите да обришете све дозволе колачића?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Обрисати све дозволе колачића?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
@@ -2876,20 +3159,20 @@ msgstr ""
 "Ова радња ће избрисати све дозволе колачића. Бићете поново упитани за свако "
 "посећено веб место."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Управник дозволама колачића"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Примерак тренутног управника колачића"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Подесите дозволе колачићима"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2902,23 +3185,13 @@ msgstr ""
 "правило за домен ручно уносом домена ниже, одабиром правила и кликом на "
 "<i>Додај</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Домен"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Правило"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Обриши _све"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Смернице за прихватање колачића за домене који нису на списку: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "Пи_тај за правило ако је непозната за одређени домен"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Питај за одобрење"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2932,127 +3205,65 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Грешка у проширењу управника овлашћења колачића"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Разлог"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Нисам успео да образујем фасциклу поставки за проширење: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Нисам успео да образујем фасциклу проширења."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Нисам успео да отворим базу података."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "Нисам успео да поставим грађу проширења."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "Нисам успео да одредим подешавања општег правила за домен: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Док сесија траје"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Веб место %s жели да ускладишти %d колачића."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Веб место %s жели да ускладишти колачић."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Више веб места желе да ускладиште %d колачића укупно."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Прихвати"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Прихвати за ову _сесију"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "Од_биј"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "_Овог пута одбиј"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Путања"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Вредност"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Датум истека"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Примерак проширења"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Примерак проширења Мидорија за ово проширење"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Примерак програма"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Примерак програма Мидори коме ово проширење припада"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Примерак базе података"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "Показивач на базу података „sqlite“ коришћен овим проширењем"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Путања базе података"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "Путања ка бази података „sqlite“ коришћена овим проширењем"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Питај за непознато правило"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
-"Ако је тачно, ово проширење ће упитати за сваки непознати домен. Ако је "
-"нетачно, ово проширење ће користити поставке општег правила колачића у "
-"поставкама Мидорија."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Неодређено"
+"Смернице за коришћење домена који нису појединачно подешени. Има улогу само "
+"за будуће опште смернице прихватања колачића у поставкама Мидорија."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3062,100 +3273,261 @@ msgstr "Управник безбедности колачића"
 msgid "Manage cookie permission per site"
 msgstr "Управљај дозволама колачића по пореклу"
 
-#: ../extensions/apps.vala:82
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Нисам успео да добавим иконицу програма из %s: %s"
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Мидори (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Нисам успео да направим нови покретач (%s): %s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Направљен је покретач"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Сада можете покретати <b>%s</b> из вашег покретача или изборника"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Десила се грешка приликом стварања покретача"
+
+#: ../extensions/apps.vala:191
 msgid "Applications"
 msgstr "Програми"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Нови _профил"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Ствара нови, независни профил и покретач"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Нови _програм"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Ствара нови програм за одређену страницу"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Десила се грешка при покретању"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Направи _покретач"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Управник веб програмима"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Управља веб страницама које су уграђене као програми"
 
-#: ../extensions/transfers.vala:52
+#: ../extensions/transfers.vala:98
 msgid "Transfers"
 msgstr "Преноси"
 
-#: ../extensions/transfers.vala:65 ../extensions/transfers.vala:330
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Очисти све"
 
-#: ../extensions/transfers.vala:160
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Нисам успео да отворим преузимање: %s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Отвори одредишну _фасциклу"
 
-#: ../extensions/transfers.vala:167
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "_Умножи место везе"
 
-#: ../extensions/transfers.vala:394
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Датотека „<b>%s</b>“ је преузета."
 
-#: ../extensions/transfers.vala:395
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "„<b>%s</b>“ и %d осталих датотека су преузете."
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Пренос је завршен"
 
-#: ../extensions/transfers.vala:422 ../extensions/transfers.vala:423
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "Неке датотеке су преузете"
 
-#: ../extensions/transfers.vala:425
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Напусти Мидори"
 
-#: ../extensions/transfers.vala:427
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Преноси ће бити отказани ако затворите Мидори."
 
-#: ../extensions/transfers.vala:474
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Управник преноса"
 
-#: ../extensions/transfers.vala:475
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Прегледајте преузете датотеке"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Средњи клик отвара избор"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Нисам успео да освежим складиште података: %s"
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "Нисам успео да изаберем из складишта података: %s"
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Нисам успео да увезем стари облик сесије: %s"
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Листови"
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Управљање листовима и сесијама."
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Ток"
 
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Учитава адресу из избора на средњи клик мишем"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Ово проширење обезбеђује заказивање задатака за послове или догађаје који се "
+"понављају."
 
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr ""
-#~ "Нисам успео да поставим путању ка поставкама проширења: путања је NULL"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Нисам успео да додам нову белешку у складиште података: %s\n"
 
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Нисам успео да поставим путању до поставки проширења."
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Нисам успео да уклоним белешку из складишта: %s\n"
 
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Потврди сладиштење колачића"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Нисам успео да преименујем белешку: %s\n"
 
-#~ msgid "_Details"
-#~ msgstr "_Појединости"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Нисам успео да освежим белешку: %s\n"
 
-#~ msgid "Custom..."
-#~ msgstr "Прилагођено…"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Белешке"
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Нова белешка"
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Образује нову празну белешку повезану са отвореном страницом"
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Нова белешка"
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Нисам успео да извршим означавање из складишта бележака: %s\n"
 
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Одређује како ће се програм представити веб страницама"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Преименуј белешку"
 
-#~ msgid "Writing failed."
-#~ msgstr "Није успело уписивање."
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Умножи белешку у оставу исечака"
 
-#~ msgid "_Window"
-#~ msgstr "_Прозор"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Уклони белешку"
 
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Кинетичко клизање"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Умножи одабир као белешку"
 
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Да ли клизање треба кинетички да се помера у складу са брзином"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Сачувај исечке текста са веб страница као белешку"
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Зауставник реклама"
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Блокира рекламе у складу са списком пропусника"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Подесите пропуснике реклама"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Блокирај _слику"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Блокирај _везу"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Измени правило"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Правило:"
index 1b5af04258358caf4dca22ac746be3f88cb9eaa8..a3419b7bc7f33b939a07acad0c1c5db63e946b37 100644 (file)
@@ -7,1803 +7,1987 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-08 11:15+0000\n"
-"PO-Revision-Date: 2009-06-30 00:00+100\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-06-02 11:56+0000\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\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 && "
+"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-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Jednostavan Internet preglednik"
-
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449
-#: ../midori/main.c:1457 ../midori/main.c:1468
-#: ../midori/midori-websettings.c:277
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:2
 msgid "Web Browser"
 msgstr "Internet preglednik"
 
-#: ../midori/main.c:96
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Ne mogu da učitam podešavanja: %s\n"
-
-#: ../midori/main.c:151
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "Vrednost „%s“ je neispravna za %s"
-
-#: ../midori/main.c:158 ../midori/main.c:238
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Neispravna je vrednost „%s“ u podešavanjima"
-
-#: ../midori/main.c:350
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Ne mogu da otvorim bazu podataka: %s\n"
-
-#: ../midori/main.c:382
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Ne mogu da pokrenem tvrdnju iz baze podataka: %s\n"
-
-#: ../midori/main.c:436
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Ne mogu da uklonim stavku iz istorijata: %s\n"
-
-#: ../midori/main.c:460
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Ne mogu da očistim istorijat: %s\n"
-
-#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533
-#, c-format
-msgid "Failed to add history item: %s\n"
-msgstr "Ne mogu da dodam stavku u istorijat: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:712
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "Ne mogu da uklonim stare stavke iz istorijata: %s\n"
-
-#: ../midori/main.c:741
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Ne mogu da sačuvam podešavanja. %s"
-
-#: ../midori/main.c:770
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "Ne mogu da sačuvam pretraživače. %s"
-
-#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ne mogu da sačuvam obeleživače. %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
 
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:869 ../midori/main.c:892
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Ne mogu da sačuvam dokument. %s"
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Pretražiti internet"
 
-#: ../midori/main.c:965
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Ne mogu da sačuvam sesiju. %s"
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
 
-#: ../midori/main.c:1092
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
 msgstr ""
-"Izgleda da je Midori neispravno završio rad prilikom poslednjeg pokretanja. "
-"Ukoliko se ovo često ponavlja pokušajte neki od ponuđenih predloga."
 
-#: ../midori/main.c:1107
-msgid "Modify _preferences"
-msgstr "Izmeni pos_tavke"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Novi Prozor"
 
-#: ../midori/main.c:1111
-msgid "Reset the last _session"
-msgstr "Vrati poslednju sesiju"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
 
-#: ../midori/main.c:1116
-msgid "Disable all _extensions"
-msgstr "Isključi sva p_roširenja"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1315
-msgid "No filename specified"
-msgstr "Nije izabrano ime datoteke"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
 
-#: ../midori/main.c:1338
-msgid "An unknown error occured."
-msgstr "Nepoznata greška."
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
 
-#: ../midori/main.c:1370
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Snimak je sačuvan u: %s\n"
 
-#: ../midori/main.c:1391
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Pokreće ADRESU kao veb program"
 
-#: ../midori/main.c:1391
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRESA"
 
-#: ../midori/main.c:1393
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Koristi FASCIKLU za čuvanje podešavanja"
 
-#: ../midori/main.c:1393
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FASCIKLA"
 
-#: ../midori/main.c:1395
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Pokreće izabranu datoteku kao java skriptu"
 
-#: ../midori/main.c:1398
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Pravi snimak izabrane adrese"
 
-#: ../midori/main.c:1401
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Izvršava zadatu komandu"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Ispisuje izdanje programa"
 
-#: ../midori/main.c:1403
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../midori/main.c:1446
-msgid "[Addresses]"
-msgstr "[Adrese]"
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "OBRAZAC"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
 
-#: ../midori/main.c:1469
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Pošaljite komentar, preglog i izveštaj greške na:"
 
-#: ../midori/main.c:1471
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Preuzmite novije izdanje sa:"
 
-#: ../midori/main.c:1548
-msgid "The specified configuration folder is invalid."
-msgstr "Izabrana fascikla sa podešavanjima je neispravna."
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
 
-#: ../midori/main.c:1583
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Već je pokrenut jedan Midori prozor, ali ne daje odziv.\n"
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "_Obeleživači"
 
-#: ../midori/main.c:1633
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Ne mogu da učitam pretraživače. %s\n"
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
 
-#: ../midori/main.c:1645
-#, c-format
-msgid "The bookmarks couldn't be loaded: %s\n"
-msgstr "Ne mogu da učitam obeleživače: %s\n"
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "P_roširenja"
 
-#: ../midori/main.c:1660
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Ne mogu da učitam sesiju: %s\n"
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_Istorijat"
 
-#: ../midori/main.c:1673
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Ne mogu da učitam smeće: %s\n"
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Lične _skripte"
 
-#: ../midori/main.c:1686
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Ne mogu da učitam istorijat: %s\n"
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Lični s_tilovi"
 
-#: ../midori/main.c:1698
-msgid "The following errors occured:"
-msgstr "Javile su se sledeće greške:"
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "Novi _list"
 
-#: ../midori/main.c:1714
-msgid "_Ignore"
-msgstr "_Zanemari"
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "Pr_enoisi"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "Netscape _dodaci"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Novi prozor"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adrese]"
 
-#: ../midori/midori-array.c:195
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Nije nađena datoteka."
 
-#: ../midori/midori-array.c:203 ../midori/midori-array.c:212
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Dokument je lošeg formatiran."
 
-#: ../midori/midori-array.c:338 ../midori/sokoke.c:716
-#, c-format
-msgid "Writing failed."
-msgstr "Neuspešan upis."
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Ide na sledeću stranicu"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
 
-#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819
-#: ../midori/midori-browser.c:3825
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Osvežava stranicu koju ste otvorili"
 
-#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Prekida stranice na kojoj se nalazite"
 
-#: ../midori/midori-browser.c:360
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Vrednost „%s“ je neispravna za %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
-msgid "%d%% loaded"
-msgstr "%d%% učitano"
+msgid "Unexpected setting '%s'"
+msgstr "Neočekivana postavka „%s“"
 
-#: ../midori/midori-browser.c:385
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Neočekivana radnja „%s“."
 
-#: ../midori/midori-browser.c:603
-msgid "New folder"
-msgstr "Nova fascikla"
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
 
-#: ../midori/midori-browser.c:603
-msgid "Edit folder"
-msgstr "Uredi fasciklu"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:605
-msgid "New bookmark"
-msgstr "Novi obeleživač"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:605
-msgid "Edit bookmark"
-msgstr "Uredi obeleživač"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Obeleživači"
 
-#: ../midori/midori-browser.c:635
-msgid "_Title:"
-msgstr "_Naslov:"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948
-msgid "_Description:"
-msgstr "_Opis:"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962
-#: ../extensions/feed-panel/main.c:343
-msgid "_Address:"
-msgstr "_Adresa:"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:686
-msgid "_Folder:"
-msgstr "_Fascikla:"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732
-msgid "Toplevel folder"
-msgstr "Najviša fascikla"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
 
-#: ../midori/midori-browser.c:808
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Sačuvaj datoteku kao"
 
-#: ../midori/midori-browser.c:1119
-#, c-format
-msgid "The file <b>%s</b> has been downloaded."
-msgstr "Datoteka <b>%s</b> je preuzeta."
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
 
-#: ../midori/midori-browser.c:1123
-msgid "Transfer completed"
-msgstr "Preuzimanje je završeno"
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
 
-#: ../midori/midori-browser.c:1820
-msgid "Open file"
-msgstr "Otvori datoteku"
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
 
-#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778
-#: ../panels/midori-history.c:808
-msgid "Open all in _Tabs"
-msgstr "Otvori s_ve u listovima"
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
 
-# bug: no plural-forms
-#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784
-#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542
-msgid "Open in New _Tab"
-msgstr "Otvoru u novom _listu"
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
 
-#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786
-#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544
-msgid "Open in New _Window"
-msgstr "Otvori u _novom prozoru"
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
 
-#: ../midori/midori-browser.c:3425
-msgid "Clear Private Data"
-msgstr "Očisti lične podatke"
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
 
-#: ../midori/midori-browser.c:3428
-msgid "_Clear private data"
-msgstr "O_čisti lične podatke"
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
 
-#: ../midori/midori-browser.c:3441
-msgid "Clear the following data:"
-msgstr "Čišćenje sledećih podataka:"
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
 
-#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669
-#: ../panels/midori-history.c:108
-msgid "History"
-msgstr "Istorijat"
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Otvori datoteku"
 
-#: ../midori/midori-browser.c:3452
-msgid "Cookies"
-msgstr "Kolačići"
+#: ../midori/midori-browser.c:2692
+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:3455
-msgid "'Flash' Cookies"
-msgstr "Fleš kolačići"
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Novi dovod"
 
-#: ../midori/midori-browser.c:3458
-msgid "Website icons"
-msgstr "Ikonice veb stranica"
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Dodaj obeleživač"
 
-#: ../midori/midori-browser.c:3538
-msgid "A lightweight web browser."
-msgstr "Jednostavan Internet preglednik."
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Prazno"
 
-#: ../midori/midori-browser.c:3546
-msgid "translator-credits"
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
 msgstr ""
-"Miloš Popović <gpopac@gmail.com>\n"
-"\n"
-"http://prevod.org — prevod na srpski jezik."
 
-#: ../midori/midori-browser.c:3750
-msgid "_File"
-msgstr "_Datoteka"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
 
-#: ../midori/midori-browser.c:3753
-msgid "Open a new window"
-msgstr "Otvori novi prozor"
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
 
-#: ../midori/midori-browser.c:3756
-msgid "Open a new tab"
-msgstr "Otvara novi list"
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Otvori s_ve u listovima"
 
-#: ../midori/midori-browser.c:3759
-msgid "Open a file"
-msgstr "Otvori datoteku"
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Otvori u _novom prozoru"
 
-#: ../midori/midori-browser.c:3762
-msgid "Save to a file"
-msgstr "Sačuvaj u datoteku"
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
 
-#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256
-msgid "Add to Speed _dial"
-msgstr "Dodaj u _brze posete"
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
 
-#: ../midori/midori-browser.c:3765
-msgid "Add shortcut to speed dial"
-msgstr "Dodaje ovu adresu u brze posete"
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
 
-#: ../midori/midori-browser.c:3767
-msgid "_Close Tab"
-msgstr "Z_atvori list"
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
 
-#: ../midori/midori-browser.c:3768
-msgid "Close the current tab"
-msgstr "Zatvara ovaj list"
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
 
-#: ../midori/midori-browser.c:3770
-msgid "C_lose Window"
-msgstr "_Zatvori prozor"
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
 
-#: ../midori/midori-browser.c:3771
-msgid "Close this window"
-msgstr "Zatvara ovaj prozor"
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
 
-#: ../midori/midori-browser.c:3774
-msgid "Print the current page"
-msgstr "Štampaj tekuću stranicu"
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3777
-msgid "Quit the application"
-msgstr "Zatvori program"
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
 
-#: ../midori/midori-browser.c:3779
-msgid "_Edit"
-msgstr "_Uređivanje"
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Jednostavan Internet preglednik."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Miloš Popović <gpopac@gmail.com>\n"
+"\n"
+"http://prevod.org — prevod na srpski jezik.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Miloš Popović https://launchpad.net/~gpopac\n"
+"  Morpheus https://launchpad.net/~morpheus021\n"
+"  belli https://launchpad.net/~belli-nis"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:3782
-msgid "Cut the selected text"
-msgstr "Iseca izabrani tekst i smešta ga spisak isečaka"
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr "Otvori novi prozor"
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr "Otvara novi list"
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr "Otvori datoteku"
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr "Sačuvaj u datoteku"
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr "Dodaj u _brze posete"
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr "Z_atvori list"
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr "Zatvara ovaj list"
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr "_Zatvori prozor"
 
-#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788
-msgid "Copy the selected text"
-msgstr "Umnožava izabrani tekst u spisak isečaka"
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr "Štampaj tekuću stranicu"
 
-#: ../midori/midori-browser.c:3791
-msgid "Paste text from the clipboard"
-msgstr "Ubacuje tekst iz spiska isečaka"
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
 
-#: ../midori/midori-browser.c:3794
-msgid "Delete the selected text"
-msgstr "Briše izabrani tekst"
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr "_Uređivanje"
 
-#: ../midori/midori-browser.c:3797
-msgid "Select all text"
-msgstr "Izabire sav tekst"
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3800
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Traži željenu reč ili izraz unutar stranici"
 
-#: ../midori/midori-browser.c:3802
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Traži _sledeće"
 
-#: ../midori/midori-browser.c:3803
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Pronalazi sledeću pojavu reči ili izraza"
-
-#: ../midori/midori-browser.c:3805
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Traži _prethodno"
 
-#: ../midori/midori-browser.c:3806
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Pronalazi prethodnu pojavu reči ili izraza"
-
-#: ../midori/midori-browser.c:3809
-msgid "_Quick Find"
-msgstr "Brzo _nađi"
-
-#: ../midori/midori-browser.c:3810
-msgid "Quickly jump to a word or phrase"
-msgstr "Brzo pronalazi reč ili izraz"
-
-#: ../midori/midori-browser.c:3813
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Podesite postavke programa"
 
-#: ../midori/midori-browser.c:3815
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "P_regled"
 
-#: ../midori/midori-browser.c:3816
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Palete a_lata"
 
-#: ../midori/midori-browser.c:3828
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Uvećaj prikaz"
 
-#: ../midori/midori-browser.c:3831
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Umanji prikaz"
 
-#: ../midori/midori-browser.c:3834
-msgid "Reset the zoom level"
-msgstr "Vrati veličinu prikaza"
-
-#: ../midori/midori-browser.c:3835
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodiranje"
 
-#: ../midori/midori-browser.c:3837
-msgid "_Automatic"
-msgstr "_Sam odredi"
-
-#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204
-msgid "Chinese (BIG5)"
-msgstr "Kineski (BIG5)"
-
-#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205
-msgid "Japanese (SHIFT_JIS)"
-msgstr "Japanski (_Shift_JIS)"
-
-#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206
-msgid "Russian (KOI8-R)"
-msgstr "Ruski (KOI8-R)"
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
 
-#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207
-msgid "Unicode (UTF-8)"
-msgstr "Unikod (UTF-_8)"
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
 
-#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208
-msgid "Western (ISO-8859-1)"
-msgstr "Zapadni (I_SO-8859-1)"
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
 
-#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209
-#: ../midori/midori-websettings.c:281
-msgid "Custom…"
-msgstr "Proizvoljno…"
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr "Prikazuje program preko celog ekrana"
 
-#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275
-msgid "View _Source"
-msgstr "_Izvorno izdanje stranice"
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
 
-#: ../midori/midori-browser.c:3859
-msgid "View the source code of the page"
-msgstr "Prikazuje izvorni kod stranice"
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
 
-#: ../midori/midori-browser.c:3861
-msgid "View Selection Source"
-msgstr "I_zvorno izdanje izabranog"
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
 
-#: ../midori/midori-browser.c:3862
-msgid "View the source code of the selection"
-msgstr "Prikazuje izvorni kod izabranog dela stranice"
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
 
-#: ../midori/midori-browser.c:3866
-msgid "Toggle fullscreen view"
-msgstr "Prikazuje program preko celog ekrana"
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
 
-#: ../midori/midori-browser.c:3868
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../midori/midori-browser.c:3871
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Ide na prethodnu stranicu"
 
-#: ../midori/midori-browser.c:3874
-msgid "Go forward to the next page"
-msgstr "Ide na sledeću stranicu"
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "Na po_četnu stranicu"
 
-#: ../midori/midori-browser.c:3877
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Ide na početnu stranu"
 
-#: ../midori/midori-browser.c:3879
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: ../midori/midori-browser.c:3880
-msgid "Delete the contents of the trash"
-msgstr "Briše sav sadržaj iz smeća"
-
-#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233
-msgid "Undo Close Tab"
-msgstr "Vrati list"
-
-#: ../midori/midori-browser.c:3883
-msgid "Open the last closed tab"
-msgstr "Otvara list koji ste poslednji zatvorili"
-
-#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230
-msgid "Add a new bookmark"
-msgstr "Dodaj obeleživač"
-
-#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259
-msgid "Add a new folder"
-msgstr "Dodaj novu fasciklu"
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
 
-#: ../midori/midori-browser.c:3890
-msgid "Add a new bookmark folder"
-msgstr "Dodaje novu fasciklu za obeleživače"
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:3891
-msgid "_Tools"
-msgstr "_Alati"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493
-msgid "_Manage Search Engines"
-msgstr "Po_desi pretraživače"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3894
-msgid "Add, edit and remove search engines…"
-msgstr "Otvara prozorče za dodavanje, uređivanje ili uklanjanje pretraživača."
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3897
-msgid "_Clear Private Data"
-msgstr "Očisti _lične podatke"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:3898
-msgid "Clear private data…"
-msgstr "Briše sve lične podatke."
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
 
-#: ../midori/midori-browser.c:3902
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Prethodni list"
 
-#: ../midori/midori-browser.c:3903
-msgid "Switch to the previous tab"
-msgstr "Ide na prethodni list"
-
-#: ../midori/midori-browser.c:3905
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Sledeći list"
 
-#: ../midori/midori-browser.c:3906
-msgid "Switch to the next tab"
-msgstr "Ide na naredni list"
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
 
-#: ../midori/midori-browser.c:3908
-msgid "_Help"
-msgstr "_Pomoć"
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
 
-#: ../midori/midori-browser.c:3910
-msgid "_Contents"
-msgstr "_Sadržaj"
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
 
-#: ../midori/midori-browser.c:3911
-msgid "Show the documentation"
-msgstr "Prikazuje pomoć za upotrebu programa"
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
 
-#: ../midori/midori-browser.c:3913
-msgid "_Frequent Questions"
-msgstr "_Česta pitanja"
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
 
-#: ../midori/midori-browser.c:3914
-msgid "Show the Frequently Asked Questions"
-msgstr "Prikazuje često postavljena pitanja"
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:3916
-msgid "_Report a Bug"
-msgstr "Prijavi _grešku"
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
 
-#: ../midori/midori-browser.c:3917
-msgid "Open Midori's bug tracker"
-msgstr "Otvara Midorijevu stranicu za prijavu greški"
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../midori/midori-browser.c:3920
-msgid "Show information about the program"
-msgstr "Prikazuje podatke o programu"
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr "_Česta pitanja"
 
-#: ../midori/midori-browser.c:3927
-msgid "P_rivate Browsing"
-msgstr "Čuvanje priva_tnosti"
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
 
-#: ../midori/midori-browser.c:3928
-msgid "Don't save any private data while browsing"
-msgstr "Ne čuva nikakve lične podatke tokom razgledanja Interneta"
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Alati"
 
-#: ../midori/midori-browser.c:3933
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Traka sa _menijem"
 
-#: ../midori/midori-browser.c:3934
-msgid "Show menubar"
-msgstr "Prikazuje meni programa"
-
-#: ../midori/midori-browser.c:3937
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Glavna traka"
 
-#: ../midori/midori-browser.c:3938
-msgid "Show navigationbar"
-msgstr "Prikazuje površ za kretanje kroz veb stranice"
-
-#: ../midori/midori-browser.c:3941
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Bočna _površ"
 
-#: ../midori/midori-browser.c:3942
-msgid "Show sidepanel"
-msgstr "Prikazuje bočnu površ"
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
 
-#: ../midori/midori-browser.c:3945
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Obeleživači"
 
-#: ../midori/midori-browser.c:3946
-msgid "Show bookmarkbar"
-msgstr "Prikazuje površ sa obeleživačima"
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr "Traka sa sta_njem"
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr "_Sam odredi"
 
-#: ../midori/midori-browser.c:3949
-msgid "_Transferbar"
-msgstr "Prenosi"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
 
-#: ../midori/midori-browser.c:3950
-msgid "Show transferbar"
-msgstr "Prikazuje traku sa prenosima datoteka"
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
 
-#: ../midori/midori-browser.c:3953
-msgid "_Statusbar"
-msgstr "Traka sa sta_njem"
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr "Ruski (KOI8-R)"
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr "Unikod (UTF-_8)"
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr "Zapadni (I_SO-8859-1)"
 
-#: ../midori/midori-browser.c:3954
-msgid "Show statusbar"
-msgstr "Prikazuje ili sakriva traku sa stanjem"
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr "Proizvoljno…"
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
 
-#: ../midori/midori-browser.c:4389
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Razdvajač"
 
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "Na _adresu…"
 
-#: ../midori/midori-browser.c:4398
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Otvara izabranu adresu"
 
-#: ../midori/midori-browser.c:4420
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "P_retraži Internet…"
 
-#: ../midori/midori-browser.c:4422
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Ide na stranicu za pretragu Interneta"
 
-#: ../midori/midori-browser.c:4443
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Vrati prethodne prozore i listove čitača"
 
-#: ../midori/midori-browser.c:4458
-msgid "_Recently visited pages"
-msgstr "_Skorašnje stranice"
-
-#: ../midori/midori-browser.c:4460
-msgid "Reopen pages that you visited earlier"
-msgstr "Otvara stranice koje ste ranije posetili"
-
-#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872
-msgid "_Bookmarks"
-msgstr "_Obeleživači"
-
-#: ../midori/midori-browser.c:4477
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Prikazuje sačuvane obeleživače"
 
-#: ../midori/midori-browser.c:4492
-msgid "_Window"
-msgstr "_Prozor"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:4494
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Prikazuje spisak svih otvorenih listova"
 
-#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:4674
-msgid "_Inline Find:"
-msgstr "_Traži izraz:"
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
 
-#: ../midori/midori-browser.c:4699
-msgid "Previous"
-msgstr "Prethodno"
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
 
-#: ../midori/midori-browser.c:4704
-msgid "Next"
-msgstr "Sledeće"
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:4709
-msgid "Match Case"
-msgstr "Uporedi velčinu slova"
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
 
-#: ../midori/midori-browser.c:4717
-msgid "Highlight Matches"
-msgstr "Istakni nađeno"
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
 
-#: ../midori/midori-browser.c:4727
-msgid "Close Findbar"
-msgstr "Zatvara traku za pretragu stranice"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
 
-#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821
-msgid "Delete All"
-msgstr "Obriši _sve"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
 
-#: ../midori/midori-browser.c:5084
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Neočekivana postavka „%s“"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
 
-#: ../midori/midori-panel.c:333
-msgid "Detach chosen panel from the window"
-msgstr "Otkači površ iz prozora"
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
 
-#: ../midori/midori-panel.c:335
-msgid "Whether to detach the chosen panel from the window"
-msgstr "Otkačuje izabranu površ iz prozora"
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
 
-#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535
-msgid "Align sidepanel on the right"
-msgstr "Postavi bočnu površ desno"
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
 
-#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536
-msgid "Whether to align the sidepanel on the right"
-msgstr "Određuje da li da se bočna površ ravna sa desnom stranom"
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
 
-#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358
-msgid "Close panel"
-msgstr "Zatvori površ"
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
 
-#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999
-#: ../midori/midori-view.c:2176
-msgid "Blank page"
-msgstr "Prazna strana"
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
 
-#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555
-msgid "Homepage"
-msgstr "Početna stranica"
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
 
-#: ../midori/midori-websettings.c:189
-msgid "Last open pages"
-msgstr "Poslednje stranice"
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
 
-#: ../midori/midori-websettings.c:224
-msgid "New tab"
-msgstr "novom listu"
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
 
-#: ../midori/midori-websettings.c:225
-msgid "New window"
-msgstr "novom prozoru"
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
 
-#: ../midori/midori-websettings.c:226
-msgid "Current tab"
-msgstr "trenutnom listu"
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
 
-#: ../midori/midori-websettings.c:241
-msgid "Default"
-msgstr "Uobičajeno"
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
 
-#: ../midori/midori-websettings.c:242
-msgid "Icons"
-msgstr "Ikonice"
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr "Zatvori površ"
 
-#: ../midori/midori-websettings.c:243
-msgid "Text"
-msgstr "Tekst"
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
 
-#: ../midori/midori-websettings.c:244
-msgid "Both"
-msgstr "Tekst ispod ikonica"
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
 
-#: ../midori/midori-websettings.c:245
-msgid "Both horizontal"
-msgstr "Tekst pored ikonica"
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
 
-#: ../midori/midori-websettings.c:260
-msgid "All cookies"
-msgstr "Sve kolačiće"
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
 
-#: ../midori/midori-websettings.c:261
-msgid "Session cookies"
-msgstr "Kolačiće sesije"
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
 
-#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94
-msgid "None"
-msgstr "Ništa"
-
-#: ../midori/midori-websettings.c:278
-msgid "Safari"
-msgstr "Safari"
-
-#: ../midori/midori-websettings.c:279
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../midori/midori-websettings.c:280
-msgid "Internet Explorer"
-msgstr "Internet Explorer"
-
-#: ../midori/midori-websettings.c:333
-msgid "Remember last window size"
-msgstr "Zapamti veličinu prozora"
-
-#: ../midori/midori-websettings.c:334
-msgid "Whether to save the last window size"
-msgstr "Da li da sačuvam poslednju veličinu prozora"
-
-#: ../midori/midori-websettings.c:342
-msgid "Last window width"
-msgstr "Širina prozora"
-
-#: ../midori/midori-websettings.c:343
-msgid "The last saved window width"
-msgstr "Poslednja sačuvana širina prozora"
-
-#: ../midori/midori-websettings.c:351
-msgid "Last window height"
-msgstr "Visina prozora"
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
 
-#: ../midori/midori-websettings.c:352
-msgid "The last saved window height"
-msgstr "Poslednja sačuvana visina prozora"
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
 
-#: ../midori/midori-websettings.c:377
-msgid "Last panel position"
-msgstr "Mesto panela"
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
 
-#: ../midori/midori-websettings.c:378
-msgid "The last saved panel position"
-msgstr "Poslednje sačuvano mesto panela"
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japanski (_Shift_JIS)"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:387
-msgid "Last panel page"
-msgstr "Poslednja stanica panela"
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr "novom listu"
 
-#: ../midori/midori-websettings.c:388
-msgid "The last saved panel page"
-msgstr "Poslednja sačuvana stranica u panelu"
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr "novom prozoru"
 
-#: ../midori/midori-websettings.c:396
-msgid "Last Web search"
-msgstr "Poslednja pretraga"
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr "trenutnom listu"
 
-#: ../midori/midori-websettings.c:397
-msgid "The last saved Web search"
-msgstr "Poslednja sačuvana Internet pretraga"
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr "Uobičajeno"
 
-#: ../midori/midori-websettings.c:406
-msgid "Show Menubar"
-msgstr "Prikaži meni"
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr "Ikonice"
 
-#: ../midori/midori-websettings.c:407
-msgid "Whether to show the menubar"
-msgstr "Određuje da li je prikazana traka sa menijem"
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
 
-#: ../midori/midori-websettings.c:415
-msgid "Show Navigationbar"
-msgstr "Prikaži glavnu traku"
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr "Tekst"
 
-#: ../midori/midori-websettings.c:416
-msgid "Whether to show the navigationbar"
-msgstr "Određuje da li je prikazana glavna traka"
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
 
-#: ../midori/midori-websettings.c:424
-msgid "Show Bookmarkbar"
-msgstr "Prikaži obeleživače"
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
 
-#: ../midori/midori-websettings.c:425
-msgid "Whether to show the bookmarkbar"
-msgstr "Određuje da li su prikazani obeleživači"
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
 
-#: ../midori/midori-websettings.c:433
-msgid "Show Panel"
-msgstr "Prikaži bočnu površ"
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
 
-#: ../midori/midori-websettings.c:434
-msgid "Whether to show the panel"
-msgstr "Određuje da li je prikazana bočna površ"
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
 
-#: ../midori/midori-websettings.c:449
-msgid "Show Transferbar"
-msgstr "Prikaži prenose"
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
 
-#: ../midori/midori-websettings.c:450
-msgid "Whether to show the transferbar"
-msgstr "Određuje da li je prikazana traka sa prenosima"
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr "Safari"
 
-#: ../midori/midori-websettings.c:458
-msgid "Show Statusbar"
-msgstr "Prikaži traku sa stanjem"
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
 
-#: ../midori/midori-websettings.c:459
-msgid "Whether to show the statusbar"
-msgstr "Određuje da li je prikazana traka sa stanjem"
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:468
-msgid "Toolbar Style"
-msgstr "Izgled trake sa alatkama"
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:469
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Određuje izgled trake sa alatkama"
 
-#: ../midori/midori-websettings.c:485
-msgid "Show progress in location entry"
-msgstr "Prikaži napredak u polje za adrese"
-
-#: ../midori/midori-websettings.c:486
-msgid "Whether to show loading progress in the location entry"
-msgstr "Prikazuje napredak učitavanja stranice u polje za unos adresa"
-
-#: ../midori/midori-websettings.c:501
-msgid "Search engines in location completion"
-msgstr "Prikaži pretraživače u polje za adresu"
-
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show search engines in the location completion"
-msgstr "Prikazuje pretraživače u polje za unos adresa"
-
-#: ../midori/midori-websettings.c:510
-msgid "Toolbar Items"
-msgstr "Stavke u traci sa alatkama"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
 
-#: ../midori/midori-websettings.c:511
-msgid "The items to show on the toolbar"
-msgstr "Stavke prikazane u traci sa alatkama"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
 
-#: ../midori/midori-websettings.c:519
-msgid "Compact Sidepanel"
-msgstr "Sabij bočnu površ"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Ne mogu da učitam podešavanja: %s\n"
 
-#: ../midori/midori-websettings.c:520
-msgid "Whether to make the sidepanel compact"
-msgstr "Zbija neke stavke u bočnoj površi"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Neispravna je vrednost „%s“ u podešavanjima"
 
-#: ../midori/midori-websettings.c:545
-msgid "Load on Startup"
-msgstr "Učitaj po pokretanju"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:546
-msgid "What to load on startup"
-msgstr "Određuje šta se učitava po pokretanju"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
 
-#: ../midori/midori-websettings.c:556
-msgid "The homepage"
-msgstr "Početna stranica"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
 
-#: ../midori/midori-websettings.c:571
-msgid "Show crash dialog"
-msgstr "Prikaži prozorče prilikom pada programa"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:572
-msgid "Show a dialog after Midori crashed"
-msgstr "Prikaži prozorče pri padu Midorija"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:588
-msgid "Show speed dial in new tabs"
-msgstr "Prikaži brze posete u novim listovima"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
 
-#: ../midori/midori-websettings.c:589
-msgid "Show speed dial in newly opened tabs"
-msgstr "Uključuje prikaz brzih adresa u novim listovima"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
 
-#: ../midori/midori-websettings.c:597
-msgid "Download Folder"
-msgstr "Fascikla za preuzeto"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
 
-#: ../midori/midori-websettings.c:598
-msgid "The folder downloaded files are saved to"
-msgstr "Fascikle u koju se smeštaju preuzete datoteke"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
 
-#: ../midori/midori-websettings.c:617
-msgid "Ask for the destination folder"
-msgstr "Pitaj za odredišnu fasciklu"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
 
-#: ../midori/midori-websettings.c:618
-msgid "Whether to ask for the destination folder when downloading a file"
-msgstr "Pita za odredišnu fasciklu prilikom preuzimanja datoteke"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
 
-#: ../midori/midori-websettings.c:637
-msgid "Notify when a transfer has been completed"
-msgstr "Obavesti me po završenom prenosu"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:638
-msgid "Whether to show a notification when a transfer has been completed"
-msgstr "Prikazuje obaveštenje kada se završi preuzimanje datoteke"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:650
-msgid "Download Manager"
-msgstr "Preuzimač datoteka"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:651
-msgid "An external download manager"
-msgstr "Spoljni program za preuzimanje datoteka"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:659
-msgid "Text Editor"
-msgstr "Uređivač teksta"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:660
-msgid "An external text editor"
-msgstr "Spoljni program za uređivanje teksta"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:675
-msgid "News Aggregator"
-msgstr "Čitač vesti"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:676
-msgid "An external news aggregator"
-msgstr "Spoljni program za čitanje vesti"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:684
-msgid "Location entry Search"
-msgstr "Pretraga u polje za adrese"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Pokušaj ponovo"
 
-#: ../midori/midori-websettings.c:685
-msgid "The search to perform inside the location entry"
-msgstr "Dodaje mogućnost pretrage iz polja za unos adresa"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:693
-msgid "Preferred Encoding"
-msgstr "Prednost kodiranju"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
 
-#: ../midori/midori-websettings.c:694
-msgid "The preferred character encoding"
-msgstr "Kodiranje znakova koje će biti u prednosti"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-websettings.c:704
-msgid "Always Show Tabbar"
-msgstr "Uvek prikaži jezičke"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Otvori vezu u novom _listu"
 
-#: ../midori/midori-websettings.c:705
-msgid "Always show the tabbar"
-msgstr "Uvek prikazuje traku sa jezičcima"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:713
-msgid "Close Buttons on Tabs"
-msgstr "Prikaži dugme za zatvaranje listova"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:714
-msgid "Whether tabs have close buttons"
-msgstr "Prikazuje dugme za zatvaranje na svakom listu"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Otvori vezu u _novom prozoru"
 
-# bug(slobo): jednostavno razlistaj?
-#: ../midori/midori-websettings.c:722
-msgid "Open new pages in"
-msgstr "Otvori nove stranice u"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
 
-#: ../midori/midori-websettings.c:723
-msgid "Where to open new pages"
-msgstr "Određuje gde da se otvaraju nove stranice"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
 
-#: ../midori/midori-websettings.c:732
-msgid "Open external pages in"
-msgstr "Otvori spoljne stranice u"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
 
-#: ../midori/midori-websettings.c:733
-msgid "Where to open externally opened pages"
-msgstr "Određuje gde se otvaraju spoljne stranice"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:746
-msgid "Middle click opens Selection"
-msgstr "Otvori izabrano na srednji klik"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
 
-#: ../midori/midori-websettings.c:747
-msgid "Load an address from the selection via middle click"
-msgstr "Učitava adresu iz izabranog na srednji klik mišem"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
 
-#: ../midori/midori-websettings.c:755
-msgid "Open tabs in the background"
-msgstr "Otvori listove u pozadini"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
 
-#: ../midori/midori-websettings.c:756
-msgid "Whether to open new tabs in the background"
-msgstr "Ne prelazi na novi list već ga otvara u pozadini"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
 
-#: ../midori/midori-websettings.c:764
-msgid "Open Tabs next to Current"
-msgstr "Otvori list pored trenutnog"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
 
-#: ../midori/midori-websettings.c:765
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Određuje da li se novi list otvara pored tekućeg ili pored poslednjeg lista"
+# bug: no plural-forms
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Otvoru adresu u novom _listu"
 
-#: ../midori/midori-websettings.c:773
-msgid "Open popups in tabs"
-msgstr "Smesti iskačuće prozore u list"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "Pre_traži sa"
 
-#: ../midori/midori-websettings.c:774
-msgid "Whether to open popup windows in tabs"
-msgstr "Otvara iskačuće prozore u novim listovima"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "P_retraži Internet"
 
-#: ../midori/midori-websettings.c:790
-msgid "Zoom Text and Images"
-msgstr "Uvećaj tekst i slike"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
 
-#: ../midori/midori-websettings.c:791
-msgid "Whether to zoom text and images"
-msgstr "Povećaj tekst i slike"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
 
-#: ../midori/midori-websettings.c:806
-msgid "Find inline while typing"
-msgstr "Nađi dok kucam"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:807
-msgid "Whether to automatically find inline while typing"
-msgstr "Automatski proverava pisanje dok kucate tekst"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:815
-msgid "Accept cookies"
-msgstr "Prihvati kolačiće"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Vrsta datoteke: „%s“"
 
-#: ../midori/midori-websettings.c:816
-msgid "What type of cookies to accept"
-msgstr "Koje kolačiće da prihvatim"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Vrsta datoteke: %s („%s“)"
 
-#: ../midori/midori-websettings.c:825
-msgid "Original cookies only"
-msgstr "Samo originalne kolačiće"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:826
-msgid "Accept cookies from the original website only"
-msgstr "Prihvata kolačiće samo sa originalnih veb stranica"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "Otvori %s"
 
-#: ../midori/midori-websettings.c:834
-msgid "Maximum cookie age"
-msgstr "Starost kolačića"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Inspekcija stranice — %s"
 
-#: ../midori/midori-websettings.c:835
-msgid "The maximum number of days to save cookies for"
-msgstr "Broj dana nakon čega se uklanjaju kolačići sa računara"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:845
-msgid "Remember last visited pages"
-msgstr "Zapamti poslednje posećene stranice"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
 
-#: ../midori/midori-websettings.c:846
-msgid "Whether the last visited pages are saved"
-msgstr "Čuva stranice koje ste poslednje posetili"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:854
-msgid "Maximum history age"
-msgstr "Starost istorijata"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:855
-msgid "The maximum number of days to save the history for"
-msgstr "Broj dana nakon kojih se uklanja istorijat poseta stranica"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:863
-msgid "Remember last form inputs"
-msgstr "Zapamti poslednje unose u polja"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
 
-#: ../midori/midori-websettings.c:864
-msgid "Whether the last form inputs are saved"
-msgstr "Čuva poslednje unose u polja veb stranica"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
 
-#: ../midori/midori-websettings.c:872
-msgid "Remember last downloaded files"
-msgstr "Zapamti poslednje preuzete datoteke"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
 
-#: ../midori/midori-websettings.c:873
-msgid "Whether the last downloaded files are saved"
-msgstr "Čuva datoteke koje ste poslednje preuzeli"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
 
-#: ../midori/midori-websettings.c:883
-msgid "Proxy Server"
-msgstr "Proksi server"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
 
-#: ../midori/midori-websettings.c:884
-msgid "The proxy server used for HTTP connections"
-msgstr "Proksi server za HTTP veze"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:899
-msgid "Detect proxy server automatically"
-msgstr "Sam odredi proksi server"
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
 
-#: ../midori/midori-websettings.c:900
-msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "Pokušava da sam odredi proksi server na osnovu okruženja"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
 
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:916
-msgid "Identify as"
-msgstr "Predstavi se kao"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Prazna strana"
 
-#: ../midori/midori-websettings.c:917
-msgid "What to identify as to web pages"
-msgstr "Određuje kako se program predstavlja veb stranicama"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
 
-#: ../midori/midori-websettings.c:933
-msgid "Identification string"
-msgstr "Rečenica za predstavanje"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
 
-#: ../midori/midori-websettings.c:934
-msgid "The application identification string"
-msgstr "Rečenica koja određuje kako veb stranice prepoznaju program"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Prikaži pozadinske slike"
 
-#: ../midori/midori-websettings.c:942
-msgid "Cache size"
-msgstr "Veličina ostave"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Određuje da li treba prikazati slike za pozadinu"
 
-#: ../midori/midori-websettings.c:943
-msgid "The allowed size of the cache"
-msgstr "Dozvoljena veličina ostave"
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Mogućnosti"
 
-#: ../midori/midori-view.c:686
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Ne mogu da učitam stranicu „%s“."
-
-#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
-#. so reloading via Javascript works but not via API calls.
-#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701
-#: ../extensions/feed-panel/main.c:112
-msgid "Error"
-msgstr "Greška"
-
-#: ../midori/midori-view.c:691
-msgid "Try again"
-msgstr "Pokušaj ponovo"
+msgid "%s of %s"
+msgstr "%s od %s"
 
-#. i18n: The title of the 404 - Not found error page
-#. Error pages are special, we want to try loading the destination
-#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:721 ../midori/midori-view.c:2705
+#: ../midori/midori-download.vala:75
 #, c-format
-msgid "Not found - %s"
-msgstr "Nije pronađeno - %s"
-
-#: ../midori/midori-view.c:1095
-msgid "Open _Link"
-msgstr "_Otvori vezu"
-
-#: ../midori/midori-view.c:1097
-msgid "Open Link in New _Tab"
-msgstr "Otvori vezu u novom _listu"
-
-#: ../midori/midori-view.c:1114
-msgid "Open Link in New _Window"
-msgstr "Otvori vezu u _novom prozoru"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1123
-msgid "_Download Link destination"
-msgstr "Preuzmi _ciljnu datoteku"
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1129
-msgid "_Save Link destination"
-msgstr "Sačuvaj ci_ljnu datoteku"
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-view.c:1138
-msgid "Download with Download _Manager"
-msgstr "Pre_uzmi pomoću spoljašnjeg programa"
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
 
-#: ../midori/midori-view.c:1167
-msgid "Search _with"
-msgstr "Pre_traži sa"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
 
-#: ../midori/midori-view.c:1195
-msgid "_Search the Web"
-msgstr "P_retraži Internet"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
 
-# bug: no plural-forms
-#: ../midori/midori-view.c:1205
-msgid "Open Address in New _Tab"
-msgstr "Otvoru adresu u novom _listu"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
 
-#: ../midori/midori-view.c:1372
-msgid "Open or download file"
-msgstr "Otvori ili preuzmi datoteku"
+#: ../midori/midori-download.vala:221
+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:1389
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "File Type: '%s'"
-msgstr "Vrsta datoteke: „%s“"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
 
-#: ../midori/midori-view.c:1392
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Vrsta datoteke: %s („%s“)"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:1396
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "Otvori %s"
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
 
-#: ../midori/midori-view.c:1816
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Inspekcija stranice — %s"
+msgid "The file needs %s but only %s are left."
+msgstr ""
 
-#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002
-msgid "Search"
-msgstr "Nađi"
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
 
-#: ../midori/midori-view.c:2003
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Kliknite za dodavanje prečice"
 
-#: ../midori/midori-view.c:2004
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Unesite adresu za prečicu"
 
-#: ../midori/midori-view.c:2005
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Unesite naslov za prečicu"
 
-#: ../midori/midori-view.c:2006
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Da li zaista želite da obrišete ovu prečicu?"
 
-#: ../midori/midori-view.c:2038
-#, c-format
-msgid "Document cannot be displayed"
-msgstr "Ne mogu da prikažem dokumant"
-
-#: ../midori/midori-view.c:2055
-#, c-format
-msgid "No documentation installed"
-msgstr "Nije instalirana pomoć"
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr "Pokretanje"
 
-#: ../midori/midori-preferences.c:91
-#, c-format
-msgid "Preferences for %s"
-msgstr "Postavke za %s"
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
 
-#. Page "General"
-#: ../midori/midori-preferences.c:398
-msgid "General"
-msgstr "Opšte"
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:399
-msgid "Startup"
-msgstr "Pokretanje"
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
 
-#: ../midori/midori-preferences.c:415
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Iskoristi trenutnu stranicu"
 
-#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88
-msgid "Transfers"
-msgstr "Prenosi"
-
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:440
-msgid "Appearance"
-msgstr "Izgled"
-
-#: ../midori/midori-preferences.c:441
-msgid "Font settings"
-msgstr "Podešavanje fontova"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
 
-#: ../midori/midori-preferences.c:443
-msgid "Default Font Family"
-msgstr "Uobičajeni fontovi"
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Podrazumevani fontovi za prikaz teksta"
 
-#: ../midori/midori-preferences.c:450
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Podrazumevani veličina fontova za prikaz teksta"
 
-#: ../midori/midori-preferences.c:453
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Fontovi zadate širine"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Podrazumevani fontovi zadate širine za prikaz teksta"
 
-#: ../midori/midori-preferences.c:458
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Najmanja veličina fonta"
 
-#: ../midori/midori-preferences.c:461
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "najmanja veličina fontova za prikaz teksta"
 
-#: ../midori/midori-preferences.c:468
-msgid "Encoding"
-msgstr "Kodiranje"
-
-#: ../midori/midori-preferences.c:471
-msgid "The character encoding to use by default"
-msgstr "Podrazumevano kodiranje teksta"
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Prednost kodiranju"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:478
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Ponašanje"
 
-#: ../midori/midori-preferences.c:479
-msgid "Features"
-msgstr "Mogućnosti"
-
-#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Sam učitaj slike"
 
-#: ../midori/midori-preferences.c:483
-msgid "Load and display images automatically"
-msgstr "Učitava i automatski prikazuje slike"
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Uključi proveru pisanja"
 
-#: ../midori/midori-preferences.c:486
-msgid "Shrink images automatically"
-msgstr "Sam umanji slike"
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Uključi skripte"
 
-#: ../midori/midori-preferences.c:487
-msgid "Automatically shrink standalone images to fit"
-msgstr "Sam umanji slike kako bi se uklopile u stranicu"
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
 
-#: ../midori/midori-preferences.c:490
-msgid "Print background images"
-msgstr "Prikaži pozadinske slike"
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Uvećaj tekst i slike"
 
-#: ../midori/midori-preferences.c:491
-msgid "Whether background images should be printed"
-msgstr "Određuje da li treba prikazati slike za pozadinu"
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
 
-#: ../midori/midori-preferences.c:494
-msgid "Resizable text areas"
-msgstr "Omogući promenu veličine teksta"
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
 
-#: ../midori/midori-preferences.c:495
-msgid "Whether text areas are resizable"
-msgstr "Omogućava promenu veličine oblasti sa tekstom"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
 
-#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63
-msgid "Enable scripts"
-msgstr "Uključi skripte"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-preferences.c:499
-msgid "Enable embedded scripting languages"
-msgstr "uključuje umetnute jezike za skripte"
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
 
-#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72
-msgid "Enable Netscape plugins"
-msgstr "Uključi Netscape dodatke"
+#: ../midori/midori-preferences.c:426
+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-preferences.c:503
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Omogućava objekte sa ugnežđenim Netscape dodacima"
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:506
-msgid "Enforce 96 dots per inch"
-msgstr "Primoraj 96 tačaka po inču"
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Razgledanje"
 
-#: ../midori/midori-preferences.c:507
-msgid "Enforce a video dot density of 96 DPI"
-msgstr "Primorava gustinu tačaka ekrana od 96 TPI"
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:510
-msgid "Enable developer tools"
-msgstr "Uključi alate za razvoj"
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:511
-msgid "Enable special extensions for developers"
-msgstr "Uključi dodatna proširenja za razvoj"
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:518
-msgid "Spell Checking"
-msgstr "Provera pisanja"
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:521
-msgid "Enable Spell Checking"
-msgstr "Uključi proveru pisanja"
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Prikaži dugme za zatvaranje listova"
 
-#: ../midori/midori-preferences.c:522
-msgid "Enable spell checking while typing"
-msgstr "Uključi proveru pisanja dok kucam"
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Otvori list pored trenutnog"
 
-#: ../midori/midori-preferences.c:525
+#: ../midori/midori-preferences.c:487
 msgid ""
-"A comma separated list of languages to be used for spell checking, for "
-"example \"en_GB,de_DE\""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr ""
-"Spisak jezika jezika za proveru pisanja razdvojeni zarezom "
-"(npr. en_GB,sh_YU,sr_YU)"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:530
-msgid "Interface"
-msgstr "Sučelje"
-
-#: ../midori/midori-preferences.c:531
-msgid "Navigationbar"
-msgstr "Glavna traka"
+"Određuje da li se novi list otvara pored tekućeg ili pored poslednjeg lista"
 
-#: ../midori/midori-preferences.c:542
-msgid "Browsing"
-msgstr "Razgledanje"
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Otvori listove u pozadini"
 
-#. Page "Applications"
-#: ../midori/midori-preferences.c:572
-msgid "Applications"
-msgstr "Programi"
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Uređivač teksta"
 
-#: ../midori/midori-preferences.c:573
-msgid "External applications"
-msgstr "Spoljni programi"
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Čitač vesti"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Mreža"
 
-#: ../midori/midori-preferences.c:647
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#. Page "Privacy"
-#: ../midori/midori-preferences.c:652
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Predstavi se kao"
+
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: ../midori/midori-preferences.c:653
-msgid "Web Cookies"
-msgstr "Kolačići"
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
 
-#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676
-msgid "days"
-msgstr "dana"
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Broj dana nakon čega se uklanjaju kolačići sa računara"
 
-#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314
-msgid "Empty"
-msgstr "Prazno"
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
 
-#: ../midori/midori-searchaction.c:904
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Broj dana nakon kojih se uklanja istorijat poseta stranica"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Proširenja"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Po_desi pretraživače"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Dodaj pretraživač"
 
-#: ../midori/midori-searchaction.c:904
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Uredi pretračivač"
 
-#: ../midori/midori-searchaction.c:932
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../midori/midori-searchaction.c:976
-msgid "_Icon:"
-msgstr "I_konica:"
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr "_Opis:"
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "_Adresa:"
 
-#: ../midori/midori-searchaction.c:990
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Fraza:"
 
-#: ../midori/midori-searchaction.c:1195
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Podesi pretraživače"
 
-#: ../midori/midori-searchaction.c:1292
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "_Postavi kao podrazumevani"
 
-#: ../midori/sokoke.c:162 ../midori/sokoke.c:174
-msgid "Could not run external program."
-msgstr "Ne mogu da pokrenem spoljni program."
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Ne mogu da učitam pretraživače. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Ne mogu da sačuvam pretraživače. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#. i18n: A superuser, or system administrator, may not be 'root'
-#: ../midori/sokoke.c:520
-msgid "Warning: You are using a superuser account!"
-msgstr "Upozorenje: Koristite administratorski nalog!"
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
 
-#: ../midori/sokoke.c:871
-msgid "_Bookmark"
-msgstr "_Obeleživač"
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/sokoke.c:873
-msgid "_Add Bookmark"
-msgstr "_Dodaj obeleživač"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
 
-#: ../midori/sokoke.c:874
-msgid "_Console"
-msgstr "_Konzola"
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
 
-#: ../midori/sokoke.c:875
-msgid "_Extensions"
-msgstr "P_roširenja"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
 
-#: ../midori/sokoke.c:876
-msgid "_History"
-msgstr "_Istorijat"
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
 
-#: ../midori/sokoke.c:877
-msgid "_Homepage"
-msgstr "Na po_četnu stranicu"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Ne mogu da pokrenem spoljni program."
 
-#: ../midori/sokoke.c:878
-msgid "_Userscripts"
-msgstr "Lične _skripte"
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
 
-#: ../midori/sokoke.c:879
-msgid "User_styles"
-msgstr "Lični s_tilovi"
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr "_Traži izraz:"
 
-#: ../midori/sokoke.c:880
-msgid "New _Tab"
-msgstr "Novi _list"
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr "Prethodno"
 
-#: ../midori/sokoke.c:881
-msgid "_Transfers"
-msgstr "Pr_enoisi"
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr "Sledeće"
 
-#: ../midori/sokoke.c:882
-msgid "Netscape p_lugins"
-msgstr "Netscape _dodaci"
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr "Uporedi velčinu slova"
 
-#: ../midori/sokoke.c:883
-msgid "_Closed Tabs and Windows"
-msgstr "_Zatvoreni listovi i prozori"
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr "Zatvara traku za pretragu stranice"
 
-#: ../midori/sokoke.c:884
-msgid "New _Window"
-msgstr "_Novi prozor"
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141
-msgid "Userscripts"
-msgstr "Lične skripte"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143
-msgid "Userstyles"
-msgstr "Lični stilovi"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144
-msgid "_Enable"
-msgstr "_Uključi"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145
-msgid "Enable"
-msgstr "Uključi"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154
-msgid "_Disable"
-msgstr "_Isključi"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155
-msgid "Disable"
-msgstr "Isključi"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:107
-msgid "Bookmarks"
-msgstr "Obeleživači"
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:238
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Uredi izabrani obeleživač"
 
-#: ../panels/midori-bookmarks.c:246
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Ukloni izabrani obeleživač"
 
-#: ../panels/midori-bookmarks.c:591
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr "Dodaj novu fasciklu"
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Razdvajač</i>"
 
-#: ../panels/midori-console.c:87
-msgid "Console"
-msgstr "Konzola"
+# bug: no plural-forms
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Otvoru u novom _listu"
 
-#: ../panels/midori-extensions.c:87
-msgid "Extensions"
-msgstr "Proširenja"
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
 
-#: ../panels/midori-history.c:162
-msgid "Are you sure you want to remove all history items?"
-msgstr "Da li zaista želite da uklonite sve stavke iz istorijata?"
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Istorijat"
 
-#: ../panels/midori-history.c:217
-msgid "Bookmark the selected history item"
-msgstr "Postavi izabrani iz istorijata u obeleživače"
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr "Danas"
 
-#: ../panels/midori-history.c:226
-msgid "Delete the selected history item"
-msgstr "Ukloni izabranu stavku iz istorijata"
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr "Juče"
 
-#: ../panels/midori-history.c:234
-msgid "Clear the entire history"
-msgstr "Očisti istorijat"
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-history.c:599
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Pre nedelju dana"
 
-#: ../panels/midori-history.c:604
+#: ../panels/midori-history.c:185
 #, c-format
-msgid "%d day ago"
-msgstr "Pre %d dan"
+msgid "Failed to remove history item: %s\n"
+msgstr "Ne mogu da uklonim stavku iz istorijata: %s\n"
 
-#: ../panels/midori-history.c:605
-#, c-format
-msgid "%d days ago"
-msgstr "Pre %d dana"
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr "Da li zaista želite da uklonite sve stavke iz istorijata?"
 
-#: ../panels/midori-history.c:612
-msgid "Today"
-msgstr "Danas"
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr "Postavi izabrani iz istorijata u obeleživače"
 
-#: ../panels/midori-history.c:614
-msgid "Yesterday"
-msgstr "Juče"
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr "Ukloni izabranu stavku iz istorijata"
 
-#: ../panels/midori-plugins.c:87
-msgid "Netscape plugins"
-msgstr "Netscape dodaci"
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr "Očisti istorijat"
 
-#: ../panels/midori-transfers.c:256
-#, c-format
-msgid "%s of %s"
-msgstr "%s od %s"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr ""
 
-#: ../katze/katze-http-auth.c:97
+#: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Potrebna je prijava"
 
-#: ../katze/katze-http-auth.c:113
+#: ../katze/katze-http-auth.c:226
 msgid ""
 "A username and a password are required\n"
 "to open this location:"
@@ -1811,60 +1995,204 @@ msgstr ""
 "Potrebno su korisničko ime i lozinka za\n"
 "otvaranje ove stranice:"
 
-#: ../katze/katze-http-auth.c:127
+#: ../katze/katze-http-auth.c:240
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: ../katze/katze-http-auth.c:138
+#: ../katze/katze-http-auth.c:253
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../katze/katze-throbber.c:828
-#, c-format
-#, fuzzy
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Ne mogu da imenovanu učitam ikonicu „%s“"
-
-#: ../katze/katze-throbber.c:841
-#, c-format
-#, fuzzy
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Ne mogu da učitam stok ikonicu „%s“"
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr ""
 
-#: ../katze/katze-throbber.c:907
-msgid "Animation frames are broken"
-msgstr "Okviri sa animacijama su neispravni"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ništa"
 
-#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Vrednost „%s“ nije ispravna za  %s"
 
-#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Izaberite datoteku"
 
-#: ../katze/katze-utils.c:230
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Izaberite fasciklu"
 
-#: ../extensions/colorful-tabs.c:115
-msgid "Tint tabs distinctly"
-msgstr "Drugačije oboji listove"
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
 
-#: ../extensions/colorful-tabs.c:151
-msgid "Colorful Tabs"
-msgstr "Listovi u boji"
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
 
-#: ../extensions/colorful-tabs.c:152
-msgid "Tint each tab distinctly"
-msgstr "Boji svaku karticu drugačije"
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
 
-#: ../extensions/cookie-manager.c:201
-msgid "At the end of the session"
-msgstr "Na kraju sesije"
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr "Postavke za %s"
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr "Lične skripte"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr "Lični stilovi"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr "Greška"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr "Listovi u boji"
+
+#: ../extensions/colorful-tabs.c:258
+msgid "Tint each tab distinctly"
+msgstr "Boji svaku karticu drugačije"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "Upravnik kolačićima"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
+msgid "Delete All"
+msgstr "Obriši _sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Briše sve prikazane kolačiće. Ukoliko je postavljen filter obrisaće samo "
+"kolačiće koji se poklapaju sa filterom."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
+msgid "Expand All"
+msgstr "Proširi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr "Sakupi sve"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr "Da li želite da obrišete sve kolačiće"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr "Pitanje"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Biće obrisani samo kolačići koji se poklapaju sa zadatim filterom."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr "Na kraju sesije"
 
-#: ../extensions/cookie-manager.c:204
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -1881,183 +2209,1237 @@ msgstr ""
 "<b>Sigurnost</b>: %s\n"
 "<b>Ističe</b>: %s"
 
-#: ../extensions/cookie-manager.c:210
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Da"
 
-#: ../extensions/cookie-manager.c:210
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ne"
 
-#: ../extensions/cookie-manager.c:493
-msgid "Do you really want to delete all cookies?"
-msgstr "Da li želite da obrišete sve kolačiće"
-
-#: ../extensions/cookie-manager.c:495
-msgid "Question"
-msgstr "Pitanje"
-
-#: ../extensions/cookie-manager.c:504
-msgid "Only cookies which match the filter will be deleted."
-msgstr "Biće obrisani samo kolačići koji se poklapaju sa zadatim filterom."
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
 
-#: ../extensions/cookie-manager.c:682
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Ime"
 
-#: ../extensions/cookie-manager.c:742
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Proširi sve"
 
-#: ../extensions/cookie-manager.c:750
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Sakupi sve"
 
-#: ../extensions/cookie-manager.c:823
-msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+msgid "Search Cookies by Name or Domain"
 msgstr ""
-"Briše sve prikazane kolačiće. Ukoliko je postavljen filter obrisaće samo "
-"kolačiće koji se poklapaju sa filterom."
 
-#: ../extensions/cookie-manager.c:838
-msgid "Expand All"
-msgstr "Proširi sve"
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "Ispisuje, uređuje i uklanja kolačiće"
 
-#: ../extensions/cookie-manager.c:845
-msgid "Collapse All"
-msgstr "Sakupi sve"
+#: ../extensions/copy-tabs.c:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
 
-#: ../extensions/cookie-manager.c:876
-msgid "Filter:"
-msgstr "Filter:"
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
 
-#: ../extensions/cookie-manager.c:881
+#: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+"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."
 msgstr ""
-"Unesite reč za filtriranje kolačića čiji se nazivi ili adrese poklapaju sa "
-"filterom"
 
-#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964
-msgid "Cookie Manager"
-msgstr "Upravnik kolačićima"
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
 
-#: ../extensions/cookie-manager.c:948
-msgid "_Cookie Manager"
-msgstr "_Upravnik kolačićima"
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
 
-#: ../extensions/cookie-manager.c:965
-msgid "List, view and delete cookies"
-msgstr "Ispisuje, uređuje i uklanja kolačiće"
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
 
-#: ../extensions/feed-panel/feed-atom.c:242
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "Ne mogu da nađem potrebni Atom „entry“ među XML podacima."
 
-#: ../extensions/feed-panel/feed-atom.c:348
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "Ne mogu da nađem potrebni Atom „fees“ među XML podacima."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:399
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Zadnji pit ažuriran: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:664
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Dovodi"
 
-#: ../extensions/feed-panel/feed-panel.c:717
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Dodaj novi dovod"
 
-#: ../extensions/feed-panel/feed-panel.c:724
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Obriči dovod"
 
-#: ../extensions/feed-panel/feed-panel.c:807
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Dovodi"
 
-#: ../extensions/feed-panel/feed-parse.c:175
+#: ../extensions/feed-panel/feed-parse.c:195
 #, c-format
 msgid "Failed to find root element in feed XML data."
 msgstr "Ne mogu da nađem izvorne podatke među XML podacima."
 
-#: ../extensions/feed-panel/feed-parse.c:215
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Nije podržan format dovoda."
 
-#: ../extensions/feed-panel/feed-parse.c:245
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "Ne mogu da obradim XML dovod: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Ne mogu da nađem element „channel“ među XML podacima."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Pronađeno je nepodržano izdanje vesti."
 
-#: ../extensions/feed-panel/feed-rss.c:144
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Ne mogu da nađem potrebni „item“ element vesti među XML podacima."
 
-#: ../extensions/feed-panel/feed-rss.c:229
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Ne mogu da nađem potrebni „channel“ element vesti među XML podacima."
 
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Dovod „%s“ već postoji"
 
-#: ../extensions/feed-panel/main.c:191
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Greška pri učitavanju dodova „%s“"
 
-#: ../extensions/feed-panel/main.c:331
-msgid "New feed"
-msgstr "Novi dovod"
-
-#: ../extensions/feed-panel/main.c:489
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Površ sa dovodima"
 
-#: ../extensions/feed-panel/main.c:490
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Čita Atome / dovode sa vestima"
 
-#: ../extensions/mouse-gestures/main.c:216
-msgid "Mouse Gestures"
-msgstr "Gestovi miša"
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
 
-#: ../extensions/mouse-gestures/main.c:217
-msgid "Control Midori by moving the mouse"
-msgstr "Upravlja Midorijem pomoću miša"
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
 
-#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
-msgid "Pageholder"
-msgstr "Umetnuta stranica"
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
 
-#: ../extensions/page-holder.c:161
-msgid "_Pageholder"
-msgstr "_Umetnuta stranica"
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:104
-msgid "Statusbar Features"
-msgstr "Mogućnosti linije sa stanjem"
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:105
-msgid "Easily toggle features on web pages on and off"
-msgstr "Jednostavno uključuje i isključuje opcije na veb stranicama"
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Gestovi miša"
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Upravlja Midorijem pomoću miša"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 dodaci"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Uključi Netscape dodatke"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Mogućnosti linije sa stanjem"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "Jednostavno uključuje i isključuje opcije na veb stranicama"
+
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Očisti lične podatke"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "O_čisti lične podatke"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Čišćenje sledećih podataka:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Ikonice veb stranica"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Ne mogu da očistim istorijat: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Ne mogu da uklonim stare stavke iz istorijata: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Ne mogu da sačuvam podešavanja. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Ne mogu da sačuvam dokument. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Izmeni pos_tavke"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Isključi sva p_roširenja"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Prikaži prozorče pri padu Midorija"
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Već je pokrenut jedan Midori prozor, ali ne daje odziv.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Ne mogu da učitam sesiju: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Ne mogu da učitam smeće: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Ne mogu da učitam istorijat: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Javile su se sledeće greške:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Zanemari"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Programi"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Prenosi"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Preuzimanje je završeno"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index e0abd266eb25b0ee0cfba2646edf20fe2cf122fd..7582971e2ba97023cedc6200af0f66fcd8047a8b 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
 # Mikael Magnusson <mikachu@comhem.se>, 2008.
 # Daniel Nylander <po@danielnylander.se>, 2008, 2009.
 # Oscar Rentzhog <oscar.rentzhog@gmail.com> 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-19 18:30+0000\n"
-"PO-Revision-Date: 2009-12-16 18:44+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-04-13 13:57+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Swedish\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-Launchpad-Export-Date: 2015-04-14 05:10+0000\n"
+"X-Generator: Launchpad (build 17423)\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/midori.desktop.in.h:1
-msgid "Browse the Web"
-msgstr "Surfa på webben"
-
-#: ../data/midori.desktop.in.h:2
-msgid "Internet;WWW;Explorer"
-msgstr "Internet;WWW;Explorer"
-
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Webbläsare"
+
+#: ../data/midori.desktop.in.h:3
 msgid "Midori Web Browser"
 msgstr "Webbläsaren Midori"
 
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Surfa på nätet"
+
 #: ../data/midori.desktop.in.h:5
-msgid "New Private Browsing Window"
-msgstr "Nytt Privat Fönster"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1416
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
-msgstr "Ny Flik"
+msgstr "Ny flik"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1413
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
-msgstr "Nytt Fönster"
+msgstr "Nytt fönster"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Webbläsare"
+msgid "New Private Browsing Window"
+msgstr "Nytt privat fönster"
 
 #: ../data/midori-private.desktop.in.h:1
-#, fuzzy
 msgid "Midori Private Browsing"
-msgstr "P_rivat läge"
+msgstr "Midori privat webbläsning"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Privat webbläsning"
 
-#: ../data/midori-private.desktop.in.h:2
+#: ../data/midori-private.desktop.in.h:3
 msgid "Open a new private browsing window"
 msgstr "Öppna ett nytt privat fönster"
 
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4411
-#, fuzzy
-msgid "Private Browsing"
-msgstr "P_rivat läge"
-
-#: ../midori/main.c:72
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Ögonblicksbild sparad till: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
-msgstr "Kör ADRESS som en webapp"
+msgstr "Kör ADDRESS som en webbapplikation"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
-msgstr "ADRESS"
+msgstr "ADDRESS"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
-msgstr "Använd MAPP som konfigurationsmapp"
+msgstr "Använd FOLDER som konfigurationsmapp"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
-msgstr "MAPP"
+msgstr "FOLDER"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Privat surfning, inga ändringar kommer att sparas"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
-msgstr ""
+msgstr "Portablet läge. Alla filer programmet använder samlas på ett ställe."
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
-msgstr "Enkelt GTK+ fönster med WebKit, liknande GtkLauncher"
+msgstr "Enkelt GTK+-fönster med WebKit, liknande GtkLauncher"
 
-#: ../midori/main.c:111
-#, fuzzy
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
-msgstr "Visa krashdialogen"
+msgstr "Visa diagnostisk information"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
-msgstr "Kör inuti gdb och spara bakåtspåringen vid crash"
+msgstr "Kör inuti gdb och spara bakåtspårningen vid krasch"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Kör det valda filnamnet som javaskript"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
-msgstr "Ta en ögonblicksbild av det specifierade URI"
+msgstr "Ta en ögonblicksbild av den specifierade länken"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Kör det valda kommandot"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Visa tillgängliga kommandon som kan köras med -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Visa programversion"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
-msgstr ""
+msgstr "Spärra URI:er enligt reguljärt uttryck PATTERN"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
-msgstr "MÖNSTER"
+msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Återställ Midori efter SECONDS sekunders inaktivitet"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
-msgstr "SEKUNDER"
+msgstr "SECONDS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Fel: \"gdb\" kunde inte hittas\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "Var god skicka kommentarer, förslag och buggrapporter till:"
+msgstr "Skicka kommentarer, förslag och buggrapporter till:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Leta efter nya verioner på:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr "Ett okänt fel inträffade."
+msgstr "Ett okänt fel inträffade"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6144
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Bokmärken"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "Lägg till bokmä_rke"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Tillägg"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Historik"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Användarskript"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Användar_stilar"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Ny fli_k"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
-msgstr "_Överföringar"
+msgstr "Hämtningar"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape-_tillägg"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Stängda flikar"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5288
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Nytt _fönster"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
-msgstr "Ny Mapp"
+msgstr "Ny _mapp"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Adresser]"
 
@@ -231,140 +229,148 @@ msgstr "Felformaterat dokument."
 
 #: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
-msgstr "Oigenkännt bokmärkesformat."
+msgstr "Ont bokmärkesformat."
 
-#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
-msgstr "Gå fram till nästa sida"
+msgstr "Gå framåt till nästa sida"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5428
-#: ../midori/midori-browser.c:5431
-#, fuzzy
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
-msgstr "Gå fram till nästa sida"
+msgstr "Gå til nästa undersida"
 
-#: ../midori/midori-browser.c:353
-#, fuzzy
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
-msgstr "_Webbsökning…"
+msgstr "Webbsökning..."
 
-#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5369
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
-msgstr "Uppdatera sidan"
+msgstr "Ladda om nuvarande sida"
 
-#: ../midori/midori-browser.c:465 ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Stoppa inläsning av sidan"
 
-#: ../midori/midori-browser.c:535
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Misslyckades att uppdatera titel: %s\n"
 
-#: ../midori/midori-browser.c:574 ../midori/midori-browser.c:630
-#: ../midori/midori-browser.c:633 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Värdet \"%s\" är ogiltigt för %s"
 
-#: ../midori/midori-browser.c:582 ../midori/midori-browser.c:653
-#: ../midori/midori-browser.c:6963
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Oväntad inställning '%s'"
 
-#: ../midori/midori-browser.c:590 ../midori/midori-browser.c:663
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Oväntat beteende '%s'."
 
-#: ../midori/midori-browser.c:743
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
-msgstr "%s (Privat Surfning)"
+msgstr "%s (Privat surfning)"
 
-#: ../midori/midori-browser.c:853 ../midori/midori-browser.c:895
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Det gick inte att spara %s i historiken.\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "5"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../midori/midori-browser.c:949
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "Ny mapp"
 
-#: ../midori/midori-browser.c:949
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "Redigera mapp"
 
-#: ../midori/midori-browser.c:951
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "Nytt bokmärke"
 
-#: ../midori/midori-browser.c:951
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Redigera bokmärke"
 
-#: ../midori/midori-browser.c:985
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Skriv in ett namn för detta bokmärke och ange vart det skall sparas."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Ge bokmärket ett namn och välj var det ska sparas."
 
-#: ../midori/midori-browser.c:1041
-#, fuzzy
-msgid "Add to _Speed Dial"
-msgstr "Webbgenvägar"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Ge mappen ett namn och välj var den ska sparas."
 
-#: ../midori/midori-browser.c:1049
-msgid "Show in the tool_bar"
-msgstr "Visa i verktygsraden"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Visa i bokmärkesfältet"
 
-#: ../midori/midori-browser.c:1057
-msgid "Run as _web application"
-msgstr "Kör som en _webbapplikation"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Lägg till bland webbgenvägar"
 
-#: ../midori/midori-browser.c:1173 ../midori/midori-browser.c:4531
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Spara fil som"
 
-#: ../midori/midori-browser.c:1183
-#, fuzzy
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
-msgstr "De associerade inställningarna"
+msgstr "Spara tillhörande _resurser"
 
-#: ../midori/midori-browser.c:1413
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Ett nytt fönster har öppnats"
 
-#: ../midori/midori-browser.c:1416
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "En ny flik har öppnats"
 
-#: ../midori/midori-browser.c:1434
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
-msgstr "Fel när bilden försökte öppnas!"
+msgstr "Ett fel uppstod när bilden skulle öppnas!"
 
-#: ../midori/midori-browser.c:1435
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
-msgstr "Kan inte öppna den valda bilden i standardbildsaren."
+msgstr "Kan inte öppna den valda bilden i standardbildvisaren."
 
-#: ../midori/midori-browser.c:1441
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
-msgstr "Fel vid nerladdning av bilden!"
+msgstr "Ett fel uppstod vid hämtning av bilden!"
 
-#: ../midori/midori-browser.c:1442
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
-msgstr "Kan inte ladda ner vald bild."
+msgstr "Kan inte hämta vald bild."
 
-#: ../midori/midori-browser.c:1519
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Spara fil"
 
-#: ../midori/midori-browser.c:2498
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Ladda om sidan utan att cacha"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: ../midori/midori-browser.c:2584
+#: ../midori/midori-browser.c:2692
 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"
@@ -372,517 +378,539 @@ msgid ""
 "Aggregator. Next time you click the news feed icon, it will be added "
 "automatically."
 msgstr ""
+"Öppna en nyhetsflödesläsare för att använda ovanstående länk. Oftast finns "
+"det ett alternativ för \"Ny prenumeration\", \"Nytt nyhetsflöde\" eller "
+"liknande.\n"
+"Alternativt kan du öppna Inställningar --> Program i Midori och välja en RSS-"
+"läsare. Nästa gång du klickar på symbolen för ett nyhetsflöde så kommer den "
+"att läggas till automatiskt."
 
-#: ../midori/midori-browser.c:2590 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
-msgstr "Nytt flöde"
+msgstr "Nytt nyhetsflöde"
 
-#: ../midori/midori-browser.c:2621 ../midori/midori-browser.c:5444
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Lägg till ett nytt bokmärke"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2670 ../midori/midori-browser.c:5320
-msgid "Share this page"
-msgstr ""
-
-#: ../midori/midori-browser.c:3146 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
-msgstr "Tom"
+msgstr "Töm"
 
-#: ../midori/midori-browser.c:3522 ../midori/midori-browser.c:3523
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Växla navigering med textmarkör"
 
-#: ../midori/midori-browser.c:3525
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr ""
-"F7 växlar Markörläsning. När detta alternativ är aktiverat så kommer en "
-"textmarkör att visas på alla webbplatser. "
+"Tangenten F7 växlar tangentbordsnavigering. När detta alternativ är "
+"aktiverat så kommer en textmarkör att visas på alla webbplatser."
 
-#: ../midori/midori-browser.c:3528
-#, fuzzy
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
-msgstr "P_rivat läge"
-
-#: ../midori/midori-browser.c:3949 ../midori/midori-browser.c:5891
-#, fuzzy, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Borttagning av historikpost misslyckades: %s\n"
+msgstr "Aktivera tangentbordsnavigering"
 
-#: ../midori/midori-browser.c:4263 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Öppna alla i fli_kar"
 
-#: ../midori/midori-browser.c:4270 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Öppna i ny fli_k"
-
-#: ../midori/midori-browser.c:4273 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Öppna i nytt _fönster"
 
-#: ../midori/midori-browser.c:4362
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4363
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4364
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4366
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4368
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4386
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Importera bokmärken..."
 
-#: ../midori/midori-browser.c:4389 ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Importera bokmärken"
 
-#: ../midori/midori-browser.c:4400
-#, fuzzy
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
-msgstr "Program"
+msgstr "_Program:"
 
-#: ../midori/midori-browser.c:4465
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Importera från XBEL- eller HTML-fil"
 
-#: ../midori/midori-browser.c:4493
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Importera från en fil"
 
-#: ../midori/midori-browser.c:4505
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
-msgstr "Misslyckades att importera bokmärken"
+msgstr "Misslyckades med att importera bokmärken"
 
-#: ../midori/midori-browser.c:4536
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
-msgstr "XBEL Bokmärken"
+msgstr "XBEL-bokmärken"
 
-#: ../midori/midori-browser.c:4541
-#, fuzzy
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
-msgstr "_Hantera bokmärken"
+msgstr "Netscape-bokmärken"
 
-#: ../midori/midori-browser.c:4555
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori kan enbart exportera till XBEL (*.xbel) och Netscape (*.html)"
+msgstr "Midori kan bara exportera till XBEL (*.xbel) och Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4570
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
-msgstr "Misslyckades att exportera bokmärken"
+msgstr "Misslyckades med att exportera bokmärken"
 
-#: ../midori/midori-browser.c:4786
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "En resurssnål webbläsare."
 
-#: ../midori/midori-browser.c:4787
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Se about:version för att visa versionsinformation."
 
-#: ../midori/midori-browser.c:4789
+#: ../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 ""
+"Detta bibliotek är fri mjukvara; du kan omdistribuera det och/eller "
+"modifiera det under villkoren i GNU Lesser General Public License så som den "
+"publicerats av Free Software Foundation; antingen version 2.1 av Licensen, "
+"eller (valfritt) någon senare version."
 
-#: ../midori/midori-browser.c:4824
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "Mikael Magnusson <mikachu@comhem.se>\n"
 "Daniel Nylander <po@danielnylander.se>\n"
-"Oscar Rentzhog <oscar.rentzhog@gmail.com>"
+"Oscar Rentzhog <oscar.rentzhog@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Benjamin Bultman https://launchpad.net/~bultman-ben\n"
+"  Daniel Nylander https://launchpad.net/~yeager\n"
+"  Gunnar Axelson https://launchpad.net/~gunnar-axelson\n"
+"  Jakob Eriksson https://launchpad.net/~b-jakob-v\n"
+"  Joachim Johansson https://launchpad.net/~joachim-j\n"
+"  Johan Foolson https://launchpad.net/~johan.foolson\n"
+"  Jon Persson https://launchpad.net/~jon+1\n"
+"  Jonas Mindemark https://launchpad.net/~fonclbrisch\n"
+"  KlavKalashj https://launchpad.net/~klavkalashj-deactivatedaccount\n"
+"  KranisXD https://launchpad.net/~kranis-xd-239\n"
+"  Larsson https://launchpad.net/~larsson\n"
+"  Marcus Lundgren https://launchpad.net/~marcus-lundgren\n"
+"  Max Malm https://launchpad.net/~benjick\n"
+"  Mikael Nyberg https://launchpad.net/~miknyb\n"
+"  Olle Byström https://launchpad.net/~olle-bystrom\n"
+"  Oscar Kraemer https://launchpad.net/~carloscarkraemer\n"
+"  Rikard Johansson https://launchpad.net/~rikard-jo\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Zahirovic Mensur https://launchpad.net/~nookienoq"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Duplicera aktuell flik"
 
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Öppna ett nytt fönster"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Öppna en ny flik"
 
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
-msgstr "Nytt P_rivat Webbläsarfönster"
+msgstr "Nytt p_rivat webbläsarfönster"
 
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
-msgstr "_Spara Sida Som..."
+msgstr "_Spara sida som..."
 
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Spara till fil"
 
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
-msgstr ""
+msgstr "Lägg till i webbgenvägar"
 
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
-msgstr "Prenumerera på Nyhets_flöde"
+msgstr "Prenumerera på nyhets_flöde"
 
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Stäng flik"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Stäng den aktuella fliken"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "S_täng fönster"
 
-#: ../midori/midori-browser.c:5319
-msgid "_Share"
-msgstr "_Dela"
-
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
-msgstr "Skriv ut denna sida"
+msgstr "Skriv ut den aktuella sidan"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
-msgstr "Stäng a_lla Fönster"
+msgstr "Stäng a_lla fönster"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Hitta"
 
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
-msgstr "Hitta ett ord eller en fras på sidan"
+msgstr "Sök efter ett ord eller ett uttryck på sidan"
 
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
-msgstr "Hitta _nästa"
+msgstr "Sök _nästa"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
-msgstr "Hitta _förra"
+msgstr "Sök _föregående"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Redigera programinställiningarna"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Visa"
 
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Verktygsfält"
 
-#: ../midori/midori-browser.c:5371
-msgid "Reload page without caching"
-msgstr "Ladda om sidan utan att cacha"
-
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Zooma in"
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Zooma ut"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodning"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Visa k_ällkod"
 
-#: ../midori/midori-browser.c:5393
-#, fuzzy
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Visa _DOM-källan"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
-msgstr "P_rivat läge"
+msgstr "Tangentbordsnavigering"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
-msgstr "Växla fullskärmsläge"
+msgstr "Växla helskärmsläge"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
-msgstr "Rulla åt _Vänster"
+msgstr "Rulla åt _vänster"
 
-#: ../midori/midori-browser.c:5402
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
-msgstr "Rulla _Ner"
+msgstr "Rulla _ner"
 
-#: ../midori/midori-browser.c:5405
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
-msgstr "Rulla _Upp"
+msgstr "Rulla _upp"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
-msgstr "Rulla åt _Höger"
+msgstr "Rulla åt _höger"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
-msgstr ""
+msgstr "_Läsbar"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../midori/midori-browser.c:5417
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Gå tillbaka till föregående sida"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5424
-#, fuzzy
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
-msgstr "Gå tillbaka till föregående sida"
+msgstr "Gå till föregående undersida"
 
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Nästa eller framåt"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Gå till nästa undersida eller nästa sida i historiken"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
-msgstr "_Hemsida"
+msgstr "_Startsida"
 
-#: ../midori/midori-browser.c:5434
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
-msgstr "Gå till startsida"
+msgstr "Gå till din startsida"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Ångra s_tängning av flik"
 
-#: ../midori/midori-browser.c:5446
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Lägg till en ny _mapp"
 
-#: ../midori/midori-browser.c:5452
-msgid "_Export bookmarks"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "_Importera bokmärken..."
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
 msgstr "_Exportera bokmärken"
 
-#: ../midori/midori-browser.c:5455 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Hantera sökmotorer"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines"
+msgstr "Hantera säkmotorer..."
 
-#: ../midori/midori-browser.c:5458
-msgid "_Clear Private Data"
-msgstr "_Rensa privat data"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr "Rensa privata data..."
 
-#: ../midori/midori-browser.c:5461
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
-msgstr "_Inspektera Sida"
+msgstr "_Inspektera sida"
 
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Föregående flik"
 
-#: ../midori/midori-browser.c:5468
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Nästa flik"
 
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Flytta flik till _första positionen"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
-msgstr "Flytta Flik _Bakåt"
+msgstr "Flytta flik _bakåt"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
-msgstr "Flytta Flik _Framåt"
+msgstr "Flytta flik _framåt"
 
-#: ../midori/midori-browser.c:5476
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Flytta flik till _sista positionen"
 
-#: ../midori/midori-browser.c:5479
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
-msgstr "Fokusera Aktuell Flik"
+msgstr "Fokusera på aktuell flik"
 
-#: ../midori/midori-browser.c:5482
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
-msgstr ""
+msgstr "Fokusera på _nästkommande visning"
 
-#: ../midori/midori-browser.c:5485
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Visa enbart ikon för den aktuella fliken"
 
-#: ../midori/midori-browser.c:5488
-msgid "_Duplicate Current Tab"
-msgstr "_Duplicera aktuell flik"
-
-#: ../midori/midori-browser.c:5491
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
-msgstr "Stäng Ã\96vriga Flikar"
+msgstr "Stäng Ã¶vriga flikar"
 
-#: ../midori/midori-browser.c:5494
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Återställ senaste _sessionen"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
-msgstr "_Vanliga Frågor"
+msgstr "_Vanliga frågor"
 
-#: ../midori/midori-browser.c:5502
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
-msgstr "_Rapportera ett fel..."
+msgstr "_Rapportera ett problem..."
 
-#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:6163
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Verktyg"
 
-#: ../midori/midori-browser.c:5514
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menyrad"
 
-#: ../midori/midori-browser.c:5518
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "_Navigeringsfält"
 
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Sido_panel"
 
-#: ../midori/midori-browser.c:5523
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
-msgstr "Sido_panel"
+msgstr "Sidopanel"
 
-#: ../midori/midori-browser.c:5526
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "_Bokmärkesrad"
 
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Statusrad"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: ../midori/midori-browser.c:5542 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
-msgstr "Traditionell Kinesiska (BIG5)"
+msgstr "Traditionell kinesiska (BIG5)"
 
-#: ../midori/midori-browser.c:5545 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
-msgstr "Förenklad Kinesiska (GB18030)"
+msgstr "Förenklad kinesiska (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5549
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japanska (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5552 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Koreanska (EUC-KR)"
 
-#: ../midori/midori-browser.c:5555 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Ryska (KOI8-R)"
 
-#: ../midori/midori-browser.c:5558 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5561 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
-msgstr "Västerländsk (ISO-8859-1)"
+msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5564 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Anpassad…"
 
-#: ../midori/midori-browser.c:6069
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Misslyckades med att läsa in historiken: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Avskiljare"
 
-#: ../midori/midori-browser.c:6076
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Plats…"
 
-#: ../midori/midori-browser.c:6078
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Öppna en plats"
 
-#: ../midori/midori-browser.c:6100
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Webbsökning…"
 
-#: ../midori/midori-browser.c:6102
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
-msgstr "Kör en webbsökning"
+msgstr "Sök på webben"
 
-#: ../midori/midori-browser.c:6129
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Öppna en tidigare stängd flik eller fönster"
 
-#: ../midori/midori-browser.c:6146
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Visa sparade bokmärken"
 
-#: ../midori/midori-browser.c:6179
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
-msgstr "Flikar"
+msgstr "_Flikar"
 
-#: ../midori/midori-browser.c:6181
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Visa en lista över öppna flikar"
 
-#: ../midori/midori-browser.c:6195
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Meny"
 
-#: ../midori/midori-browser.c:6197
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Meny"
 
@@ -891,80 +919,83 @@ msgstr "Meny"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Konfigurationen för tillägget '%s'  kunde inte läsas in: %s\n"
 
-#: ../midori/midori-extension.c:873 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Konfigurationen för tillägget '%s' kunde inte sparas. %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Exportera certifikat"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
-msgstr ""
+msgstr "Certifikatsutfärdaren är okänd."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
+"Certifikatet matchar inte den förväntade identiteten för sidan det hämtades "
+"från."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Certifikatets aktiveringstid ligger fortfarande i framtiden."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr ""
+"Certifikatet har dragits tillbaka enligt uppgifter från GTlsConnection."
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Certifikatets algoritm anses vara osäker."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Något annat fel uppstod vid valideringen av certifikatet."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Exportera certifikat"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
-msgstr "Självsignerad"
+msgstr "Självsignerat"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
-msgstr "Säkerhetsdetaöjer"
+msgstr "Säkerhetsdetaljer"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Klistra in och fortsätt"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Inte verifierad"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Verifierad och krypterad uppkoppling"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
-msgstr "Öppna, okrypterad uppkoppling"
+msgstr "Öppna okrypterad uppkoppling"
 
 #: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
 #: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
-msgstr "Justera sidpanelen till höger"
+msgstr "Justera sidopanelen till höger"
 
 #: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
@@ -972,438 +1003,451 @@ msgstr "Stäng panel"
 
 #: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
-msgstr "Justera sidpanelen till vänster"
+msgstr "Justera sidopanelen till vänster"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
-#, fuzzy
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Visa webbgenvägar"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
-msgstr "Visa hemsida"
+msgstr "Visa startsida"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Visa senast öppna flikar"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
-msgstr "Visa senaste flikarna utan att ladda dom"
+msgstr "Visa senaste flikarna utan att ladda dem"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Visa tom sida"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Visa standardsökmotor"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Visa anpassad sida"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanska (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Ny flik"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Nytt fönster"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Aktuell flik"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
-msgstr "Standard"
+msgstr "Förval"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Små ikoner"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Ikoner och text"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Text bredvid ikoner"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Automatisk (GNOME eller miljö)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
-msgstr "HTTP proxyserver"
+msgstr "HTTP-proxyserver"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Ingen proxyserver"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Stil för verktygsfält"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
-msgstr "Använd alltid mina valda typsnitt"
+msgstr "Använd alltid mina valda teckensnitt"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
-msgstr "Åsidosätt de typsnitt webbplatserna valt med användarens preferenser"
+msgstr ""
+"Använd mina valda teckensnitt istället för de som valts av webbplatsen"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Konfigurationsfilen kunde inte läsas in: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Ogiltigt konfigurationsvärde för '%s'"
 
-#: ../midori/midori-tab.vala:122
-#, fuzzy, c-format
+#: ../midori/midori-tab.vala:133
+#, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "Misslyckades med att öppna databasen: %s\n"
+msgstr "Misslyckades med att applicera stilmall: %s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Visa fliketikett"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Visa endast flikikonen"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Stäng fliken till _höger"
+msgstr[1] "Stäng flikarna till _höger"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Stäng a_nnan flik"
+msgstr[1] "Stäng a_ndra flikar"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
-msgstr "Lita på denna websida"
+msgstr "Lita på denna webbsida"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Okänd säkerhet"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s vill spara en HTML5-databas."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Tillåt"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
-msgstr "%s vill veta din plats"
+msgstr "%s vill veta var du befinner dig"
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Fel - %s"
+msgid "'%s' can't be found"
+msgstr "'%s' kan inte hittas"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Sidan \"%s\" kunde inte läsas in."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Sidan '%s' kunde inte läsas in"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Kontrollera eventuella stavfel i adressen"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Se till att nätverkskabeln är inkopplad eller att det trådlösa "
+"nätverkskortet är aktiverat."
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Kontrollera att nätverksinställningarna är korrekta."
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
 msgstr "Försök igen"
 
-#: ../midori/midori-view.c:1643
-#, fuzzy, c-format
+#: ../midori/midori-view.c:1346
+#, c-format
 msgid "Oops - %s"
-msgstr "Fel - %s"
+msgstr "Hoppsan - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
-msgstr "Något gick gel med '%s'."
+msgstr "Något gick fel med '%s'."
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Försök igen"
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Skicka ett meddelande till %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Lägg till sökmotor..."
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Inspektera _Element"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Öppna _länk"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
-msgstr "Öppna Länk i Ny Fli_k"
+msgstr "Öppna länk i ny _flik"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
-msgstr "Öppna Länk i _Förgrundsflik"
+msgstr "Öppna länk i _nuvarande flik"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
-msgstr "Öppna Länk i Ny _Bakgrundsflik"
+msgstr "Öppna länk i ny _bakgrundsflik"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
-msgstr "Öppna Länk i Nytt _Fönster"
+msgstr "Öppna länk i nytt _fönster"
 
-#: ../midori/midori-view.c:2764
-#, fuzzy
-msgid "Open Link as Web A_pplication"
-msgstr "Kör ADRESS som en webapp"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Kopiera länk_plats"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
-msgstr "Spara _Som..."
+msgstr "Spara _som..."
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
-msgstr "Öppna _Bild i Nytt Fönster"
+msgstr "Öppna _bild i nytt fönster"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
-msgstr "Öppna Bild i Ny Fli_k"
+msgstr "Öppna bild i ny fli_k"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
-msgstr "Kopiera Bild"
+msgstr "Kopiera bild"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
-msgstr "_Spara Bild"
+msgstr "_Spara bild"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
-msgstr "Öppna i Bildvisare"
+msgstr "Öppna i bildvisare"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
-msgstr "Kopiera Video _Adress"
-
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Spara _Video"
+msgstr "Kopiera film_adress"
 
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
-msgstr "Ladda Ner _Video"
+msgstr "Hämta _film"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Öppna adress i ny fli_k"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Sök _med"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Sök på webben"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Öppna Adress i Ny Fli_k"
-
-#: ../midori/midori-view.c:2928
-#, fuzzy
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
-msgstr "Öppna i ny Fli_k"
+msgstr "Öppna _ram i ny flik"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Inspektera _element"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Öppna eller hämta fil från %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Filnamn: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Filtyp: \"%s\""
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Filtyp: %s (\"%s\")"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Öppna %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspektera sida - %s"
 
-#: ../midori/midori-view.c:4336
-#, c-format
-msgid "No documentation installed"
-msgstr "Ingen dokumentation installerad"
-
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
-msgstr "Midori sparar inte något personlig information:"
+msgstr "Midori sparar inte någon personlig information:"
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Ingen historik eller kakor sparas."
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
-msgstr "Tillägg är inaktiverade."
+msgstr "Tilläggen är avaktiverade."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "HTML5 lagring, lokal databas och programcacher har blivit avaktiverade."
+msgstr "HTML5-lagring, lokal databas och programcacher har avaktiverats."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
-msgstr "Midori förhindrar websidor från att spåra användaren:"
+msgstr "Midori förhindrar webbsidor från att spåra användaren:"
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
-msgstr ""
+msgstr "Hänvisande länkar förkortas till enbart värdnamnet."
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
-msgstr ""
+msgstr "DNS-förhämtning har avaktiverats."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
-msgstr "Språk och tidszon visas inte för websidor."
+msgstr "Språk och tidszon visas inte för webbsidor."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr ""
+msgstr "Flash och andra Netscape-pluginer kan inte listas av webbplatser."
 
-#: ../midori/midori-view.c:4461
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
-msgstr "Versionsnummer inom parantes visar den version som användes när programet startades. "
+msgstr ""
+"Versionsnummer inom hakparentes visar den version som användes när programet "
+"startades."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Laddning av sidan är försenad"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Inläsningen av sidan är fördröjd:"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
-"Laddning försenad antingen på grund av en nyligen inträffad chrash eller på "
-"grund av uppstartsinställningar."
+"Inläsningen fördröjs på grund av en nyligen inträffad krasch eller på grund "
+"av uppstartsinställningarna."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
-msgstr "Ladda Sida"
+msgstr "Ladda sida"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Tom sida"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Duplicera flik"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Visa Fliketikett"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Visa Enbart Flikikon"
-
-#: ../midori/midori-view.c:4904
-#, fuzzy
-msgid "Close Ot_her Tab"
-msgid_plural "Close Ot_her Tabs"
-msgstr[0] "Stäng den aktuella fliken"
-msgstr[1] "Stäng den aktuella fliken"
-
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
-msgstr "Föregående"
+msgstr "föregående"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "nästa"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Skriv ut bakgrundsbilder"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
-msgstr "Ifall bakgrundsbilder ska visas"
+msgstr "Om bakgrundsbilder ska skrivas ut"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
-msgstr "Funktioner"
+msgstr "Egenskaper"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s av %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1411,418 +1455,423 @@ msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s återstår"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
-msgstr "De nerladdade filerna är felaktiga."
+msgstr "Den hämtade filen är felaktig."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
 msgstr ""
 "Kontrollsumman som tillhandahölls av länken stämde inte. Detta innebär "
-"troligtvis att filen är ofullständig eller hat modifierats i efterhand."
+"troligtvis att filen är ofullständig eller har ändrats i efterhand."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Filen \"%s\" kan inte sparas i denna katalog,"
+msgstr "Filen \"%s\" kan inte sparas i denna mapp."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
-msgstr "Du har inte tillstånd att skriva på denna plats."
+msgstr "Du har inte behörighet att skriva på denna plats."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
-msgstr "Det finns inte tillräckligt fritt utrymme för att ladda ner \"%s\"."
+msgstr "Det finns inte tillräckligt ledigt utrymme för att hämta \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
-msgstr "Filen behöver %s men enbart %s finns kvar."
+msgstr "Filen behöver %s men enbart %s finns tillgängligt."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Webbgenvägar"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Klicka för att lägga till genväg"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Skriv adress till genväg"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
-msgstr "Skriv titel på genväg"
+msgstr "Namnge genväg"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Är du säker på att du vill ta bort den här genvägen?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
-msgstr "Uppstart"
+msgstr "Programstart"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "När Midori startar:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Startsida:"
 
-#: ../midori/midori-preferences.c:314
-#, fuzzy
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
-msgstr "Skriv ut denna sida"
+msgstr "Använd n_uvarande sida"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Använd nuvarande sida som startsida"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
-msgstr "Typsnitt"
+msgstr "Teckensnitt"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
-msgstr "Typsnitt med variabel bredd"
+msgstr "Teckensnitt med variabel bredd"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
-msgstr "Typsnitt som används för att visa text"
+msgstr "Teckensnitt som används för att visa text"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
-msgstr "Standardstorlek för typsnitt som används för att visa text"
+msgstr "Standardstorlek för teckensnitt som används för att visa text"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
-msgstr "Typsnitt med fast bredd"
+msgstr "Teckensnitt med fast bredd"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
-msgstr "Typsnitt som används för att visa text med fast bredd"
+msgstr "Teckensnitt som används för att visa text med fast bredd"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
-msgstr "Typsnittsstorlek som används för att visa text med fast bredd"
+msgstr "Storlek som används för att visa text med fast bredd"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
-msgstr "Minsta typsnittsstorlek"
+msgstr "Minsta storlek"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
-msgstr "Den minimala typsnittsstorleken för text"
+msgstr "Minsta storlek för att visa text"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Föredragen kodning"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Beteende"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Ladda bilder automatiskt"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Aktivera stavningskontroll"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Aktivera skript"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Aktivera stöd för WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Aktivera Netscape-tillägg"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Zooma text och bilder"
 
 #: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
-msgstr "Tillåt skript att öppna popup-rutor."
+msgstr "Tillåt skript att öppna popup-fönster."
 
 #: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Ifall skript är tillåtna att automatiskt öppna popup-fönster"
+msgstr "Om skript tillåts att automatiskt öppna popup-fönster"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Standardförstoringsgrad"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "Nyöppnade flikar har en förstoringsgrad av"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Föredraget språk"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 msgid ""
 "A comma separated list of languages preferred for rendering multilingual "
 "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 msgstr ""
+"En kommaseparerad lista över föredragna språk för rendering av flerspråkiga "
+"webbsidor, till exempel \"sv\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Spara hämtade filer i:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Bläddring"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Tema:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Stil för verktygsfält:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Öppna nya sidor i:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
-msgstr "Inställning för nya flikar"
+msgstr "Beteende för nya flikar:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Stängknappar på flikar"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Visa alltid flikrad"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Öppna flikar bredvid nuvarande"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Ifall nya flikar ska öppnas efter den nuvarande eller den sista"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr "Om nya flikar ska öppnas efter den nuvarande eller den sista fliken"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Öppna flikar i bakgrunden"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Textredigerare"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
-msgstr "RSS-läsare"
+msgstr "Nyhetsflödesläsare"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Proxyserver"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Värdnamn"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Port"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Proxytyper som stödjs:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Webbcache"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
-msgstr ""
+msgstr "Den maximala storleken för cachade sidor på hårddisken"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Identifiera som"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
-msgstr "Integritet"
+msgstr "Sekretess"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
-msgstr "Ta bort gammla kakor efter:"
+msgstr "Ta bort gamla kakor efter:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
-msgstr "Maximalt antal dagar kakor sparas"
+msgstr "Maximalt antal dagar som cookies sparas"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Tillåt kakor enbart från de webbplatser du besöker"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Blockera kakor från tredjeparts-webbplatser"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr ""
-"Kakor sparar logininformation, sparade spel, eller användarprofiler för "
+"Kakor sparar loggininformation, sparade spel, eller användarprofiler för "
 "reklamsyften."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
-msgstr "Aktivera frånkopplad webbapplikations-cache."
+msgstr "Aktivera offline-webbapplikationscache"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
-msgstr "Aktivera stöd för lokal HTML5 lagring"
+msgstr "Aktivera stöd för lokal HTML5-lagring"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
-msgstr ""
+msgstr "Avlägsna den hänvisningsinformation som skickas till webbplatser"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr ""
+"Om header-kategorin \"Referer\" ska förkortas till enbart värdnamnet."
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Ta bort sidor från historiken efter:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Maximalt antal dagar som historik ska sparas"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Hantera sökmotorer"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Lägg till sökmotor"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Redigera sökmotor"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Beskrivning"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
-msgstr ""
+msgstr "Symbolvärde:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Hantera sökmotorer"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Använd som _standard"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Sökmotorerna kunde inte läsas in. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Sökmotorer kunde inte sparas. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Historik"
-
-#: ../midori/midori-historycompletion.vala:54
-#, fuzzy, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Misslyckades med att rensa historik: %s\n"
-
-#: ../midori/midori-historycompletion.vala:65
-#, fuzzy, c-format
-msgid "Failed to select from history: %s"
-msgstr "Misslyckades med att rensa historik: %s\n"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Bokmärken och historik"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
 msgid "Search for %s"
 msgstr "Sök efter %s"
 
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr "Misslyckades med att välja från historiken: %s"
+
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Sök _med..."
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Sök med %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Öppna med"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Välj program eller kommando för att öppna \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:309
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Kunde inte köra externt program."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
-msgstr "Ogilltigt URI"
+msgstr "Ogiltig länk"
 
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
@@ -1839,125 +1888,145 @@ msgstr "Nästa"
 
 #: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
-msgstr "_Gör skillnad på skiftläge"
+msgstr "Skiftlägeskänslig"
 
 #: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Stäng sökfältet"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Filen '<b>%s</b>' har hämtats."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "bokmärke"
+msgstr[1] "%d bokmärken"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "Överföring färdig"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "undermapp"
+msgstr[1] "%d undermappar"
 
-#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "Rensa Allt"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Tom mapp"
 
-#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279
-msgid "Some files are being downloaded"
-msgstr "Några filer håller på att laddas ner"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Mappen innehåller %s och inga bokmärken"
 
-#: ../toolbars/midori-transferbar.c:283
-msgid "_Quit Midori"
-msgstr "Avsluta Midori"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Mappen innehåller %s"
 
-#: ../toolbars/midori-transferbar.c:285
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Överföringen kommer avbrytas när Midori stängs."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Mappen innehåller %s och %s"
 
-#: ../panels/midori-bookmarks.c:308
-#, fuzzy, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Borttagning av historikpost misslyckades: %s\n"
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Bokmärket länkar till: %s"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Misslyckades med att uppdatera bokmärke: %s\n"
+msgid "%s and no bookmark"
+msgstr "%s och inga bokmärke n"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s och %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Redigera det valda bokmärket"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Ta bort det markerade bokmärket"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Lägg till en ny mapp"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Avskiljare</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Öppna i ny fli_k"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
-msgstr "Sök i Bokmärken"
+msgstr "Sök i bokmärken"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Historik"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Idag"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Igår"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sedan"
 msgstr[1] "%d dagar sedan"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "En vecka sedan"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Borttagning av historikpost misslyckades: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Är du säker på att du vill radera hela historiken?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Lägg till bokmärke för den valda historikposten"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Ta bort den valda historikposten"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Rensa hela historiken"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Sökhistorik"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "Överföringar"
-
-#: ../panels/midori-transfers.c:442
-msgid "Open Destination _Folder"
-msgstr "Öppna mål_mapp"
-
-#: ../panels/midori-transfers.c:445
-msgid "Copy Link Loc_ation"
-msgstr "Kopiera länk_plats"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
@@ -1982,111 +2051,63 @@ msgstr "Lösenord"
 msgid "_Remember password"
 msgstr "Kom ihåg lösenord"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr ""
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Ingen"
 
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr ""
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Animeringsramar är trasiga"
-
-#: ../katze/katze-utils.c:385
-msgid "None"
-msgstr "Ingen"
-
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Egenskapen '%s' är ogilltig för %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Välj fil"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Välj mapp"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
-msgstr "1 timme"
+msgstr "En timme"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
-msgstr "1 dag"
+msgstr "Ett dygn"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
-msgstr "1 vecka"
+msgstr "En vecka"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
-msgstr "1 månad"
+msgstr "En månad"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
-msgstr "1 år"
+msgstr "Ett år"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Inställningar för %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
-msgstr "MD5-Kontrollsumma:"
+msgstr "MD5-kontrollsumma:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
-msgstr "SHA1-Kontrollsumma:"
-
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Redigera reklamblockeringsfilter"
-
-#: ../extensions/adblock.c:512
-#, 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:926
-msgid "Edit rule"
-msgstr "Redigera regel"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Regel:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Bl_ockera bild"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Bl_ockera länk"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Reklamblockeringsfilter"
-
-#: ../extensions/adblock.c:1926
-msgid "Block advertisements according to a filter list"
-msgstr "Blockera annonser enligt en filterlista"
+msgstr "SHA1-kontrollsumma:"
 
 #. i18n: An infobar shows up when viewing a script on userscripts.org
 #: ../extensions/addons.c:222
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "Denna sida verkar innehålla ett användar-skript. Vill du installera det?"
 
@@ -2107,16 +2128,16 @@ msgstr "_Installera användarstil"
 msgid "Don't install"
 msgstr "Installera inte"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Användarskript"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Användarstil"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Fel"
 
@@ -2138,40 +2159,40 @@ msgstr "Ta bort användarstil"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Filen <b>%s</b> kommer att raderas permanent."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
-msgstr "Öppma i Textredigerare"
+msgstr "Öppna i Textredigerare"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Öppna mål_mapp"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Lägg till nytt tillägg"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Ta bort valt tillägg"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Användartillägg"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
-msgstr "Kan inte övervaka katalog '%s': %s"
+msgstr "Kan inte övervaka mappen '%s': %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Stöd för användarskript och användarstilar"
 
-#: ../extensions/colorful-tabs.c:168
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
-msgstr "Färgglada flikar"
+msgstr "Färglagda flikar"
 
-#: ../extensions/colorful-tabs.c:169
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Tona varje flik olika"
 
@@ -2180,11 +2201,11 @@ msgstr "Tona varje flik olika"
 msgid "Cookie Manager"
 msgstr "Kakhanterare"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Ta bort alla"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2192,31 +2213,31 @@ msgstr ""
 "Tar bort alla visade kakor. Om ett filter är konfigurerat kommer bara "
 "matchande kakor att tas bort."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Expandera alla"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Fäll ihop alla"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Vill du verkligen ta bort alla kakor?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Fråga"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Endast kakor som matchar filtret kommer att tas bort."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
-msgstr "Vid slutet av en session."
+msgstr "Vid slutet av sessionen."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2234,15 +2255,15 @@ msgstr ""
 "<b>Förfaller</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Ja"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Nej"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2251,22 +2272,22 @@ msgstr ""
 "<b>Domän</b>: %s\n"
 "<b>Kakor</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Namn"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "_Expandera alla"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "_Fäll ihop alla"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
-msgstr "Sök bland kakorna genom Namn eller Domän"
+msgstr "Sök bland kakorna efter Namn eller Domän"
 
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
@@ -2274,38 +2295,59 @@ msgstr "Visa och ta bort kakor"
 
 #: ../extensions/copy-tabs.c:39
 msgid "Copy Tab _Addresses"
-msgstr "Kopiera Flik_adresser"
+msgstr "Kopiera flik_adresser"
 
 #: ../extensions/copy-tabs.c:96
 msgid "Copy Addresses of Tabs"
-msgstr "Kopiera Flikadresser"
+msgstr "Kopiera flikadresser"
 
 #: ../extensions/copy-tabs.c:97
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Kopiera alla flikadresser till urklippet"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:208
-#, c-format
-msgid "Delayed load"
-msgstr "Försenad laddning"
-
 #: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Fördröjning i sekunder innan sidan laddas:"
+msgid "Delayed load"
+msgstr "Fördröjd inläsning"
 
-#: ../extensions/delayed-load.vala:209
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
-msgstr "Fördröj laddning av sida tills du faktiskt använder fliken. "
+msgstr "Fördröj laddning av sida tills du faktiskt använder fliken."
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "Dubbelklicka för ytterligare information"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Det här tillägget visar felmeddelanden från glib i systembrickan."
 
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr ""
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"Ett fel uppstod vid försök att hämta en fil med följande insticksmodul:\n"
+"%s\n"
+"\n"
+"Fel:\n"
+"%s\n"
+"\n"
+"Fortsätt utan denna insticksmodul."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
-msgstr "Extern Hämtningshanterare - Aria2"
+msgstr "Extern hämtningshanterare - Aria2"
 
 #: ../extensions/external-download-manager.vala:176
 msgid "Download files with Aria2"
@@ -2313,7 +2355,7 @@ msgstr "Ladda ner filer med Aria2"
 
 #: ../extensions/external-download-manager.vala:202
 msgid "External Download Manager - SteadyFlow"
-msgstr "Extern Hämtningshanterare -SteadyFlow"
+msgstr "Extern hämtningshanterare - SteadyFlow"
 
 #: ../extensions/external-download-manager.vala:203
 msgid "Download files with SteadyFlow"
@@ -2326,96 +2368,96 @@ msgstr "Kommando:"
 #: ../extensions/external-download-manager.vala:304
 #, c-format
 msgid "Download files with \"%s\" or a custom command"
-msgstr ""
+msgstr "Ladda ner filer med \"%s\" eller ange ett eget kommando"
 
 #: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
-msgstr "En extern hämtningshanterare - kommandotolken"
+msgstr "Extern hämtningshanterare - Kommandoraden"
 
 #: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr ""
+msgstr "Kunde inte hitta \"entry\"-delen i Atoms XML-data."
 
 #: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr ""
+msgstr "Kunde inte hitta \"feed\"-delen i Atoms XML-data."
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Senast uppdaterad: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
-msgstr "Flöden"
+msgstr "Nyhetsflöden"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
-msgstr "Lägg till nytt flöde"
+msgstr "Lägg till nytt nyhetsflöde"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
-msgstr "Ta bort flöde"
+msgstr "Ta bort nyhetsflöde"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
-msgstr "_Flöden"
+msgstr "Nyhets_flöde"
 
 #: ../extensions/feed-panel/feed-parse.c:195
 #, c-format
 msgid "Failed to find root element in feed XML data."
-msgstr ""
+msgstr "Kunde inte hitta root-delen i nyhetsflödets XML-data."
 
 #: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
-msgstr "Formatet för flödet stöds inte."
+msgstr "Formatet för nyhetsflöde stöds inte."
 
 #: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
-msgstr ""
+msgstr "Kunde inte tolka XML-flöde: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr ""
+msgstr "Kunde inte hitta \"channel\"-delen i RSS XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
-msgstr ""
+msgstr "RSS-versionen söds inte."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr ""
+msgstr "Kunde inte hitta \"item\"-delen i RSS XML-data."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr ""
+msgstr "Kunde inte hitta \"channel\"-delen i RSS XML-data."
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
-msgstr "Flödet '%s' finns redan"
+msgstr "Nyhetsflödet '%s' finns redan"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
-msgstr "Fel vid laddning av flödet '%s'"
+msgstr "Fel vid laddning av nyhetsflödet '%s'"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
-msgstr "Flödespanel"
+msgstr "Nyhetsflödespanel"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Läs Atom/RSS-flöden"
 
 #: ../extensions/formhistory/formhistory.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to add form value: %s\n"
-msgstr "Misslyckades med att öppna databasen: %s"
+msgstr "Misslyckades att lägga till formulärvärde: %s\n"
 
 #: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
@@ -2429,128 +2471,414 @@ msgstr ""
 "Användarnamn och lösenord behövs\n"
 "för att öppna den här platsen:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
-msgstr "Kom ihåg lösenord för denna sida?"
+msgstr "Spara lösenordet för denna sida?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
-msgstr "Kom ihåg"
+msgstr "Spara"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Inte nu"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Aldrig för denna sida"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
-msgstr "Växla läget för formulärhistorik"
+msgstr "Växla läge för formulärhistorik"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Aktivera eller inaktivera formulärhistorik för den aktuella fliken."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Misslyckades med att öppna databasen: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr ""
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
+"Aktivera enbart formulärhistorik via snabbtangent (Ctrl+Shift+F) för varje "
+"flik"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
-msgstr ""
+msgstr "Formulärhistorik"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
-msgstr ""
+msgstr "Spara historik för ifylld formulärdata"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
-msgstr ""
+msgstr "Misslyckades med att välja förslag\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Det finns inga flikar som ej besökts"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
-msgstr "Historik-lista"
+msgstr "Historiklista"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Beteende vid stängning av flikar"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Byt till den senast visade fliken"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Byt till den nyaste fliken"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Blinka fönster på bakgrundsflikar"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
-msgstr ""
+msgstr "Nästa nya flik (från historiklistan)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
-msgstr ""
+msgstr "Nästa nya flik från historiken"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
-msgstr ""
+msgstr "Föregående nya flik (från historiklistan)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
-msgstr ""
+msgstr "Föregående nya flik från historiken"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
-msgstr ""
+msgstr "Visa flik i bakgrund (från historiklistan)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Visa den valda fliken i bakgrunden"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Historiklista"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Byt till sist använda flik vid byte eller stängning av flikar."
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL-fel: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Godkänn"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Godkänn för den här sessionen"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Blockera"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Kunde inte öppna databasen för insticksmodulen: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Misslyckades med att verkställa databas-uttrycket: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Vill du verkligen ta bort alla JavaScript-behörigheter?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Ta bort alla JavaScript-behörigheter?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Denna åtgärd kommer ta bort alla JavaScript-behörigheter. Du kommer "
+"tillfrågas igen för behörigheter för varje webbsida som besöks."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "Hanterarinstans"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "Instans till den globala NoJS-hanteraren"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Konfigurera NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Nedanför är en lista på alla webbplatser och deras nuvarande riktlinjer. Du "
+"kan ta bort riktlinjer genom att markera posterna och klicka på <i>Ta bort<i>"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Domän"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Regler"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Radera _alla"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "Tillåt skript på alla webbplatser"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "Blockera som standard skript på okända domäner"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "Inställningar för andra-nivå-domäner"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "Neka %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "Tillåt %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "Tillåt %s denna session"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "Webbläsarfönstret"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "Den instans av Midori som visas tillhör"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "Visa"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "Den instans av Midori som visas tillhör"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "Menyikonstatus"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "Tillstånd för menyikon att visa i statusrad"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Obestämd"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "Tillåtet"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "Blandat"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "Nekat"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+"Ett allvarligt fel har inträffat som hindrar NoJS-tillägget från att "
+"fortsätta. Du bör avaktivera det."
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Fel i NoJS-tillägg"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Orsak"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Kunde inte skapa konfigurationsmapp för tillägget: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Kunde inte skapa konfigurationsmapp för tillägget."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Det gick inte att öppna tilläggets databas."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "Det gick inte att skapa tilläggets databasstruktur."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Tilläggshändelse"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Den tilläggshändelse i Midori tillägget hör till"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Programhändelse"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Den programhändelse i Midori detta tillägg hör till"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Databasinstans"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "Pekar på den databashändelse i sqlite som detta tillägg hör till"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Databassökväg"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "Sökvägen till den databashändelse i sqlite som tillägget hör till"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Tillåt alla webbplatser"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+"Om sant så kommer detta tillägg inte att kontrollera riktlinjer för varje "
+"sajt och i stället tillåta dem."
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "Endast andra nivån"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+"Om sant så kommer detta tillägg att reducera varje domän till dess andra "
+"nivå (www.exempel.org kommer att reduceras till exempel.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "Okända riktlinjer för domän"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "Riktlinjer att använda för okända domäner."
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Tillåt tillfälligt"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Musgester"
 
 #: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
-msgstr "Kontrollera Midori genom att flytta musen"
+msgstr "Kontrollera Midori genom olika musrörelser"
 
 #: ../extensions/shortcuts.c:109
 msgid "Reload page or stop loading"
@@ -2558,26 +2886,25 @@ msgstr "Ladda om sida eller sluta ladda"
 
 #: ../extensions/shortcuts.c:168
 msgid "Customize Keyboard shortcuts"
-msgstr "Ställ in tangentbordsgenvägar"
+msgstr "Anpassa snabbkommandon"
 
 #: ../extensions/shortcuts.c:275
-#, fuzzy
 msgid "Customize Sh_ortcuts…"
-msgstr "Ställ in gen_vägar…"
+msgstr "Anpassa snabbkommandon..."
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
-msgstr "Genvägar"
+msgstr "Snabbkommandon"
 
 #: ../extensions/shortcuts.c:313
 msgid "View and edit keyboard shortcuts"
-msgstr "Visa och redigera tangentbordsgenvägar"
+msgstr "Visa och redigera snabbkommandon"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
-msgstr "Klocka i Statusbaren"
+msgstr "Klocka i statusraden"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Visa datum och tid i statusraden"
 
@@ -2591,7 +2918,11 @@ msgstr "Skript"
 
 #: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
-msgstr "Netscapetillägg"
+msgstr "Netscape-tillägg"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Aktivera Netscape-tillägg"
 
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
@@ -2599,17 +2930,17 @@ msgstr "Statusradsfunktioner"
 
 #: ../extensions/statusbar-features.c:260
 msgid "Easily toggle features on web pages on and off"
-msgstr ""
+msgstr "Slå enkelt av och på funktioner på webbplatser"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
-msgstr "Flikrad"
+msgstr "Flikraden"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
-msgstr "Visa f_likraden"
+msgstr "Flikr_aden"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Visa flikar i en vertikal panel"
 
@@ -2621,11 +2952,11 @@ msgstr "Enbart ikoner på flikar som standard"
 msgid "New tabs have no label by default"
 msgstr "Nya flikar har ingen etikett som standard"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
-msgstr "Redigera verktygsrad"
+msgstr "Anpassa verktygsfält"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2633,67 +2964,58 @@ 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:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
-msgstr "Tillgängliga föremål"
+msgstr "Tillgängliga objekt"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
-msgstr "Visade föremål"
+msgstr "Visade objekt"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
-msgstr "Redigera _verktygsrad…"
+msgstr "Redigera _verktygsraden…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
-msgstr "Verktygsradseditor"
+msgstr "Verktygsradsredigerare"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
-msgstr "Redigera verktygsradens layout enkelt"
-
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr ""
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Misslyckades med att ladda kakor\n"
+msgstr "Ändra enkelt på verktygsradens layout"
 
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
-msgstr "Rensa Privat Data"
+msgstr "Rensa privat data"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Rensa privat data"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Rensa följande data:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Senast öppnade flikar"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Rensa privat data när Midori _avslutas"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Sparade inloggningar och l_ösenord"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
-msgstr "Kakor och Webbplatsdata"
+msgstr "Kakor och webbplatsdata"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Webbplatsikoner"
 
@@ -2701,208 +3023,152 @@ msgstr "Webbplatsikoner"
 msgid "Open tabs"
 msgstr "Öppna flikar"
 
-#: ../midori/midori-viewcompletion.vala:75
-#, fuzzy
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
-msgstr "Visa senast öppna flikar"
+msgstr "Fler öppna flikar..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
-msgstr "Misslyckades med att rensa historik: %s\n"
+msgstr "Misslyckades med att rensa historiken: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
-msgstr "Borttagning av gamla historikobjekt misslyckades: %s\n"
-
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr ""
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr ""
+msgstr "Misslyckades med att ta bort gamla objekt från historiken: %s\n"
 
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr ""
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Misslyckades att lägga till bokmärkesobjekt: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Misslyckades med att importera från gammal databas: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Misslyckades med att uppdatera bokmärke: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Bokmärkena kunde inte sparas. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Misslyckades med att ta bort bokmärkesobjektet: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
-msgstr ""
+msgstr "Inga rotcertifikat kan hittas. SSL-certifikatet kan inte bekräftas."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Konfigurationsfilen kunde inte sparas. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:505
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Sessionen kunde inte läsas in: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Sessionen kunde inte sparas. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:129
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Papperskorgen kunde inte sparas. %s"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Midori verkar ha krashat vid senaste körningen. Om det händer flera gånger, "
-"prova något av dessa alternativ för att lösa problemet."
+"Midori kraschade förra gången det användes. Du kan rapportera problemet på "
+"%s."
 
-#: ../midori/midori-frontend.c:347
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Redigera _inställningar"
 
-#: ../midori/midori-frontend.c:351
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Inaktivera alla _tillägg"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Visa en dialog efter att Midori har krashat"
 
-#: ../midori/midori-frontend.c:365
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Kasta bort gamla flikar"
 
-#: ../midori/midori-frontend.c:373
-#, fuzzy
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
-msgstr "Visa senast öppna flikar"
+msgstr "Visa senaste krasch-_logg"
 
-#: ../midori/midori-frontend.c:386
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
-msgstr ""
+msgstr "Kör i felsökningsläge"
 
-#: ../midori/midori-frontend.c:457
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "En instans av Midori körs redan, men svarar inte.\n"
 
-#: ../midori/midori-frontend.c:490
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Bokmärkena kunde inte läsas in: %s\n"
 
-#: ../midori/midori-frontend.c:521
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Sessionen kunde inte läsas in: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Papperskorgen kunde inte läsas in: %s\n"
 
-#: ../midori/midori-frontend.c:529
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Historiken kunde inte läsas in: %s\n"
 
-#: ../midori/midori-frontend.c:540
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Följande fel inträffade:"
 
-#: ../midori/midori-frontend.c:545
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ignorera"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Acceptera"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Acceptera för sessionen"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Blockera"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Kunde inte öppna databasen för tillägget: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
-msgstr "Vill du verkligen radera alla tillstånd för kakorna?"
+msgstr "Vill du verkligen radera alla rättigheter för kakorna?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
-msgstr ""
+msgstr "Radera alla kakors rättigheter"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
+"Åtgärden raderar alla kakors rättigheter. Du kommer därför att åter få ange "
+"rättigheterna för varje webbplats du besöker."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Rättighetshanterare för kakor"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
-msgstr ""
+msgstr "Händelsen hanteras med kakornas nuvarande rättigheter"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
-msgstr ""
+msgstr "Ställ in rättigheterna för kakorna"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2910,156 +3176,93 @@ msgid ""
 "add a policy for a domain manually by entering the domain below, choosing "
 "the policy and clicking on <i>Add</i>."
 msgstr ""
+"Nedan ser du en lista över webbplatser och vilka regler som gäller för dem. "
+"Du kan radera regler genom att markera dem och klicka på <i>Ta bort</i>. Du "
+"kan också lägga till regler för en domän manuellt genom att  fylla i "
+"domännamnet nedanför, välja vilka regler som ska gälla och klicka på <i>Lägg "
+"till</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Domän"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "Riktlinjer för cookies från domäner som inte återfinns i listan: "
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Policy"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Ta bort _alla"
-
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr ""
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "Be om ett beslut"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
 "A fatal error occurred which prevents the cookie permission manager "
 "extension to continue. You should disable it."
 msgstr ""
+"Ett allvarligt fel uppstod som förhindrar tillägget för kakornas rättigheter "
+"från att fungera. Du måste inaktivera det."
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:95
 msgid "Error in cookie permission manager extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Anledning"
+msgstr "Ett fel uppstod i tillägget för kakornas rättigheter"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Kunde inte skapa konfigurationskatalog för tillägget: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Kunde inte skapa konfigurationskatalog för tillägget."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-#, fuzzy
-msgid "Could not open database of extension."
-msgstr "Misslyckades med att öppna databasen: %s\n"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
+"Det gick inte att fastställa globala regler för kakornas rättigheter för "
+"domänen: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
-msgstr ""
+msgstr "Till dess sessionen avslutas"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Webbplatsen %s vill spara %d kakor."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
-msgstr "Webbplatsen vill spara en kaka."
+msgstr "Webbplatsen %s vill spara en kaka."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
-msgstr "Flertalet webbplatser vill spara totalt %d kakor."
+msgstr "Flera webbplatser vill spara totalt %d kakor."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
-msgstr "_Acceptera"
+msgstr "_Godkänn"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
-msgstr "Acceptera för denna _sessionen"
+msgstr "Godkänn för den här _sessionen"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
-msgstr "Vägra"
+msgstr "Avböj"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
-msgstr ""
+msgstr "Avböj den här gången"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
-msgstr ""
+msgstr "Sökväg"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Värde"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Utgångsdatum"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-#, fuzzy
-msgid "Extension instance"
-msgstr "Tillägg"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-#, fuzzy
-msgid "Application instance"
-msgstr "Program"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Databasinstans"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
 msgstr ""
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Obestämd"
+"Riktlinjer för domäner som inte konfigurerats individuellt. Detta begränsar "
+"endast ytterligare de globala riktlinjerna satta i Midoris inställningar."
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3067,575 +3270,263 @@ msgstr "Säkerhetshanterare för kakor"
 
 #: ../extensions/cookie-permissions/main.c:63
 msgid "Manage cookie permission per site"
-msgstr ""
-
-#: ../extensions/apps.vala:82
-#, fuzzy
-msgid "Applications"
-msgstr "Program"
-
-#: ../extensions/apps.vala:227
-msgid "Create _Launcher"
-msgstr "Skapa startare"
-
-#: ../extensions/apps.vala:265
-#, fuzzy
-msgid "Web App Manager"
-msgstr "Kakhanterare"
-
-#: ../extensions/apps.vala:266
-msgid "Manage websites installed as applications"
-msgstr ""
-
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Mittenklick öppnar markering"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "Läs in en adress från markeringen via mittenklick"
-
-#~ msgid "Custom..."
-#~ msgstr "Anpassad…"
-
-#~ msgid "_Details"
-#~ msgstr "_Detaljer"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Resurssnål webbläsare"
-
-#~ msgid "No filename specified"
-#~ msgstr "Inget filnamn valt"
-
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Den valda konfigurationsmappen är ogiltig."
-
-#~ msgid "Writing failed."
-#~ msgstr "Kunde inte skriva."
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% inläst"
-
-#~ msgid "_Title:"
-#~ msgstr "_Titel:"
-
-#~ msgid "_Folder:"
-#~ msgstr "_Mapp:"
-
-#~ msgid "Cookies"
-#~ msgstr "Kakor"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Flashkakor"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Lägg till genväg i Webbgenvägar"
-
-#~ msgid "Close this window"
-#~ msgstr "Stäng det här fönstret"
-
-#~ msgid "Quit the application"
-#~ msgstr "Avsluta programmet"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Klipp ut markerad text"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Kopiera markerad text"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Klistra in text från klippbordet"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Ta bort markerad text"
-
-#~ msgid "Select all text"
-#~ msgstr "Markera all text"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Återställ zoom-nivån"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Visa källkod för sidan"
-
-#~ msgid "View Selection Source"
-#~ msgstr "Visa källkod för markering"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Ta bort innehållet i papperskorgen"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Öppna senast stängda flik"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Lägg till en ny bokmärkesmapp"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Lägg till, ändra och ta bort sökmotorer…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Rensa privat data…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Byt till föregående flik"
-
-#~ msgid "_Contents"
-#~ msgstr "_Innehåll"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Visa dokumentation"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Visa FAQ"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Öppna Midoris bugghanterare"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Visa information om programmet"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Spara inte webbläsardata när jag surfar"
-
-#~ msgid "Show menubar"
-#~ msgstr "Visa menyrad"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Visa navigeringsfält"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Visa sidopanel"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Visa bokmärkesrad"
-
-#~ msgid "_Transferbar"
-#~ msgstr "Ö_verföringsrad"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Visa överföringsrad"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Visa statusrad"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Nyligen besökta sidor"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Öppna sidor du tidigare besökt"
-
-#~ msgid "_Window"
-#~ msgstr "_Fönster"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Koppla från valda panel från fönstret"
-
-#~ msgid "Show panel _titles"
-#~ msgstr "Visa panel_titlar"
-
-#~ msgid "Options"
-#~ msgstr "Alternativ"
-
-#~ msgid "All cookies"
-#~ msgstr "Alla kakor"
-
-#~ msgid "Session cookies"
-#~ msgstr "Sessionskakor"
-
-#~ msgid "Whether to save the last window size"
-#~ msgstr "Ifall senaste fönsterstorlek ska sparas"
-
-#~ msgid "Last window width"
-#~ msgstr "Senaste fönsterbredd"
-
-#~ msgid "The last saved window width"
-#~ msgstr "Senast sparade fönsterbredd"
-
-#~ msgid "Last window height"
-#~ msgstr "Senaste fönsterhöjd"
-
-#~ msgid "The last saved window height"
-#~ msgstr "Senast sparade fönsterhöjd"
+msgstr "Hantera rättigheter för kakorna per webbplats"
 
-#~ msgid "Last panel position"
-#~ msgstr "Senaste panelpositionen"
-
-#~ msgid "The last saved panel position"
-#~ msgstr "Senast sparade panelposition"
-
-#~ msgid "Last Web search"
-#~ msgstr "Senaste websökning"
-
-#~ msgid "The last saved Web search"
-#~ msgstr "Senast sparade websökning"
-
-#~ msgid "Show Menubar"
-#~ msgstr "Visa menyrad"
-
-#~ msgid "Whether to show the menubar"
-#~ msgstr "Ifall menyraden ska visas"
-
-#~ msgid "Show Navigationbar"
-#~ msgstr "Visa Navigeringsfält"
-
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "Ifall naveringsfältet ska visas"
-
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "Visa Bokmärkesfält"
-
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "Ifall bokmärkesraden ska visas"
-
-#~ msgid "Whether to show the panel"
-#~ msgstr "Ifall sidopanelen ska visas"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Visa överföringsrad"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Ifall överföringsraden ska visas"
-
-#~ msgid "Show Statusbar"
-#~ msgstr "Visa Statusrad"
-
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "Ifall statusraden ska visas"
-
-#~ msgid "Toolbar Items"
-#~ msgstr "Föremål i verktygsfält"
-
-#~ msgid "Compact Sidepanel"
-#~ msgstr "Kompakt sidopanel"
-
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "Ifall sidopaneles ska göras kompakt"
-
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "Ifall sidopanelen ska justeras till höger"
-
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Vad som ska göras när Midori startar"
-
-#~ msgid "The homepage"
-#~ msgstr "Startsidan"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Visa Webbgenvägar i nya flikar"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Visa Webbgenvägar i nyligen öppnade flikar"
-
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "Mappen som filer ska hämtas till"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Fråga vart filer ska sparas"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Ifall Midori ska fråga vilken mapp filer ska hämtas till"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Ifall en underrättelse ska visas när en överföring är klar"
-
-#~ msgid "An external text editor"
-#~ msgstr "En extern textredigerare"
-
-#~ msgid "An external news aggregator"
-#~ msgstr "En extern RSS-läsare"
-
-#~ msgid "Location entry Search"
-#~ msgstr "Sökmotor för Addressfältet"
-
-#~ msgid "The preferred character encoding"
-#~ msgstr "Den föredragna teckenkodningen"
-
-#~ msgid "Always show the tabbar"
-#~ msgstr "Visa alltid flikraden"
-
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "Om flikar har stängknappar"
-
-#~ msgid "Where to open new pages"
-#~ msgstr "Hur nya sidor ska öppnas"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Öppna externa sidor i:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Hur externt öppnade sidor ska öppnas"
-
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "Ifall nya flikar ska öppnas i bakgrunden"
-
-#~ msgid "Open popups in tabs"
-#~ msgstr "Öppna popupfönster i flikar"
-
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "Iffall text och bilder ska zoomas"
-
-#~ msgid "Find inline while typing"
-#~ msgstr "Sök automatiskt på sidan"
-
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "Om en sökning på sidan automatiskt ska ske när du skriver"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Vilka typer av kakor som ska accepteras"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Maximal kakålder"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Ifall de senast besökta sidorna ska sparas"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Maximal historikålder"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Kom ihåg senast hämtade filer"
-
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "Proxyserver för HTTP-anslutningar"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Upptäck proxiserver automatiskt"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Ifall en global proxyserver ska upptäckas automatiskt"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Vad Midori ska identifiera sig som"
-
-#~ msgid "Identification string"
-#~ msgstr "Identifikationssträng"
-
-#~ msgid "Cache size"
-#~ msgstr "Cache-storlek"
-
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Tillåtna storleken på cache"
-
-#~ msgid "Clear private data"
-#~ msgstr "Rensa privat data"
-
-#~ msgid "The private data selected for deletion"
-#~ msgstr "Privat data vald för borttagning"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Hittades inte - %s"
-
-#~ msgid "Open _Link"
-#~ msgstr "Öppna _länk"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "_Hämta länkplats"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "_Spara länkplats"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Hämta med hämtnings_hanterare"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Dokumentet kan inte visas"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "_Återställ flik"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Minimera flik"
-
-#~ msgid "General"
-#~ msgstr "Allmänt"
-
-#~ msgid "Appearance"
-#~ msgstr "Utseende"
-
-#~ msgid "Font settings"
-#~ msgstr "Typsnittsinställningar"
-
-#~ msgid "Encoding"
-#~ msgstr "Kodning"
-
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Teckenkodning som ska användas som standard"
-
-#~ msgid "Load and display images automatically"
-#~ msgstr "Ladda och visa bilder automatiskt"
-
-#~ msgid "Shrink images automatically"
-#~ msgstr "Förminska bilder automatiskt"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Tvinga 96 punkter per tum"
-
-#~ msgid "Enable developer tools"
-#~ msgstr "Aktivera utvecklingsverktyg"
-
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Aktivera speciella tillägg för utvecklare"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "Misslyckades med att hämta programikonen för %s: %s"
 
-#~ msgid "Spell Checking"
-#~ msgstr "Stavningskontroll"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Interface"
-#~ msgstr "Gränssnitt"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "Misslyckades med att skapa nytt startobjekt (%s): %s"
 
-#~ msgid "Navigationbar"
-#~ msgstr "Navigeringsfält"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "Startare skapad"
 
-#~ msgid "External applications"
-#~ msgstr "Externa program"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Du kan nu köra <b>%s</b> från startaren eller menyn"
 
-#~ msgid "Web Cookies"
-#~ msgstr "Webbkakor"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "Ett fel uppstod när startaren skulle skapas"
 
-#~ msgid "days"
-#~ msgstr "dagar"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Program"
 
-#~ msgid "_Icon:"
-#~ msgstr "_Ikon:"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Ny _profil"
 
-#~ msgid "_Bookmark"
-#~ msgstr "_Bokmärke"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "Skapar en ny oberoende profil och en startare"
 
-#~ msgid "_Console"
-#~ msgstr "_Konsol"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "Ny app"
 
-#~ msgid "Console"
-#~ msgstr "Konsol"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "Skapar en ny app för en specifik webbplats"
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Redigera _reklamblockeringsfilter…"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Ett fel uppstod med startaren"
 
-#~ msgid "Filter:"
-#~ msgstr "Filter:"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "Skapa startare"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Kakhanterare"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Hantera webb-appar"
 
-#~ msgid "Pageholder"
-#~ msgstr "Sidhållare"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "Hantera webbplatser installerade som program"
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Sidhållare"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Hämtningar"
 
-#~ msgid "_Closed Tabs and Windows"
-#~ msgstr "_Stängda tabbar och fönster"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Rensa allt"
 
-#~ msgid "[URIs]"
-#~ msgstr "[URL]"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "Misslyckades med att öppna hämtningen: %s"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Öppna mål_mapp"
 
-#~ msgid "Root"
-#~ msgstr "Rot"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Kopiera länk_plats"
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Snabbsök"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Filen '<b>%s</b>' har hämtats."
 
-#~ msgid "Both"
-#~ msgstr "Både och"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "'<b>%s</b>' och %d andra filer har hämtats."
 
-#~ msgid "Both horizontal"
-#~ msgstr "Båda horisontellt"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Hämtningen är klar"
 
-#~ msgid "Load on Startup"
-#~ msgstr "Ladda vid uppstart"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Några filer hämtas fortfarande"
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "Öppna URL i ny _flik"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "Avsluta Midori"
 
-#~ msgid "Source"
-#~ msgstr "Källkod"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Hämtningarna kommer avbrytas när Midori avslutas."
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "_Ikon (namn eller fil):"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "Hämtningshanterare"
 
-#~ msgid "Manage search engines"
-#~ msgstr "Hantera sökmotorer"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "Visa hämtade filer"
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Varning: Du använder ett administratörskonto!"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "Misslyckades med att uppdatera databas: %s"
 
-#~ msgid "_Disable"
-#~ msgstr "_Inaktivera"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "MIsslyckades med att välja från databas: %s"
 
-#~ msgid "_Fullscreen"
-#~ msgstr "_Fullskärm"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "Misslyckades med att importera tidigare session: %s"
 
-#~ msgid "_Leave Fullscreen"
-#~ msgstr "_Lämna fullskärm"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Settings"
-#~ msgstr "Inställningar"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "Flik- och sessionshantering"
 
-#~ msgid "Trash"
-#~ msgstr "Papperskorgen"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "The trash, collecting recently closed tabs and windows"
-#~ msgstr "Papperkorgen, samlar senast stängda tabbar och fönster"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+"Detta tillägg ger tillgång till en uppgiftskö för uppdateringar och "
+"upprepade händelser."
 
-#~ msgid "Browser"
-#~ msgstr "Webbläsare"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "Misslyckades med att lägga till ny anteckning i databasen: %s\n"
 
-#~ msgid "Pa_ge Setup"
-#~ msgstr "_Sidinställningar"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "Misslyckades med att ta bort anteckning från databasen: %s\n"
 
-#~ msgid "Undo the last modification"
-#~ msgstr "Ångra senaste ändringen"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "Misslyckades med att ändra namn på anteckning: %s\n"
 
-#~ msgid "Add, edit and remove bookmarks…"
-#~ msgstr "Lägg till, ändra och ta bort bokmärken…"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "Misslyckades med att uppdatera anteckning: %s\n"
 
-#~ msgid "Tab _Overview"
-#~ msgstr "Flikö_versikt"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "Anteckningar"
 
-#~ msgid "_Work Offline"
-#~ msgstr "_Arbeta offline"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "Ny anteckning"
 
-#~ msgid "Appearance of the shadow around each panel"
-#~ msgstr "Utseende på skuggan runt varje panel"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "Skapar en ny tom anteckning, utan relation till öppna sidor."
 
-#~ msgid "Menu to hold panel items"
-#~ msgstr "Meny för att visa panelföremål"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "Ny anteckning"
 
-#~ msgid "The index of the current page"
-#~ msgstr "Indexet för nuvarande sida"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "Misslyckades med att välja från anteckningsdatabas: %s\n"
 
-#~ msgid "Show New Tab"
-#~ msgstr "Visa Ny flik"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "Byt namn på anteckning"
 
-#~ msgid "Show Web search"
-#~ msgstr "Visa Webbsökning"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "Kopiera anteckning till urklipp"
 
-#~ msgid "Tab Label Size"
-#~ msgstr "Flikstorlek"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "Ta bort anteckning"
 
-#~ msgid "The desired tab label size"
-#~ msgstr "Önskad storlek på fliketikett"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "Kopiera markering som anteckning"
 
-#~ msgid "The URI of the currently loaded page"
-#~ msgstr "URIn för den laddade sidan"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "Spara texturklipp från webbsidor som anteckningar"
 
-#~ msgid "The title of the currently loaded page"
-#~ msgstr "Titeln för den laddade sidan"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklamblockeringsfilter"
 
-#~ msgid "Symbolic size to use for the animation"
-#~ msgstr "Symbolisk storlek för animeringen"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Blockera annonser enligt en filterlista"
 
-#~ msgid "The name of an icon containing animation frames"
-#~ msgstr "Namn på en ikon som innehåller animeringsbilder"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Redigera reklamblockeringsfilter"
 
-#~ msgid "A GdkPixbuf containing animation frames"
-#~ msgstr "En GdkPixbuf som innehåller animeringbilder"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Bl_ockera bild"
 
-#~ msgid "The name of an icon to be used as the static image"
-#~ msgstr "Namn på ikon att använda som statisk bild"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bl_ockera länk"
 
-#~ msgid "A GdkPixbuf to be used as the static image"
-#~ msgstr "En GdkPixbuf att använda som statisk bild"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Redigera regel"
 
-#~ msgid "The stock ID of an icon to be used as the static image"
-#~ msgstr "Katalog-ID för en ikon att använda som statisk bild"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Regel:"
diff --git a/po/ta.po b/po/ta.po
new file mode 100644 (file)
index 0000000..0616d4c
--- /dev/null
+++ b/po/ta.po
@@ -0,0 +1,3425 @@
+# Tamil translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-04-24 23:22+0000\n"
+"Last-Translator: deenadayalan <deenadayalancs@gmail.com>\n"
+"Language-Team: Tamil <ta@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:04+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "மிடோரி"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "இணைய உலாவி"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "மிடோரி இணைய உலாவி"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "இணையத்தில் உலாவுக"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "புதிய தாவல்"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "புதிய சாளரம்"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "அடைவு"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "நிரல் பதிப்பை காட்டு"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "முகவரிகள்"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "தெரியாத பிழை நிகழ்ந்தது"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "புத்தகக்குறிகள் (_B)"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "விரிவாக்கங்கள் (_E)"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "_வரலாறு"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "புதிய தத்தல் (_T)"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "புதிய சாளரம்"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "புதிய அடைவு"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "கோப்பை கண்டுபிடிக்க முடியவில்லை."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  deenadayalan https://launchpad.net/~deenadayalancs-p"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/te.po b/po/te.po
new file mode 100644 (file)
index 0000000..38264dc
--- /dev/null
+++ b/po/te.po
@@ -0,0 +1,3425 @@
+# Telugu translation for midori
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-05-20 13:17+0000\n"
+"Last-Translator: Chaitanya <strawhatluf@gmail.com>\n"
+"Language-Team: Telugu <te@li.org>\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-Launchpad-Export-Date: 2014-11-26 06:05+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "మిడొరి"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "వెబ్ విహారిణి"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "మిడొరి వెబ్ విహారిణి"
+
+#: ../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:1611
+msgid "New Tab"
+msgstr "కొత్త టాబ్"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "కొత్త విండో"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Chaitanya https://launchpad.net/~strawhatluf"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/th.po b/po/th.po
new file mode 100644 (file)
index 0000000..f01d28d
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,3427 @@
+# Thai translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-09 19:29+0000\n"
+"Last-Translator: Nathan Yiangsupapaanontr <zartre.y@gmail.com>\n"
+"Language-Team: Thai <th@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:05+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "เว็บเบราว์เซอร์"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori Web Browser"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "ท่องดูเว็บ"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "แท็บใหม่"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "หน้าต่างใหม่"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "หน้าต่างใหม่แบบสวนตัว"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori ท่องเว็บแบบส่วนตัว"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "ท่องเว็บแบบส่วนตัว"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "เปิดหน้าต่างท่องเว็บแบบส่วนตัว"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "รัน ADDRESS เป็นเว็บแอพ"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "FOLDER"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "ท่องเว็บแบบส่วนตัว ไม่บันทึกการเปลี่ยนแปลง"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "โหมดพกพา ไฟล์รันไทม์ต่างๆ จะถูกเก็บไว้ในทีเดียว"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "หน้าต่าง GTK+ พร้อม WebKit คล้ายกับ GtkLauncher"
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "แสดงหน้าต่างการวินิจฉัย"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "รันคำสั่งที่กำหนด"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr "แสดงคำสั่งที่สามารถทำงานได้ด้วยการพิมพ์-e/ --execute"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "แสดงเวอร์ชันโปรแกรม"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "ที่อยู่"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "รีเซ็ต Midori หากไม่มีการทำงานในระยะเวลา SECONDS วินาที"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "ข้อผิดพลาด: ไม่พบ \"gdb\"\n"
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "ตรวจสอบเวอร์ชันใหม่ที่:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "เกิดข้อผิดพลาดที่ไม่รู้จัก"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "ไม่พบไฟล์"
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  AppleNerd https://launchpad.net/~njitipairote\n"
+"  Nathan Yiangsupapaanontr https://launchpad.net/~zartre-y\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index eaebbb39e645664e5731928ca9da403b95aee2f3..152fea6a04a7043c45a08cadd6646eb7a66eeeb7 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
-# Turkish translations for midori package.
-# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
+# Turkish translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the midori package.
-# Mirat Can Bayrak <MiratCanBayrak@gmail.com>
-# Gökmen Görgen <gkmngrgn@gmail.com>
-# Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
 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"
-"PO-Revision-Date: 2010-05-10 09:45+0300\n"
-"Last-Translator: Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>\n"
-"Language-Team: Turkish <kde-i18n-doc@kde.org,xfce-i18n@xfce.org>\n"
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:35+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2014-11-27 05:47+0000\n"
+"X-Generator: Launchpad (build 17261)\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"
-
-#: ../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:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
 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
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Ayarlar yüklenemedi: %s\n"
-
-#: ../midori/main.c:150
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "'%s' değeri şunun için yanlış : %s"
-
-#: ../midori/main.c:155 ../midori/main.c:259
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "Geçersiz yapılandırma değeri '%s'"
-
-#: ../midori/main.c:364
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "Arama motorları yüklenemedi. %s\n"
-
-#: ../midori/main.c:418
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Geçmiş silinemedi: %s\n"
-
-#: ../midori/main.c:438 ../midori/main.c:562
-#: ../extensions/formhistory/formhistory.c:531
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Şu veri tabanı açılamadı: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
-#, 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
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Şu geçmiş öğesi silinemedi: %s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Yer imleri kaydedilemedi. %s"
-
-#: ../midori/main.c:614
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Ayarlar kaydedilemedi. %s"
-
-#: ../midori/main.c:649
-#, 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
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Çöp kutusu kaydedilemedi. %s"
-
-#: ../midori/main.c:727 ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "Ek Özellikler"
-
-#: ../midori/main.c:741
-msgid "Privacy"
-msgstr "Gizlilik"
-
-#: ../midori/main.c:753
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Çerezler giriç verilerini, kayıtı oyunları veya reklam amaçlı kullanıcı "
-"profillerini saklar."
-
-#: ../midori/main.c:809
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Oturum kaydedilemedi. %s"
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori İnternet Tarayıcısı"
 
-#: ../midori/main.c:1027
-msgid ""
-"No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Root yetki dosyası kullanılabilir değil. SSL yetkileri doğrulanamadı."
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "İnternette Gezin"
 
-#: ../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."
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Tarayıcı"
 
-#: ../midori/main.c:1115
-msgid "Modify _preferences"
-msgstr "_Tercihleri Değiştir"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Yeni Sekme"
 
-#: ../midori/main.c:1119
-msgid "Disable all _extensions"
-msgstr "Tüm _eklentiler kapalı"
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Yeni Pencere"
 
-#: ../midori/main.c:1132
-msgid "Discard old tabs"
-msgstr "Eski sekmeleri çıkar"
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Yeni Özel Tarama Penceresi"
 
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
-msgid "Show last tabs without loading"
-msgstr "Yüklemeden son sekmeyi göster"
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Midori Gizli Tarama"
 
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
-msgid "Show last open tabs"
-msgstr "Son açılan sekmeleri göster"
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Gizli Tarama"
 
-#: ../midori/main.c:1342 ../midori/main.c:2400
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Oturum yüklenemedi: %s\n"
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Yeni bir gizli tarama penceresi aç"
 
-#: ../midori/main.c:1480
+#: ../midori/main.c:52
 #, 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:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADRES'i web uygulaması gibi çalıştır"
 
-#: ../midori/main.c:1892
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADRES"
 
-#: ../midori/main.c:1895
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "KLASÖR'ü yapılandırma klasörü olarak kullan"
 
-#: ../midori/main.c:1895
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "KLASÖR"
 
-#: ../midori/main.c:1898
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Özel tarama, değişiklikler kaydedilmez."
 
-#: ../midori/main.c:1900
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Bir tanılama diyaloğu göster"
 
-#: ../midori/main.c:1902
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Belirtilen dosya ismini javascript olarak çalıştır"
 
-#: ../midori/main.c:1904
+#: ../midori/main.c:97
 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:99
 msgid "Execute the specified command"
 msgstr "Belirtilen komutu çalıştır"
 
-#: ../midori/main.c:1908
+#: ../midori/main.c:101
 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:103
 msgid "Display program version"
 msgstr "Uygulama sürümünü göster"
 
-#: ../midori/main.c:1912
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Adresler"
 
-#: ../midori/main.c:1914
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "ÖRNEK düzenli ifadeye göre URI engele"
 
-#: ../midori/main.c:1914
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "ÖRNEK"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:111
 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:111
 msgid "SECONDS"
 msgstr "SANİYELER"
 
-#: ../midori/main.c:1921
-msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Konsol uyarılarını belirtilen DOSYAADI'ne yönlendirir"
-
-#: ../midori/main.c:1921
-msgid "FILENAME"
-msgstr "DOSYAADI"
-
-#: ../midori/main.c:1986
-msgid "[Addresses]"
-msgstr "[Adresler]"
-
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "Belirtilen yapılandırma dizini geçersiz."
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
 
-#: ../midori/main.c:2024
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya "
 "raporlayın:"
 
-#: ../midori/main.c:2026
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Yeni sürümler için şuraya bakın:"
 
-#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
-msgid "Saved logins and _passwords"
-msgstr "Kayıtlı girişler ve _parolalar"
-
-#: ../midori/main.c:2112
-#, fuzzy
-msgid "Cookies and Website data"
-msgstr "Website bilgisi ve çerezler"
-
-#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116 ../midori/midori-websettings.c:984
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
-msgid "Web Cache"
-msgstr "Web Önbelleği"
-
-#: ../midori/main.c:2119
-msgid "Website icons"
-msgstr "Websitesi simgeleri"
-
-#: ../midori/main.c:2225
-#, fuzzy
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr "Bilinmeyen bir sorun oluştu."
-
-#: ../midori/main.c:2331
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Şu anda Midori'nin başka bir örneği çalışıyor; ama cevap vermiyor.\n"
-
-#: ../midori/main.c:2367
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Yer imleri yüklenemedi: %s\n"
-
-#: ../midori/main.c:2415
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Çöp kutusu yüklenemedi: %s\n"
-
-#: ../midori/main.c:2428
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Geçmiş yüklenemedi: %s\n"
-
-#: ../midori/main.c:2444
-msgid "The following errors occured:"
-msgstr "Şu hatalar ortaya çıktı:"
-
-#: ../midori/main.c:2460
-msgid "_Ignore"
-msgstr "_Yoksay"
-
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Yer imi"
+msgstr "Bilinmeyen bir hata oluştu"
 
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Yer İmleri"
 
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Yerimi Ekle"
 
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Uçbirim"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Ek Özellikler"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Geçmiş"
 
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Anasayfa"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Kullanıcı betikleri"
 
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Kullanıcı _biçimleri"
+
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Yeni _Sekme"
 
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Aktarımlar"
 
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape eklentileri"
 
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "Sekmeleri _kapat"
 
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "Yeni _Pencere"
 
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Yeni _Dizin"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Adresler]"
+
+#: ../midori/midori-array.c:549
 msgid "File not found."
 msgstr "Dosya bulunamadı."
 
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "Kötü biçimlendirilmiş belge."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "Tanımlanmayan yer imi biçimi."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "Yazma işlemi gerçekleştirilemedi."
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr "Sonraki sayfaya git"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr "Sonraki sayfaya git"
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
 
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 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:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Bu sayfayı yüklemeyi durdur"
 
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:514
 #, 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:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "'%s' değeri şunun için yanlış : %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Beklenmedik ayar '%s'"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Beklenmedik eylem '%s'."
 
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Gizli Gezinme)"
 
-#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "Üst Seviye Dizin"
-
-#: ../midori/midori-browser.c:784
-msgid "New folder"
-msgstr "Yeni Dizin"
-
-#: ../midori/midori-browser.c:784
-msgid "Edit folder"
-msgstr "Klasörü düzenle"
-
-#: ../midori/midori-browser.c:786
-msgid "New bookmark"
-msgstr "Yeni yer imi"
-
-#: ../midori/midori-browser.c:786
-msgid "Edit bookmark"
-msgstr "Yer imini düzenle"
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Yeni geçmiş ögesi ekleme hatası: %s\n"
 
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_Başlık:"
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
 
-#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "Adres:"
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Yer imleri"
 
-#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303
-msgid "_Folder:"
-msgstr "_Dizin:"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:887
-msgid "Add to _Speed Dial"
-msgstr "_Hızlı aramaya Ekle"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:900
-msgid "Show in the tool_bar"
-msgstr "Araç_çubuğunda göster"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:915
-msgid "Run as _web application"
-msgstr "_Web uygulaması olarak çalıştır"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:986
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr " \"%s\" Dosyası bu dizine kaydedilemedi."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Bu konuma yazmak için yetkiniz bulunmuyor."
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:995
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "\"%s\" indirmek için yeterli boş disk alanı yok."
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:998
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Dosya %s ihtiyaç duyuyor ancak %s kaldı."
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "_Hızlı aramaya Ekle"
 
-#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Dosyayı kaydet"
 
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "Yeni Pencere"
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "İlişkili _kaynakları kaydet"
 
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Yeni bir pencere açıldı"
 
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "Yeni Sekme"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Yeni bir sekme açıldı"
 
-#: ../midori/midori-browser.c:1368
-#, fuzzy
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
-msgstr "Resmi açmada hata!"
+msgstr "Görüntüyü açarken hata!"
 
-#: ../midori/midori-browser.c:1369
-#, fuzzy
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
-msgstr "Seçili resim varsayılan göstericide açılamıyor."
+msgstr "Seçilen görüntü öntanımlı programda açılamaz."
 
-#: ../midori/midori-browser.c:1375
-#, fuzzy
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
-msgstr "Kaynak '%s' yükleme hatası"
+msgstr "Görüntüyü indirirken hata!"
 
-#: ../midori/midori-browser.c:1376
-#, fuzzy
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Seçilen resim indirilemiyor."
 
-#: ../midori/midori-browser.c:1479
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Dosyayı kaydet"
 
-#: ../midori/midori-browser.c:2346
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Önbellek kullanmadan sayfayı yeniden yükle"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Dosya aç"
 
-#: ../midori/midori-browser.c:2478
+#: ../midori/midori-browser.c:2692
 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"
@@ -549,139 +384,125 @@ msgstr ""
 "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
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 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:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 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:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Boş"
 
-#: ../midori/midori-browser.c:3446
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Metin imleci navigasyonunu değiştir"
 
-#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Yeni geçmiş ögesi ekleme hatası: %s\n"
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"F7'ye basmak Düzenleme İşaretçisiyle Tarama'ya geçiş yapar. Etkin olduğunda, "
+"bir metin imleci tüm web sitelerinde görünür."
 
-#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "Düzenleme İşaretçisiyle Taramayı _Etkinleştir"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 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
-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:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Yeni _Pencerede aç"
 
-#: ../midori/midori-browser.c:4190
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4191
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4192
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4195
-#, fuzzy, c-format
+#: ../midori/midori-browser.c:4357
+#, c-format
 msgid "Firefox (%s)"
-msgstr "Firefox"
+msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Yerimleri içe aktarılıyor…"
 
-#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "Yerimlerini içe aktar"
 
-#: ../midori/midori-browser.c:4230
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Uygulamadan:"
 
-#: ../midori/midori-browser.c:4295
+#: ../midori/midori-browser.c:4455
 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:4481
 msgid "Import from a file"
 msgstr "Dosyadan yükle"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Yerimlerini içe aktarma hatası"
 
-#: ../midori/midori-browser.c:4377
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL yer imleri"
 
-#: ../midori/midori-browser.c:4382
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape yer imleri"
 
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori sadece XBEL (*. xbel) ve Netscape (*. html) dışarı aktarabilir."
+msgstr ""
+"Midori sadece XBEL (*. xbel) ve Netscape (*. html) dışarı aktarabilir."
 
-#: ../midori/midori-browser.c:4411
+#: ../midori/midori-browser.c:4558
 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
-msgid "Clear Private Data"
-msgstr "Kişisel Verileri Temizle"
-
-#: ../midori/midori-browser.c:4537
-msgid "_Clear private data"
-msgstr "_Kişisel verileri temizle"
-
-#: ../midori/midori-browser.c:4550
-msgid "Clear the following data:"
-msgstr "Aşağıdaki verileri temizle:"
-
-#: ../midori/midori-browser.c:4560
-msgid "Last open _tabs"
-msgstr "Son açılmış sekmeler"
-
-#: ../midori/midori-browser.c:4586
-msgid "Clear private data when _quitting Midori"
-msgstr "Midori'den çıkıldığında kişisel verileri temizle"
-
-#: ../midori/midori-browser.c: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
+#: ../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 "
@@ -690,1545 +511,1517 @@ msgid ""
 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. "
+"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:4780
 msgid "translator-credits"
 msgstr ""
 "Mirat Can Bayrak <MiratCanBayrak@gmail.com>\n"
 "Gökmen Görgen <gkmngrgn@gmail.com>\n"
-"Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>"
+"Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Ayhan YALÇINSOY https://launchpad.net/~ayhanyalcinsoy\n"
+"  Baris Ata https://launchpad.net/~brsata\n"
+"  Deniz https://launchpad.net/~denizberkyurek4\n"
+"  Ercan SORMAZ https://launchpad.net/~ercansormaz\n"
+"  Ferhat TUNÇTAN https://launchpad.net/~ferhattnctn66\n"
+"  Furkan Ege Öztürk https://launchpad.net/~furkanegeozturk\n"
+"  Halit Alptekin https://launchpad.net/~halitalptekin\n"
+"  Hasan Yılmaz https://launchpad.net/~hasanyilmaz\n"
+"  Irmak Bıçakçıgil https://launchpad.net/~irmak\n"
+"  Metin Şanlı https://launchpad.net/~metinsanli\n"
+"  Oguzhan Kuyucu https://launchpad.net/~oguzhankuyucu\n"
+"  Sadık Atalay https://launchpad.net/~seaflames\n"
+"  Selim Sırrı Sevgi https://launchpad.net/~selimssevgi\n"
+"  Seçgin Karagülle https://launchpad.net/~secgink-57\n"
+"  Utku BERBEROĞLU https://launchpad.net/~boluluutku\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  circass https://launchpad.net/~erdincgultekin\n"
+"  jan https://launchpad.net/~janeser\n"
+"  kulkke https://launchpad.net/~kulkke\n"
+"  seaflames https://launchpad.net/~protoman-s\n"
+"  Çağatay Çöl https://launchpad.net/~cagataycol"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "Şuan ki sekmeyi Çoğalt"
 
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Yeni bir pencerede aç"
 
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Yeni bir sekmede aç"
 
-#: ../midori/midori-browser.c:5201
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Yeni _Gizli Gezinme Penceresi"
 
-#: ../midori/midori-browser.c:5205
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Bir dosya aç"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "Sayfayı Farklı _Kaydet…"
 
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Bir dosyaya kaydet"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Hızlı aramaya _ekle"
 
-#: ../midori/midori-browser.c:5214
-msgid "Add Shortcut to the _desktop"
-msgstr "_Masaüstüne Kısayol ekle"
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr "Haber _kaynaksine üye ol"
 
-#: ../midori/midori-browser.c:5216
-msgid "Create _Launcher"
-msgstr "_Başlatıcı Oluştur"
-
-#: ../midori/midori-browser.c:5220
-msgid "Subscribe to News _feed"
-msgstr "Haber _kaynaksine üye ol"
-
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "Sekmeyi _kapat"
 
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Geçerli sekmeyi kapat"
 
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "Pen_cereyi Kapat"
 
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Geçerli sayfayı yazdır"
 
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "Bütün Pen_cereleri Kapat"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Bul,.."
 
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5129
 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:5131
 msgid "Find _Next"
 msgstr "So_nrakini Bul"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Öncekini Bu_l"
 
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Uygulama tercihlerini yapılandır"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "_Araç Çubukları"
 
-#: ../midori/midori-browser.c:5279
-msgid "Reload page without caching"
-msgstr "Önbellek kullanmadan sayfayı yeniden yükle"
-
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Yakınlaştırma seviyesini arttır"
 
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Yakınlaştırma seviyesini azalt"
 
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Kodlama"
 
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Kaynağını görüntüle"
 
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "Düzenleme İşaretçisini Kullanarak Gezinme"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Tam ekran modunu aç / kapat"
 
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "So_l Kaydırma"
 
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Aşağı Kay_dırma"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Y_ukarı kaydırma"
 
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Sağa Kaydı_rma"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr "_Okunabilir"
+
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Git"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Önceki sayfaya geri dön"
 
-#: ../midori/midori-browser.c:5325
-msgid "Go forward to the next page"
-msgstr "Sonraki sayfaya git"
-
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5202
 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
-msgid "Go to the next sub-page"
-msgstr "Sonraki sayfaya git"
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr "_Anasayfa"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Anasayfaya git"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Çöp Kutusunu Boşalt"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Sekme kapatmayı geri al"
 
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Yeni bir _dizin ekle"
 
-#: ../midori/midori-browser.c:5354
-msgid "_Export bookmarks"
-msgstr "Yerimlerini _dışa aktar"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "Arama _Motorlarını Yönet"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines"
+msgstr ""
 
-#: ../midori/midori-browser.c:5360
-msgid "_Clear Private Data"
-msgstr "Kişisel Verileri Temizle"
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Sayfayı _incele"
 
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "Ön_ceki Sekme"
 
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "So_nraki Sekme"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "Sekmeyi _Geri Taşı"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "Sekmeyi İleri _Taaşı"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Geçerli Sekmeye Odaklan"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "_Sonraki görünüme odaklan"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Sadece şuan ki sekmenin simgesini göster"
 
-#: ../midori/midori-browser.c:5386
-msgid "_Duplicate Current Tab"
-msgstr "Şuan ki sekmeyi Çoğalt"
-
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Diğer Sekmeleri Kapat"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "_Son oturumu aç"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Sık Sorulan Sorular"
 
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "Bir Hata _Raporla…"
 
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr "_Araçlar"
+
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "_Menü Çubuğu"
 
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Gezi_nti araç Çubuğu"
 
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "Yan _panel"
 
-#: ../midori/midori-browser.c:5421
-#, fuzzy
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
-msgstr "Yan _panel"
+msgstr "Yan panel"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Yer imi araç çu_buğu"
 
-#: ../midori/midori-browser.c:5428
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "_Durum Çubuğu"
 
-#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:307
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "Otom_atik"
 
-#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "Çince (BIG5)"
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr "Geleneksel Çince(BIG5)"
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr "Basitleştirilmiş Çince (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Japonca (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:234
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:235
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Rusça (KOI8-R)"
 
-#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 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
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Özel…"
 
-#: ../midori/midori-browser.c:5964
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "Ayraç"
 
-#: ../midori/midori-browser.c:5971
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "Kon_um…"
 
-#: ../midori/midori-browser.c:5973
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Belirli bir konumu aç"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Web Arama…"
 
-#: ../midori/midori-browser.c:5997
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Bir web arama gerçekleştir"
 
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:5887
 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:5904
 msgid "Show the saved bookmarks"
 msgstr "Kaydedilmiş yer imlerini göster"
 
-#: ../midori/midori-browser.c:6058
-msgid "_Tools"
-msgstr "_Araçlar"
-
-#: ../midori/midori-browser.c:6074
-msgid "_Window"
-msgstr "_Pencere"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:6076
+#: ../midori/midori-browser.c:5939
 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:5953
 msgid "_Menu"
 msgstr "_Menü"
 
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Menü"
 
-#: ../midori/midori-browser.c:6904
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Beklenmedik ayar '%s'"
-
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:341
 #, 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:894 ../extensions/addons.c:1680
 #, 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:1325
+msgid "Export certificate"
+msgstr "Sertfikayı dışa aktar"
 
-#: ../midori/midori-locationaction.c:412
-#, fuzzy
-msgid "Search with…"
-msgstr "_ile ara"
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr "Kayıtlı sertifika yöneticisi bilinmiyor."
 
-#: ../midori/midori-locationaction.c:537
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Geçmişten seçme hatası\n"
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Sertifika, alınan sitenin kimliğiyle uyuşmadı."
 
-#: ../midori/midori-locationaction.c:624
-#, c-format
-msgid "Search for %s"
-msgstr "%s için ara"
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr "Sertifikanın geçerliliği hala devam ediyor."
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr "Sertifikasının süresi bitmiş"
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Sertifika GTlsConnection sertifika iptal listesine göre iptal edilmiştir."
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Sertifika algoritmasının güvenli olmadığı düşünülüyor."
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr "Sertifika doğrulanırken başka hatalar oluştu."
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr "_Sertifikayı dışa aktar."
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr "Kedinden-imzalı"
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr "Güvenlik detayları"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Ya_pıştır ve ilerle"
 
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Doğrulanmadı"
 
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Doğrulanmış ve şifrelenmiş bağlantı"
 
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr "Açık,şifrelenmemiş bağlantı"
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
 msgid "Align sidepanel to the right"
 msgstr "Kenar panelini sağa hizala"
 
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
 msgid "Close panel"
 msgstr "Paneli kapat"
 
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
 msgid "Align sidepanel to the left"
 msgstr "Kenar panelini sola hizala"
 
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Hızlı Aramayı Göster"
 
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Anasayfa göster"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Son açılan sekmeleri göster"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Yüklemeden son sekmeyi göster"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Yeni sekme"
 
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Yeni pencere"
 
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Geçerli sekme"
 
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Simgeler"
 
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Küçük simgeler"
 
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Metin"
 
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Simgeler ve metin"
 
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Simgelerin yanında metin"
 
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Otomatik (GNOME veya çevre)"
 
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP vekil sunucu"
 
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Vekil sunucu yok"
 
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:388
-msgid "Remember last window size"
-msgstr "Son pencerenin ölçülerini hatırla"
-
-#: ../midori/midori-websettings.c:389
-msgid "Whether to save the last window size"
-msgstr "Son pencere boyu kaydedilsin"
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr "Araç çubuğunun biçimi"
 
-#: ../midori/midori-websettings.c:397
-msgid "Last window width"
-msgstr "Son pencerenin eni"
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr "Her zaan yazıbiçimi tercihlerimi kullan"
 
-#: ../midori/midori-websettings.c:398
-msgid "The last saved window width"
-msgstr "Son kaydedilmiş pencere eni"
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr "Siteler için kullanıcı tercihi yazı biçimlerini geçersiz kıl"
 
-#: ../midori/midori-websettings.c:406
-msgid "Last window height"
-msgstr "Son pencere yüksekliği"
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Ayarlar yüklenemedi: %s\n"
 
-#: ../midori/midori-websettings.c:407
-msgid "The last saved window height"
-msgstr "Son kaydedilmiş pencere yüksekliği"
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Geçersiz yapılandırma değeri '%s'"
 
-#: ../midori/midori-websettings.c:432
-msgid "Last panel position"
-msgstr "Son panel pozisyonu"
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:433
-msgid "The last saved panel position"
-msgstr "Son kaydedilen panel pozisyonu"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Sekme etiketini göster"
 
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:442
-msgid "Last panel page"
-msgstr "Son panel sayfası"
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Sadece sekme ikonunu göster"
 
-#: ../midori/midori-websettings.c:443
-msgid "The last saved panel page"
-msgstr "Son kaydedilmiş panel sayfası"
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../midori/midori-websettings.c:451
-msgid "Last Web search"
-msgstr "Son Web Arama"
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Diğer Sekmeleri Kapat"
 
-#: ../midori/midori-websettings.c:452
-msgid "The last saved Web search"
-msgstr "Kaydedilmiş son web arama"
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr "Bu siteye güven"
 
-#: ../midori/midori-websettings.c:461
-msgid "Show Menubar"
-msgstr "Menü Çubuğunu Göster"
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr "Bilinmeyen güvenlik"
 
-#: ../midori/midori-websettings.c:462
-msgid "Whether to show the menubar"
-msgstr "Menü çubuğu gösterilsin"
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s HTML5 veri tabanına kaydetmek istiyor"
 
-#: ../midori/midori-websettings.c:470
-msgid "Show Navigationbar"
-msgstr "Gezinti Araç Çubuğunu Göster"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr "_Reddet"
 
-#: ../midori/midori-websettings.c:471
-msgid "Whether to show the navigationbar"
-msgstr "Navigasyon çubuğu gösterilsin"
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr "İzin ver"
 
-#: ../midori/midori-websettings.c:479
-msgid "Show Bookmarkbar"
-msgstr "Yer İmi Araç Çubuğunu Göster"
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s Konumunuzu öğrenmek istiyor."
 
-#: ../midori/midori-websettings.c:480
-msgid "Whether to show the bookmarkbar"
-msgstr "Yer imi araç çubuğu gösterilsin"
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
 
-#: ../midori/midori-websettings.c:488
-msgid "Show Panel"
-msgstr "Paneli Göster"
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:489
-msgid "Whether to show the panel"
-msgstr "Panel çubuğu gösterilsin"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
 
-#: ../midori/midori-websettings.c:497
-msgid "Show Statusbar"
-msgstr "Durum Çubuğunu Göster"
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
 
-#: ../midori/midori-websettings.c:498
-msgid "Whether to show the statusbar"
-msgstr "Durum çubuğu gösterilsin"
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
 
-#: ../midori/midori-websettings.c:507
-msgid "Toolbar Style:"
-msgstr "Araç Çubuğu Biçimi:"
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
 
-#: ../midori/midori-websettings.c:508
-msgid "The style of the toolbar"
-msgstr "Araç çubuğunun biçimi"
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-websettings.c:517
-msgid "Toolbar Items"
-msgstr "Araç Çubuğu Öğeleri"
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-websettings.c:518
-msgid "The items to show on the toolbar"
-msgstr "Araç çubuğunun üzerinde gösterilecek ögeler"
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Tekrar deneyin"
 
-#: ../midori/midori-websettings.c:526
-msgid "Compact Sidepanel"
-msgstr "Küçük Yan Panel"
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr "%s bir mesaj gönder"
 
-#: ../midori/midori-websettings.c:527
-msgid "Whether to make the sidepanel compact"
-msgstr "Yan panel küçük gösterilsin"
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr "_arama motoru ekle..."
 
-#: ../midori/midori-websettings.c:542
-msgid "Align sidepanel on the right"
-msgstr "Kenar panelini sağda hizala"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-websettings.c:543
-msgid "Whether to align the sidepanel on the right"
-msgstr "Kenar panelini sağa hizala açık/kapalı"
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr "Bağlantıyı Yeni _Sekmede Aç"
 
-#: ../midori/midori-websettings.c:558
-msgid "Open panels in separate windows"
-msgstr "Panelleri ayrı pencerelerde aç"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr "Bağlantıyı _Önalan Sekmede Aç"
 
-#: ../midori/midori-websettings.c:559
-msgid "Whether to always open panels in separate windows"
-msgstr "Her zaman panelleri ayrı pencerelerde aç açık/kapalı"
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr "Bağlantıyı _Arka Alan Sekmede Aç"
 
-#: ../midori/midori-websettings.c:568
-msgid "When Midori starts:"
-msgstr "Midori başlarken:"
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr "Bağlantıyı Yeni _Pencerede aç"
 
-#: ../midori/midori-websettings.c:569
-msgid "What to do when Midori starts"
-msgstr "Midori başlatılırken ne yapılacak"
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr "Bağlantı konumunu _kopyala"
 
-#: ../midori/midori-websettings.c:578
-msgid "Homepage:"
-msgstr "Anasayfa:"
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
 
-#: ../midori/midori-websettings.c:579
-msgid "The homepage"
-msgstr "Anasayfa"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
 
-#: ../midori/midori-websettings.c:594
-msgid "Show crash dialog"
-msgstr "Çökme diyaloğunu göster"
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr "Resm_i Yeni Sekmede Aç"
 
-#: ../midori/midori-websettings.c:595
-msgid "Show a dialog after Midori crashed"
-msgstr "Midori çöktükten sonra bir diyalog göster"
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
 
-#: ../midori/midori-websettings.c:603
-msgid "Save downloaded files to:"
-msgstr "İndirilen dosyaları kaydet:"
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr "Res_mi Kaydet"
 
-#: ../midori/midori-websettings.c:604
-msgid "The folder downloaded files are saved to"
-msgstr "İndirilen dosyaların kaydedileceği dizin"
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr "G_örüntü Gösterici ile Aç"
 
-#: ../midori/midori-websettings.c:612
-msgid "Text Editor"
-msgstr "Metin Düzenleyici"
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr "Video _Adresini Kopyala"
 
-#: ../midori/midori-websettings.c:613
-msgid "An external text editor"
-msgstr "Harici metin düzenleyici"
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr "_Video İndir"
 
-#: ../midori/midori-websettings.c:628
-msgid "News Aggregator"
-msgstr "Haber Toplayıcı"
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Adresi Yeni _Sekmede Aç"
 
-#: ../midori/midori-websettings.c:629
-msgid "An external news aggregator"
-msgstr "Harici bir haber toplayıcıda"
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr "_ile ara"
 
-#: ../midori/midori-websettings.c:637
-msgid "Location entry Search"
-msgstr "Konum Girişi Arama"
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr "Web ara"
 
-#: ../midori/midori-websettings.c:638
-msgid "The search to perform inside the location entry"
-msgstr "Konum girişi içinde yapılacak arama"
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr "Yeni sekmede _çerceve aç"
 
-#: ../midori/midori-websettings.c:646
-msgid "Preferred Encoding"
-msgstr "Tercih Edilen Kodlama"
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Unsurları Kontrol _et"
 
-#: ../midori/midori-websettings.c:647
-msgid "The preferred character encoding"
-msgstr "Tercih edilen karakter kodlaması"
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr "%s dosya aç veya indir"
 
-#: ../midori/midori-websettings.c:657
-msgid "Always Show Tabbar"
-msgstr "Sekme Çubuğunu Her Zaman Göster"
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr "Dosya Adı: %s"
 
-#: ../midori/midori-websettings.c:658
-msgid "Always show the tabbar"
-msgstr "Sekme çubuğunu her zaman göster"
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Dosya Türü: '%s'"
 
-#: ../midori/midori-websettings.c:671
-msgid "Close Buttons on Tabs"
-msgstr "Sekmelerde kapatma düğmesi"
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Dosya Türü: %s ('%s')"
 
-#: ../midori/midori-websettings.c:672
-msgid "Whether tabs have close buttons"
-msgstr "Sekmelerde kapatma düğmesi olsun"
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr "Boyut:%s"
 
-#: ../midori/midori-websettings.c:697
-msgid "Open new pages in:"
-msgstr "Yeni sayfaları aç:"
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr "%s aç"
 
-#: ../midori/midori-websettings.c:698
-msgid "Where to open new pages"
-msgstr "Yeni sayfaların açılacağı yer"
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr "Sayfayı incele - %s"
 
-#: ../midori/midori-websettings.c:707
-msgid "Middle click opens Selection"
-msgstr "Orta tuşla seçimi aç"
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr "Midori kişisel bilgileri depolamaz:"
 
-#: ../midori/midori-websettings.c:708
-msgid "Load an address from the selection via middle click"
-msgstr "Orta tuşla tıklamasıyla bir adres yükle"
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr "Hiçbir ağ çerezi ya da geçmiş kaydedilmeyecek"
 
-#: ../midori/midori-websettings.c:716
-msgid "Open tabs in the background"
-msgstr "Sekmeleri arkaplanda aç"
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr "Eklentiler devre dışı."
 
-#: ../midori/midori-websettings.c:717
-msgid "Whether to open new tabs in the background"
-msgstr "Sekmeler arka planda açılsın"
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "HTML5 depolama, yerel veritabanı ve uygulama önbellekleri etkisiz."
 
-#: ../midori/midori-websettings.c:725
-msgid "Open Tabs next to Current"
-msgstr "Sekmeleri geçerli sekmeden sonrakine aç"
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Midori sitelerin kullanıcıyı takip etmesini engeller:"
 
-#: ../midori/midori-websettings.c:726
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Yeni sekmelerin hangi sekmeden sonra açılacağını belirle"
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Yönlendirilen bağlantı, sunucu ismine indirgendi."
 
-#: ../midori/midori-websettings.c:734
-msgid "Open popups in tabs"
-msgstr "Açılır pencereleri sekmelerde aç"
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr "DNS önbelleğe alma etkisiz."
 
-#: ../midori/midori-websettings.c:735
-msgid "Whether to open popup windows in tabs"
-msgstr "Açılır pencereler sekmelerde açılsın"
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr "Dil ve zaman dilimi sitelerinde açığa vurulmaz."
 
-#: ../midori/midori-websettings.c:745 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Resimleri otomatik yükle"
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "Flash ve diğer Netscape eklentileri siteler tarafından listelenemez."
 
-#: ../midori/midori-websettings.c:746
-msgid "Load and display images automatically"
-msgstr "Resimleri otomatik yükle ve görüntüle"
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+"Parantez içerisindeki sürüm numaraları, çalışma zamanında kullanılan sürümü "
+"göstermektedir."
 
-#: ../midori/midori-websettings.c:753 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Betiklere izin ver"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-websettings.c:754
-msgid "Enable embedded scripting languages"
-msgstr "Kodlama dilleri yerleştirmesi açık"
+#: ../midori/midori-view.c:4000
+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-websettings.c:761 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Netscape eklentileri açık"
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr "Sayfa Yükle"
 
-#: ../midori/midori-websettings.c:762
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Gömülü Netscape eklenti nesneleri açık"
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr "Boş sayfa"
 
-#: ../midori/midori-websettings.c:777
-msgid "Enable Spell Checking"
-msgstr "Yazım Denetimi Açık"
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr "önceki"
 
-#: ../midori/midori-websettings.c:778
-msgid "Enable spell checking while typing"
-msgstr "Yazarken yazım denetimi açık/kapalı"
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr "sonraki"
 
-#: ../midori/midori-websettings.c:784
-msgid "Enable HTML5 database support"
-msgstr "HTML5 veritabanı desteği açık"
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr "Arkaplan resimlerini yazdır"
 
-#: ../midori/midori-websettings.c:785
-msgid "Whether to enable HTML5 database support"
-msgstr "HTML5 veritabanı desteği açık/kapalı"
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr "Arka fon resimlerini yaz açık/kapalı"
 
-#: ../midori/midori-websettings.c:791
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5 yerel depolama desteği açık"
-
-#: ../midori/midori-websettings.c:792
-msgid "Whether to enable HTML5 local storage support"
-msgstr "HTML5 yerel depolama desteği açık/kapalı"
-
-#: ../midori/midori-websettings.c:798
-msgid "Enable offline web application cache"
-msgstr "Çevrim dışı web uygulama önbelleği açık"
-
-#: ../midori/midori-websettings.c:799
-msgid "Whether to enable offline web application cache"
-msgstr "Çevrim dışı web uygulama önbelleği açık/kapalı"
-
-#: ../midori/midori-websettings.c:815
-#, fuzzy
-msgid "Flash window on background tabs"
-msgstr "Flash penceresi arka plan sekmeler"
-
-#: ../midori/midori-websettings.c:816
-#, fuzzy
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Sekmeler arka planda açılsın"
-
-#: ../midori/midori-websettings.c:824
-#, fuzzy
-msgid "Enable WebGL support"
-msgstr "HTML5 veritabanı desteği açık"
-
-#: ../midori/midori-websettings.c:825
-#, fuzzy
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Websitelerine OpenGL işlemesini kullanmaları için izin ver."
-
-#: ../midori/midori-websettings.c:851
-msgid "Zoom Text and Images"
-msgstr "Metni ve Resimleri yakınlaştır"
-
-#: ../midori/midori-websettings.c:852
-msgid "Whether to zoom text and images"
-msgstr "Metni ve Resimleri yakınlaştır açık/kapalı"
-
-#: ../midori/midori-websettings.c:867
-msgid "Find inline while typing"
-msgstr "Yazarken satır içinde ara"
-
-#: ../midori/midori-websettings.c:868
-msgid "Whether to automatically find inline while typing"
-msgstr "Yazarken otomatik satır içinde ara açık/kapalı"
-
-#: ../midori/midori-websettings.c:883
-msgid "Kinetic scrolling"
-msgstr "Hareketli kaydırma"
-
-#: ../midori/midori-websettings.c:884
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Kaydırma hıza göre hareketli olarak taşınacak açık/kapalı"
-
-#: ../midori/midori-websettings.c:892
-msgid "Delete old Cookies after:"
-msgstr "Şu süreden eski Çerezleri sil:"
-
-#: ../midori/midori-websettings.c:893
-msgid "The maximum number of days to save cookies for"
-msgstr "Çerezlerin saklanacağı en çok gün sayısı"
-
-#: ../midori/midori-websettings.c:909
-#, fuzzy
-msgid "Only accept Cookies from sites you visit"
-msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et"
-
-#: ../midori/midori-websettings.c:910
-#, fuzzy
-msgid "Block cookies sent by third-party websites"
-msgstr "Üçüncü parti websitelerinden gelen çerezleri engelle"
-
-#: ../midori/midori-websettings.c:924
-msgid "Delete pages from history after:"
-msgstr "Şu süreden eski sayfaları geçmişten sil:"
-
-#: ../midori/midori-websettings.c:925
-msgid "The maximum number of days to save the history for"
-msgstr "Geçmişin saklanacağı en çok gün sayısı"
-
-#: ../midori/midori-websettings.c:940
-msgid "Proxy server"
-msgstr "Vekil sunucu"
-
-#: ../midori/midori-websettings.c:941
-msgid "The type of proxy server to use"
-msgstr "Kullanılacak vekil sunucunun türü"
-
-#: ../midori/midori-websettings.c:950
-msgid "HTTP Proxy Server"
-msgstr "HTTP Vekil Sunucu"
-
-#: ../midori/midori-websettings.c:951
-msgid "The proxy server used for HTTP connections"
-msgstr "HTTP bağlantıları için kullanılan vekil sunucu"
-
-#: ../midori/midori-websettings.c:966
-msgid "Port"
-msgstr ""
-
-#: ../midori/midori-websettings.c:967
-#, fuzzy
-msgid "The proxy server port used for HTTP connections"
-msgstr "HTTP bağlantıları için kullanılan vekil sunucu"
-
-#: ../midori/midori-websettings.c:985
-msgid "The maximum size of cached pages on disk"
-msgstr "Diskteki önbelleklenmiş sayfaların en fazla boyutu"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1002
-msgid "Identify as"
-msgstr "Belirle"
-
-#: ../midori/midori-websettings.c:1003
-msgid "What to identify as to web pages"
-msgstr "Web sayfasını belirle"
-
-#: ../midori/midori-websettings.c:1019
-msgid "Identification string"
-msgstr "Tanımlama dizesi"
-
-#: ../midori/midori-websettings.c:1020
-msgid "The application identification string"
-msgstr "Uygulama tanımlama dizesi"
-
-#: ../midori/midori-websettings.c:1036
-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:1052
-msgid "Clear private data"
-msgstr "Kişisel veri temizle"
-
-#: ../midori/midori-websettings.c:1053
-msgid "The private data selected for deletion"
-msgstr "Silmek için kişisel veri seçildi"
-
-#: ../midori/midori-websettings.c:1068
-msgid "Clear data"
-msgstr "Kişisel verileri temizle"
-
-#: ../midori/midori-websettings.c:1069
-msgid "The data selected for deletion"
-msgstr "Silmek için kişisel veri seçildi"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1118
-msgid "Strip referrer details sent to websites"
-msgstr "İnternet sitelerine gönderilen başvurucu detaylarını sıyır"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1120
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "\"Referer\" başlığı ana makineye göre kısaltılmalı mı"
-
-#: ../midori/midori-websettings.c:1134
-#, fuzzy
-msgid "Always use my font choices"
-msgstr "Her zaman benim seçtiğim yazıtipini kullan"
-
-#: ../midori/midori-websettings.c:1135
-msgid "Override fonts picked by websites with user preferences"
-msgstr ""
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr "Özellikler"
 
-#: ../midori/midori-view.c:1353
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
 #, c-format
-msgid "%s wants to save an HTML5 database."
-msgstr "%s HTML5 veri tabanına kaydetmek istiyor"
-
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
-msgid "_Deny"
-msgstr "_Reddet"
-
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
-msgid "_Allow"
-msgstr "İzin ver"
+msgid "%s of %s"
+msgstr "%s nin %s"
 
-#: ../midori/midori-view.c:1385
+#: ../midori/midori-download.vala:75
 #, c-format
-msgid "%s wants to know your location."
-msgstr "%s Konumunuzu öğrenmek istiyor."
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d saat"
+msgstr[1] "%d saat"
 
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-download.vala:76
 #, c-format
-msgid "Error - %s"
-msgstr "Hata - %s"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d dakika"
+msgstr[1] "%d dakika"
 
-#: ../midori/midori-view.c:1477
+#: ../midori/midori-download.vala:77
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "Sayfa '%s' yüklenemedi."
-
-#: ../midori/midori-view.c:1479
-msgid "Try again"
-msgstr "Tekrar deneyin"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d saniye"
+msgstr[1] "%d saniye"
 
-#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
 #, c-format
-msgid "Send a message to %s"
-msgstr "%s bir mesaj gönder"
-
-#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738
-msgid "Inspect _Element"
-msgstr "Unsurları Kontrol _et"
-
-#: ../midori/midori-view.c:2471
-msgid "Open Link in New _Tab"
-msgstr "Bağlantıyı Yeni _Sekmede Aç"
-
-#: ../midori/midori-view.c:2475
-msgid "Open Link in _Foreground Tab"
-msgstr "Bağlantıyı _Önalan Sekmede Aç"
-
-#: ../midori/midori-view.c:2476
-msgid "Open Link in _Background Tab"
-msgstr "Bağlantıyı _Arka Alan Sekmede Aç"
-
-#: ../midori/midori-view.c:2479
-msgid "Open Link in New _Window"
-msgstr "Bağlantıyı Yeni _Pencerede aç"
-
-#: ../midori/midori-view.c:2482
-msgid "Open Link as Web A_pplication"
-msgstr "Bağlantıyı Web Uygulaması Olarak Aç"
-
-#: ../midori/midori-view.c:2487
-msgid "Copy Link de_stination"
-msgstr "Bağlantı konumunu _kopyala"
-
-#: ../midori/midori-view.c:2503
-msgid "Open _Image in New Tab"
-msgstr "Resm_i Yeni Sekmede Aç"
-
-#: ../midori/midori-view.c:2506
-msgid "Copy Image _Address"
-msgstr "Resim _Adresini Kopyala"
-
-#: ../midori/midori-view.c:2509
-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
-msgid "Copy Video _Address"
-msgstr "Video _Adresini Kopyala"
-
-#: ../midori/midori-view.c:2522
-msgid "Save _Video"
-msgstr "_Video kaydet"
-
-#: ../midori/midori-view.c:2522
-msgid "Download _Video"
-msgstr "_Video İndir"
-
-#: ../midori/midori-view.c:2548
-msgid "Search _with"
-msgstr "_ile ara"
+msgid " - %s remaining"
+msgstr " -%s kalan"
 
-#: ../midori/midori-view.c:2580
-msgid "_Search the Web"
-msgstr "Web ara"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr "?B"
 
-#: ../midori/midori-view.c:2597
-msgid "Open Address in New _Tab"
-msgstr "Adresi Yeni _Sekmede Aç"
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-view.c:2886
-msgid "Open or download file"
-msgstr "Dosyayı aç veya indir"
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr "İndirilen dosya hatalı."
 
-#: ../midori/midori-view.c:2905
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Dosya Türü: '%s'"
+#: ../midori/midori-download.vala:221
+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."
 
-#: ../midori/midori-view.c:2907
+#: ../midori/midori-download.vala:366
 #, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Dosya Türü: %s ('%s')"
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "\"%s\" Dosyası bu dizine kaydedilemedi."
 
-#: ../midori/midori-view.c:2911
-#, fuzzy, c-format
-msgid "File Name: %s"
-msgstr "Dosya Türü: '%s'"
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Bu konuma yazmak için yetkiniz bulunmuyor."
 
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2930
+#: ../midori/midori-download.vala:371
 #, c-format
-msgid "Open %s"
-msgstr "%s aç"
+msgid "There is not enough free space to download \"%s\"."
+msgstr "\"%s\" indirmek için yeterli boş disk alanı yok."
 
-#: ../midori/midori-view.c:3575
+#: ../midori/midori-download.vala:373
 #, c-format
-msgid "Inspect page - %s"
-msgstr "Sayfayı incele - %s"
+msgid "The file needs %s but only %s are left."
+msgstr "Dosya %s ihtiyaç duyuyor ancak %s kaldı."
 
-#: ../midori/midori-view.c:3876
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Hızlı arama"
 
-#: ../midori/midori-view.c:3877 ../midori/midori-view.c:3973
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Bir kısayol eklemek için tıklayın"
 
-#: ../midori/midori-view.c:3878
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Kısayol adresi girin"
 
-#: ../midori/midori-view.c:3879
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Kısayol başlığını girin"
 
-#: ../midori/midori-view.c:3880
+#: ../midori/midori-speeddial.vala:192
 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:4118
-#, fuzzy
-msgid "Midori doesn't store any personal data:"
-msgstr "Midori, hiçbir kişisel bilgiyi depolamıyor."
-
-#: ../midori/midori-view.c:4119
-msgid "No history or web cookies are being saved."
-msgstr ""
-
-#: ../midori/midori-view.c:4120
-#, fuzzy
-msgid "Extensions are disabled."
-msgstr "Eklentiler etkisizleştirildi."
-
-#: ../midori/midori-view.c:4121
-msgid "HTML5 storage, local database and application caches are disabled."
-msgstr ""
-
-#: ../midori/midori-view.c:4122
-msgid "Midori prevents websites from tracking the user:"
-msgstr ""
-
-#: ../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: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:4164
-msgid "Version numbers in brackets show the version used at runtime."
-msgstr ""
-"Parantez içerisindeki sürüm numaraları, çalışma zamanında kullanılan sürümü "
-"göstermektedir."
-
-#: ../midori/midori-view.c:4220
-msgid "Page loading delayed"
-msgstr "Sayfa yükleme gecikmesi"
-
-#: ../midori/midori-view.c:4221
-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
-msgid "Load Page"
-msgstr "Sayfa Yükle"
-
-#: ../midori/midori-view.c:4388
-msgid "Blank page"
-msgstr "Boş sayfa"
-
-#: ../midori/midori-view.c:4650
-msgid "_Duplicate Tab"
-msgstr "Sekmeyi Çoğalt"
-
-#: ../midori/midori-view.c:4655
-msgid "Show Tab _Label"
-msgstr "Sekme etiketini göster"
-
-#: ../midori/midori-view.c:4655
-msgid "Show Tab _Icon Only"
-msgstr "Sadece sekme ikonunu göster"
-
-#: ../midori/midori-view.c:4661
-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
-msgid "Print background images"
-msgstr "Arkaplan resimlerini yazdır"
-
-#: ../midori/midori-view.c:5507
-msgid "Whether background images should be printed"
-msgstr "Arka fon resimlerini yaz açık/kapalı"
-
-#: ../midori/midori-view.c:5539
-msgid "Features"
-msgstr "Özellikler"
-
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Açılış"
 
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Midori başlarken:"
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr "Anasayfa:"
+
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "_Geçerli sayfayı  kullan"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
-msgstr "Geçerli sayfayı ana sayfa olarak kullan "
+msgstr "Geçerli sayfayı ana sayfa olarak kullan"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Yazıtipleri"
 
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Uygun Yazıtipi Ailesi"
 
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:339
 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:342
 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:344
 msgid "Fixed-width Font Family"
 msgstr "Sabit Yazıtipi Genişliği Ailesi"
 
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:348
 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"
+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:351
 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"
 
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "En Küçük Yazıtipi Boyutu"
 
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:357
 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"
 
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr "Tercih Edilen Kodlama"
+
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Davranış"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Resimleri otomatik yükle"
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr "Yazım Denetimi Açık"
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Betiklere izin ver"
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr "WebGL desteğini etkinleştir"
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr "Metni ve Resimleri yakınlaştır"
+
+#: ../midori/midori-preferences.c:411
 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:412
 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ı"
+"Scriptlerin otomatik olarak açılır pencere açmasına izin verilmesi "
+"açık/kapalı"
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr "Tercih diller"
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "İndirilen dosyaları kaydet:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Gözden Geçiriliyor"
 
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "Araç Çubuğu Biçimi:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "Yeni sayfaları aç:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr "Sekmelerde kapatma düğmesi"
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr "Sekmeleri geçerli sekmeden sonrakine aç"
+
+#: ../midori/midori-preferences.c:487
+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-preferences.c:490
+msgid "Open tabs in the background"
+msgstr "Sekmeleri arkaplanda aç"
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr "Metin Düzenleyici"
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr "Haber Toplayıcı"
+
 #. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Ağ"
 
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Bilgisayar adı"
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr "Vekil sunucu"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr "Bağlantı noktası"
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Web Önbelleği"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr "Diskteki önbelleklenmiş sayfaların en fazla boyutu"
+
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:902
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "Belirle"
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Gizlilik"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr "Şu süreden eski Çerezleri sil:"
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr "Çerezlerin saklanacağı en çok gün sayısı"
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr "Yalnızca ziyaret edilen sayfalardan gelen çerezleri kabul et."
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr "Üçüncü-parti sitelerden gönderilen çerezleri engelle."
+
+#: ../midori/midori-preferences.c:599
+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/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr "Çevrim dışı web uygulama önbelleği açık"
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5 yerel depolama desteği açık"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+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-preferences.c:615
+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-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr "Şu süreden eski sayfaları geçmişten sil:"
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr "Geçmişin saklanacağı en çok gün sayısı"
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Ek Özellikler"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "Arama _Motorlarını Yönet"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Arama motoru ekle"
 
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Arama motoru düzenle"
 
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_İsim:"
 
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Açıklama:"
 
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "Simgeler:"
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr "Adres:"
 
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "İşare_t:"
 
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Arama Motorlarını Yönet"
 
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Öntanımlı olarak kullan"
 
-#: ../midori/sokoke.c:412
-msgid "Open with"
-msgstr "Birlikte aç"
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Arama motorları yüklenemedi. %s\n"
 
-#: ../midori/sokoke.c:420
+#: ../midori/midori-searchaction.c:1674
 #, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "\"%s\" 'ı açmak için bir uygulama seçin."
+msgid "The search engines couldn't be saved. %s"
+msgstr "Arama motorları kaydedilemedi. %s"
 
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
-msgid "Could not run external program."
-msgstr "Harici uygulama çalıştırılamadı."
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/sokoke.c:1653
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d saat"
-msgstr[1] "%d saat"
+msgid "Search for %s"
+msgstr "%s için ara"
 
-#: ../midori/sokoke.c:1654
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d dakika"
-msgstr[1] "%d dakika"
+msgid "Failed to select from history: %s"
+msgstr ""
 
-#: ../midori/sokoke.c:1655
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d saniye"
-msgstr[1] "%d saniye"
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr "Birlikte ara..."
 
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
-msgid "%s of %s"
-msgstr "%s nin %s"
+msgid "Search with %s"
+msgstr "%s ile ara"
 
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
-msgid "?B"
-msgstr "?B"
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr "Birlikte aç"
 
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:227
 #, c-format
-msgid " (%s/s)"
-msgstr "(%s/s)"
+msgid "Choose an application or command to open \"%s\":"
+msgstr "\"%s\" 'ı açmak için bir uygulama seçin."
 
-#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
-#, c-format
-msgid " - %s remaining"
-msgstr "-%s kalan"
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr "Harici uygulama çalıştırılamadı."
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:264
+#: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
 msgstr "Sat_ıriçi Bul:"
 
-#: ../toolbars/midori-findbar.c:290
+#: ../toolbars/midori-findbar.c:251
 msgid "Previous"
 msgstr "Önceki Sekme"
 
-#: ../toolbars/midori-findbar.c:296
+#: ../toolbars/midori-findbar.c:257
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../toolbars/midori-findbar.c:300
+#: ../toolbars/midori-findbar.c:261
 msgid "Match Case"
 msgstr "Büyük - Küçük Harf Duyarlı"
 
-#: ../toolbars/midori-findbar.c:309
-msgid "Highlight Matches"
-msgstr "Eşleşenleri Vurgula"
-
-#: ../toolbars/midori-findbar.c:320
+#: ../toolbars/midori-findbar.c:270
 msgid "Close Findbar"
 msgstr "Arama Çubuğunu Kapat"
 
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "Dosya '<b>%s</b>' indirildi."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Aktarım tamamlandı"
-
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "İndirilen dosya hatalı."
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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."
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
 msgstr ""
-"Bağlantı ile sağlanan checksum uyuşmuyor. Bu dosyada, muhtemelen eksik veya "
-"sonradan güncellenmiştir anlamına gelir."
 
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "Hepsini Temizle"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
-msgid "Some files are being downloaded"
-msgstr "Bazı dosyalar indiriliyor"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:374
-msgid "_Quit Midori"
-msgstr "Midori'den _çık"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:376
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Midori kapatılırsa aktarmalar iptal edilecek."
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Yer imleri"
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:257
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Yerimi ekleme hatası: %s\n"
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Seçili yer imini düzenle"
 
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Seçili yer imini sil"
 
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Yeni bir dizin ekle"
 
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Ayraç</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Yeni _Sekmede Aç"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr "Yerimlerini Ara"
+
 #: ../panels/midori-history.c:111
 msgid "History"
 msgstr "Geçmiş"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Bugün"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Dün"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:137
 #, 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
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Bir hafta önce"
 
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Şu geçmiş öğesi silinemedi: %s\n"
+
+#: ../panels/midori-history.c:312
 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:358
 msgid "Bookmark the selected history item"
 msgstr "Seçili geçmiş ögesini yer imlerine ekle"
 
-#: ../panels/midori-history.c:416
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Seçili geçmiş öğesini sil"
 
-#: ../panels/midori-history.c:424
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Bütün geçmişi sil"
 
-#: ../panels/midori-transfers.c:86
-msgid "Transfers"
-msgstr "Aktarımlar"
-
-#: ../panels/midori-transfers.c:467
-msgid "Open Destination _Folder"
-msgstr "Hedef _Dizini Aç"
-
-#: ../panels/midori-transfers.c:470
-msgid "Copy Link Loc_ation"
-msgstr "Konum Bağlantısını Kopyala"
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+msgstr "Arama Geçmişi"
 
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
@@ -2254,187 +2047,147 @@ msgstr "Şifre"
 msgid "_Remember password"
 msgstr "Şifreyi _hatırla"
 
-#: ../katze/katze-throbber.c:949
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "'%s' olarak isimlendirilmiş simge yüklenemiyor"
-
-#: ../katze/katze-throbber.c:962
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "'%s' stok simgesi yüklenemedi"
-
-#: ../katze/katze-throbber.c:1042
-msgid "Animation frames are broken"
-msgstr "Animasyon kareleri kırık"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "Yok"
 
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:529
 #, 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
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Dosya seç"
 
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Dizin seç"
 
-#: ../katze/katze-utils.c:604
-msgid "None"
-msgstr "Yok"
-
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 saat"
 
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 gün"
 
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 hafta"
 
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 ay"
 
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 yıl"
 
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s için tercihler"
 
-#: ../extensions/adblock.c:467
-msgid "Configure Advertisement filters"
-msgstr "Reklam filtresini yapılandır"
-
-#: ../extensions/adblock.c:498
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Metin girdisindeki ön yapılandırmalı filtre listesinin adresini yaz ve "
-"listeye eklemek için \"Ekle\"'yi tıkla. %s daha fazla liste bulabilirsin."
-
-#: ../extensions/adblock.c:846
-msgid "Edit rule"
-msgstr "Kuralı düzenle"
-
-#: ../extensions/adblock.c:860
-msgid "_Rule:"
-msgstr "_Kural:"
-
-#: ../extensions/adblock.c:914
-msgid "Bl_ock image"
-msgstr "Resim _Engelle"
-
-#: ../extensions/adblock.c:919
-msgid "Bl_ock link"
-msgstr "Bağlantıyı engelle"
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
 
-#: ../extensions/adblock.c:1620
-msgid "Advertisement blocker"
-msgstr "Reklam engelleyici"
-
-#: ../extensions/adblock.c:1621
-msgid "Block advertisements according to a filter list"
-msgstr "Filtre listesine göre reklamları engelle"
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
 
 #. 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?"
+#: ../extensions/addons.c:222
+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:223
 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:228
 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:229
 msgid "_Install user style"
 msgstr "Kullanıcı stillerini yükle"
 
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
 msgid "Don't install"
 msgstr "Yükleme"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Kullanıcı Betikleri"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Kullanıcı Biçimleri"
 
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
-#: ../extensions/feed-panel/main.c:129
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Hata"
 
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "'%s' i silmek istediğinizden eminmisiniz."
 
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "Kullanıcı betiklerini sil"
 
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "Kullanıcı stillerini sil"
 
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "'<b>%s</b>' dosyası kalıcı olarak silindi"
 
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Metin düzenleyici ile aç"
 
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Hedef _Dizini Aç"
 
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Yeni eklenti ekle"
 
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Seçilmiş eklentiyi kaldır"
 
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Kullanıcı eklentileri"
 
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Dizin '%s' izlenemedi: %s"
 
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Kullanıcı scripts ve sitil desteği"
 
-#: ../extensions/colorful-tabs.c:201
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Renkli Sekmeler"
 
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Her sekmeyi farklı biçimde renklendir"
 
@@ -2443,11 +2196,11 @@ msgstr "Her sekmeyi farklı biçimde renklendir"
 msgid "Cookie Manager"
 msgstr "Çerez Yöneticisi"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Hepsini Sil"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2455,31 +2208,31 @@ 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:116
 msgid "Expand All"
 msgstr "Hepsini Genişlet"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Hepsini Kapat"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "Soru"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 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:668
 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:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2496,15 +2249,16 @@ msgstr ""
 "<b>Güvenlik</b>: %s\n"
 "<b>Bitiş süresi</b>: %s"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Evet"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Hayır"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2513,74 +2267,129 @@ msgstr ""
 "<b>Alan</b>: %s\n"
 "<b>Çerezler</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "İsim"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Hepsini G_enişlet"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "Hepsini _Kapat"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-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:1128
+msgid "Search Cookies by Name or Domain"
+msgstr "Çerezleri isme veya domaine göre ara"
 
 #: ../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"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "XML verisindeki gerekli Atom \"girdi\" elementi bulma hatası."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:367
 #, 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:620
 msgid "Feeds"
 msgstr "Kaynaklar"
 
-#: ../extensions/feed-panel/feed-panel.c:706
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Yeni kaynak ekle"
 
-#: ../extensions/feed-panel/feed-panel.c:713
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "kaynak sil"
 
-#: ../extensions/feed-panel/feed-panel.c:795
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "_Kaynak"
 
@@ -2589,854 +2398,1098 @@ msgstr "_Kaynak"
 msgid "Failed to find root element in feed XML data."
 msgstr "XML veri kaynağında kök element bulma hatası."
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "Desteklenmeyen kaynak biçimi."
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "XML kaynağı biçim hatası: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "RSS XML veride \"kanal\" elementi bulma hatası."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Desteklenmeyen RSS sürümü bulundu."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "XML verisindeki gerekli RSS \"öge\" elementi bulma hatası."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "XML verisindeki gerekli RSS \"kanal\" elementi bulma hatası."
 
-#: ../extensions/feed-panel/main.c:131
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Kaynak '%s' halihazırda var"
 
-#: ../extensions/feed-panel/main.c:208
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Kaynak '%s' yükleme hatası"
 
-#: ../extensions/feed-panel/main.c:518
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Kaynak Paneli"
 
-#: ../extensions/feed-panel/main.c:519
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom/RSS kaynaklarını oku"
 
-#: ../extensions/formhistory/formhistory.c:39
+#: ../extensions/formhistory/formhistory.c:38
 #, 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
+#: ../extensions/formhistory/formhistory.c:100
 msgid "Form history"
-msgstr "_Form Geçmişi"
+msgstr "Form geçmişi"
 
-#: ../extensions/formhistory/formhistory.c:112
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:117
 msgid ""
 "Master password required\n"
 "to open password database"
 msgstr ""
-"Bu konuma girmek için\n"
-"kullanıcı adı ve şifre gerekli:"
+"Parola veritabanını açmak için \n"
+"ana parola gerekli"
 
-#: ../extensions/formhistory/formhistory.c:294
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
-msgstr "Şifreyi _hatırla"
+msgstr "Bu sayfada parola hatırlansın mı?"
 
-#: ../extensions/formhistory/formhistory.c:299
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
-msgstr "Şifreyi _hatırla"
+msgstr "Hatırla"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
-msgstr ""
+msgstr "Şimdi değil"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
-msgstr ""
+msgstr "Bu sayfa için asla"
 
-#: ../extensions/formhistory/formhistory.c:437
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
-msgstr "Form geçmişi durumunu değiştir."
+msgstr "Form geçmiş durumunu değiştir"
 
-#: ../extensions/formhistory/formhistory.c:438
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
-msgstr "Geçerli sekme için form geçmişi etkinleştirin veya devre dışı bırakın."
-
-#: ../extensions/formhistory/formhistory.c:549
-#: ../extensions/formhistory/formhistory.c:553
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Veri tabanı ifadesi çalışma hatası: %s\n"
+msgstr ""
+"Geçerli sekme için form geçmişi etkinleştirin veya devre dışı bırakın."
 
-#: ../extensions/formhistory/formhistory.c:629
-#, fuzzy
+#: ../extensions/formhistory/formhistory.c:598
 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"
+"Form geçmişini her sekme için yalnızca (Ctrl+Shift+F) tuşları ile etkinleştir"
 
-#: ../extensions/formhistory/formhistory.c:668
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Tarih doldurucu biçimi"
 
-#: ../extensions/formhistory/formhistory.c:669
+#: ../extensions/formhistory/formhistory.c:656
 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
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
 msgid "Failed to select suggestions\n"
-msgstr "Geçmişten seçme hatası\n"
+msgstr "Öneriler seçilemedi\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Ziyaret edilmemiş sekme bulunmuyor"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Geçmiş-Listesi"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Sekme kapatma davranışı"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Hiçbirş ey yapma"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Son bakılan sekmeye geç"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "En yeni sekmeye geç"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "Artalan sekmeleri üzerindeki pencereyi göster"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Bir sonraki yeni Sekme (Geçmiş Listesi)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Geçmişten bir sonraki yeni sekme"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Bir önceki yeni Sekme (Geçmiş Listesi)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Geçmişten bir önceki yeni sekme"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Sekmeyi arkaplanda göster Geçmiş Listesi()"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 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:648
 msgid "History List"
 msgstr "Geçmiş Listesi"
 
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "Sekmeleri kapatırken veya değiştirirken son kullanılan sekmeye taşı"
 
-#: ../extensions/mouse-gestures.c:301
-msgid "Mouse Gestures"
-msgstr "Fare İşaretleri"
-
-#: ../extensions/mouse-gestures.c:302
-msgid "Control Midori by moving the mouse"
-msgstr "Hareketli fare tarafından Midori kontrolü"
-
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "Sayfayı Yeniden yükle ya da yüklemeyi durdur"
-
-#: ../extensions/shortcuts.c:176
-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:320
-msgid "Shortcuts"
-msgstr "Kısayollar"
-
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "Klavye kısayollarını görüntüle ve düzenle"
-
-#: ../extensions/status-clock.c:174
-msgid "Statusbar Clock"
-msgstr "_Durum Çubuğu Saati"
-
-#: ../extensions/status-clock.c:175
-msgid "Display date and time in the statusbar"
-msgstr "Durum çubuğunda tarihi ve saati göster"
-
-#: ../extensions/statusbar-features.c:131
-msgid "Images"
-msgstr "Resimler"
-
-#: ../extensions/statusbar-features.c:140
-msgid "Scripts"
-msgstr "Betikler"
-
-#: ../extensions/statusbar-features.c:151
-msgid "Netscape plugins"
-msgstr "Netscape eklentileri"
-
-#: ../extensions/statusbar-features.c:199
-msgid "Statusbar Features"
-msgstr "Durum Çubuğu Özellikleri"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:200
-msgid "Easily toggle features on web pages on and off"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
 msgstr ""
-"Web sayfasının açılmasında ve kapanmasında özellikleri kolayca kilitler"
 
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
-msgid "Tab Panel"
-msgstr "Sekme Paneli"
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#: ../extensions/tab-panel.c:663
-msgid "T_ab Panel"
-msgstr "Sekme P_aneli"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
 
-#: ../extensions/tab-panel.c:681
-msgid "Show tabs in a vertical panel"
-msgstr "Sekmeleri bir dikey panelde göster"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "Ön tanımlı olarak sadece sekme ikonlarını göster"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "Yeni sekmelere etiket verme"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:393
-msgid "Customize Toolbar"
-msgstr "Araç Çubuğunu Özelleştir"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/nojs/nojs-preferences.c:613
 msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
 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
-msgid "Available Items"
-msgstr "Kullanılabilir ögeler"
 
-#: ../extensions/toolbar-editor.c:446
-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:597
-msgid "_Customize…"
-msgstr "_Düzenle…"
-
-#: ../extensions/toolbar-editor.c:627
-msgid "Toolbar Editor"
-msgstr "Araç Çubuğu Düzenleyici"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:628
-msgid "Easily edit the toolbar layout"
-msgstr "Araç çubuğunu kolayca düzenler"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
 
-#: ../extensions/web-cache.c:463
-msgid "Cache HTTP communication on disk"
-msgstr "Diskteki HTTP iletişimi önbelleği"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
 
-#~ msgid "Lightweight web browser"
-#~ msgstr "Hafif web tarayıcı "
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
 
-#~ msgid "No filename specified"
-#~ msgstr "Dosya ismi belirtilmedi"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
 
-#~ msgid "Cookies"
-#~ msgstr "Çerezler"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'Flash' çerezleri"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 veritabanı"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "Çevrimdışı Uygulama Önbelleği "
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
 
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Gezinirken hiç bir özel veriyi kaydetme"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
 
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Hızlı aramaya kısayol ekle"
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
 
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Masaüstüne kısayol ekle"
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
 
-#~ msgid "Create a launcher"
-#~ msgstr "Bir başlatıcı oluştur"
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
 
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Bu haber kaynaksine üye ol"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#~ msgid "Close this window"
-#~ msgstr "Bu pencereyi kapat"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#~ msgid "Close all open windows"
-#~ msgstr "Bütün açık pencereleri kapat"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
 
-#~ msgid "Undo the last modification"
-#~ msgstr "Son değişikliği geri al"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#~ msgid "Redo the last modification"
-#~ msgstr "Son değişikliği yeniden yap"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
 
-#~ msgid "Cut the selected text"
-#~ msgstr "Seçili metni kes"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
 
-#~ msgid "Copy the selected text"
-#~ msgstr "Seçili metni kopyala"
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
 
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Metni panodan yapıştır"
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
 
-#~ msgid "Delete the selected text"
-#~ msgstr "Seçili metni sil"
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
 
-#~ msgid "Select all text"
-#~ msgstr "Bütün metni seç"
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
 
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Kelime ya da ibarenin sonraki örneğini bul"
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
 
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Kelime ya da ibarenin sonraki örneğini bul"
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
 
-#~ msgid "Reset the zoom level"
-#~ msgstr "Yakınlaştırma oranını sıfırla"
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
 
-#~ msgid "View the source code of the page"
-#~ msgstr "Geçerli sayfanın kaynak kodunu görüntüle"
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
 
-#~ msgid "Scroll to the left"
-#~ msgstr "Sola kaydır"
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
 
-#~ msgid "Scroll down"
-#~ msgstr "Aşağı kaydır"
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
 
-#~ msgid "Scroll up"
-#~ msgstr "Yukarı kaydır"
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
 
-#~ msgid "Scroll to the right"
-#~ msgstr "Sağa kaydır"
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
 
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Çöp Kutusu içerisindeki bütün içeriği sil"
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
 
-#~ msgid "Open the last closed tab"
-#~ msgstr "Son kapatılan sekmeyi aç"
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
 
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Yeni bir yerimi dizini ekle"
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
 
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Arama motorlarını ekle, sil ve düzenle…"
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
 
-#~ msgid "Clear private data…"
-#~ msgstr "Kişisel verileri temizle…"
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan…"
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
 
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Önceki sekmeye geç"
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
 
-#~ msgid "Switch to the next tab"
-#~ msgstr "Sonraki sekmeye geç"
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
 
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Sekmeyi önceki sekmenin arkasına taşı"
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
 
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Sekmeyi sonraki sekmenin önüne taşı"
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
 
-#~ msgid "Focus the current tab"
-#~ msgstr "Geçerli sekmeye odaklan"
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
 
-#~ msgid "Cycle focus between views"
-#~ msgstr "Görünümler arasında dairesel odak"
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
 
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Sadece şuan ki sekmenin simgesini göster"
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
 
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Geçerli sekmeyi çoğalt"
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
 
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Diğer sekmeleri kapat"
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "Fare İşaretleri"
 
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Son oturumda kaydedilmiş sekmeleri aç"
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "Hareketli fare tarafından Midori kontrolü"
 
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Sık Sorulan Soruları Göster"
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "Sayfayı Yeniden yükle ya da yüklemeyi durdur"
 
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Midori'nin hata takip sistemini aç"
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "Klavye kısayolunu özelleştir"
 
-#~ msgid "Show information about the program"
-#~ msgstr "Uygulama hakkında bilgi göster"
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr "Kısayollar özelleştiriliyor…"
 
-#~ msgid "Show menubar"
-#~ msgstr "Menü çubuğunu göster"
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "Kısayollar"
 
-#~ msgid "Show navigationbar"
-#~ msgstr "Gezinti araç çubuğunu göster"
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "Klavye kısayollarını görüntüle ve düzenle"
 
-#~ msgid "Show sidepanel"
-#~ msgstr "Yan paneli göster"
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "_Durum Çubuğu Saati"
 
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Yer imi araç çubuğunu göster"
+#: ../extensions/status-clock.c:169
+msgid "Display date and time in the statusbar"
+msgstr "Durum çubuğunda tarihi ve saati göster"
 
-#~ msgid "Show statusbar"
-#~ msgstr "Durum çubuğunu göster"
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "Resimler"
 
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Checksum:"
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "Betikler"
 
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Checksum:"
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape eklentileri"
 
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Satır ve sütun sayısını ayarla"
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape eklentileri açık"
 
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Satır ve sütun sayısını gir"
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "Durum Çubuğu Özellikleri"
 
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Hızlı arama boyutu için geçersiz girdi"
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
+"Web sayfasının açılmasında ve kapanmasında özellikleri kolayca kilitler"
 
-#~ msgid "Thumb size:"
-#~ msgstr "Küçük resim boyutu:"
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "Sekme Paneli"
 
-#~ msgid "Small"
-#~ msgstr "Küçük"
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "Sekme P_aneli"
 
-#~ msgid "Medium"
-#~ msgstr "Orta"
+#: ../extensions/tab-panel.c:678
+msgid "Show tabs in a vertical panel"
+msgstr "Sekmeleri bir dikey panelde göster"
 
-#~ msgid "Big"
-#~ msgstr "Büyük"
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Ön tanımlı olarak sadece sekme ikonlarını göster"
 
-#~ msgid "Not available: %s"
-#~ msgstr "Kullanılamaz: %s"
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "Yeni sekmelere etiket verme"
 
-#~ msgid "Resource files not installed"
-#~ msgstr "Kaynak dosyalar yüklenmedi"
+#: ../extensions/toolbar-editor.c:401
+msgid "Customize Toolbar"
+msgstr "Araç Çubuğunu Özelleştir"
 
-#~ msgid "Reset the last _session"
-#~ msgstr "Son _oturumu yeniden başlat"
+#: ../extensions/toolbar-editor.c:417
+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."
 
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% yüklendi"
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "Kullanılabilir ögeler"
 
-#~ msgid "Quit the application"
-#~ msgstr "Uygulamadan çık"
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "Görüntülenen Ögeler"
 
-#~ msgid "_Contents"
-#~ msgstr "_İçerik"
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "_Özelleştir Araççubuğu..."
 
-#~ msgid "Show the documentation"
-#~ msgstr "Belgelendirmeyi göster"
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "Araç Çubuğu Düzenleyici"
 
-#~ msgid "_Transferbar"
-#~ msgstr "Ak_tarım çubuğu"
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "Araç çubuğunu kolayca düzenler"
 
-#~ msgid "Show transferbar"
-#~ msgstr "Aktarım çubuğunu göster"
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Kişisel Verileri Temizle"
 
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Veritabanı ifadesi çalıştırma hatası\n"
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Kişisel verileri temizle"
 
-#~ msgid "Show Blank page"
-#~ msgstr "Boş sayfa göster"
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Aşağıdaki verileri temizle:"
 
-#~ msgid "All cookies"
-#~ msgstr "Bütün çerezler"
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Son açılmış sekmeler"
 
-#~ msgid "Session cookies"
-#~ msgstr "Oturum çerezleri"
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Midori'den çıkıldığında kişisel verileri temizle"
 
-#~ msgid "Show Transferbar"
-#~ msgstr "Aktarım çubuğunu göster"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Kayıtlı girişler ve _parolalar"
 
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Aktarım çubuğu göster açık/kapalı"
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Çerezler ve Website bilgisi"
 
-#~ msgid "Show progress in location entry"
-#~ msgstr "Yerel girdideki ilerlemeyi göster"
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Websitesi simgeleri"
 
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Yerel girdideki yükleme ilerleyişini göster açık/kapalı"
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
 
-#~ msgid "Search engines in location completion"
-#~ msgstr "Konum tamamlamada arama motorları"
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
 
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Konum tamamlamada arama motorlarını göster açık/kapalı"
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Geçmiş silinemedi: %s\n"
 
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Panelin işletme kontrollerini göster"
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Eski geçmiş ögeleri silinemedi: %s\n"
 
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Panelin işletme kontrollerini göster açık/kapalı"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Yerimi ekleme hatası: %s\n"
 
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Yeni sekmede hızlı aramayı göster"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
 
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Yeni açılan sekmelerde hızlı aramayı göster"
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Hedef klasörü sor"
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Root yetki dosyası kullanılabilir değil. SSL yetkileri doğrulanamadı."
 
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Bir dosyayı indirirken hedef dizini sor açık/kapalı"
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Ayarlar kaydedilemedi. %s"
 
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Bir aktarım bittiğinde bir uyarı göster açık/kapalı"
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Çöp kutusu kaydedilemedi. %s"
 
-#~ msgid "Download Manager"
-#~ msgstr "İndirme Yöneticisi"
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
 
-#~ msgid "An external download manager"
-#~ msgstr "Harici indirme yöneticisi"
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "_Tercihleri Değiştir"
 
-#~ msgid "Open external pages in:"
-#~ msgstr "Harici sayfaları aç:"
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Tüm _eklentiler kapalı"
 
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Harici açılmış sayfaların açılacağı yer"
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr "Midori çöktükten sonra bir diyalog göster"
 
-#~ msgid "Accept cookies"
-#~ msgstr "Çerezleri kabul et"
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Eski sekmeleri çıkar"
 
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Kabul edilecek çerez türleri"
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
 
-#~ msgid "Maximum cookie age"
-#~ msgstr "En çok çerez süresi"
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
 
-#~ msgid "Maximum history age"
-#~ msgstr "En çok geçmiş süresi"
+#: ../midori/midori-frontend.c:461
+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"
 
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Son indirilmiş dosyaları hatırla"
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Yer imleri yüklenemedi: %s\n"
 
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Eğer son indirilmiş dosyalar kaydedilmişse"
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Oturum yüklenemedi: %s\n"
 
-#~ msgid "Not found - %s"
-#~ msgstr "Bulunamadı - %s"
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Çöp kutusu yüklenemedi: %s\n"
 
-#~ msgid "_Save Link destination"
-#~ msgstr "Bağlantı konumunu kay_det"
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Geçmiş yüklenemedi: %s\n"
 
-#~ msgid "_Download Link destination"
-#~ msgstr "Bağlantı konumunu İnd_ir"
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Şu hatalar ortaya çıktı:"
 
-#~ msgid "Download with Download _Manager"
-#~ msgstr "İndirme _Yöneticisi ile indir"
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Yoksay"
 
-#~ msgid "Download I_mage"
-#~ msgstr "Resm_i İndir"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
 
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Belge görüntülenemedi"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "General"
-#~ msgstr "Genel"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
 
-#~ msgid "Appearance"
-#~ msgstr "Görünüm"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#~ msgid "Font settings"
-#~ msgstr "Yazıtipi seçenekleri"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
 
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "96 dpi zorla"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
 
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Video yoğunluğunu 96 DPI'ye zorla"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Arayüz"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
 
-#~ msgid "Navigationbar"
-#~ msgstr "Gezinti Araç Çubuğu"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#~ msgid "Applications"
-#~ msgstr "Uygulamalar"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
-#~ msgid "External applications"
-#~ msgstr "Harici Uygulamadan"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
 
-#~ msgid "Web Cookies"
-#~ msgstr "Web Çerezleri"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
 
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Midori'den çıkıldığında çerezleri temizle"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "1 saatten daha eski çerezleri sil"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "1 haftadan daha eski çerezleri sil"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "1 aydan daha eski çerezleri sil"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
 
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "1 yıldan daha eski çerezleri sil"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
 
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Rekl_am filtresini yapılandır…"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
 
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Seçilmiş eklenti için hedef dizini aç"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
 
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Sonraki Sekme (Geçmiş Listesi)"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
 
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Önceki Sekme"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
 
-#~ msgid "Previous tab from history"
-#~ msgstr "Önceki Sekme"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
 
-#~ 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"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
 
-#~ msgid "Pageholder"
-#~ msgstr "Sayfa Tutucu"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
 
-#~ msgid "_Pageholder"
-#~ msgstr "_Sayfa tutucu"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr ""
-#~ "Bir veya birden fazla sayfayı sekmelerinizde paralel olarak açık tutun"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
 
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Yeni ziyaret edilmiş sayfalar"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
 
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Pencereden seçilmiş paneli ayır"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
 
-#~ msgid "Hide operating controls"
-#~ msgstr "İşlem kontrollerini gizle"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#~ msgid "Original cookies only"
-#~ msgstr "Sadece gerçek çerezler"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "Son ziyaret edilen sayfaları hatırla"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Eğer son ziyaret edilen sayfalar kaydedilmişse"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Vekil sunucuyu otomatik olarak belirle"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Uygulamalar"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Vekil sunucuyu ortamdan otomatik olarak belirle açık/kapalı"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
 
-#~ msgid "_Restore Tab"
-#~ msgstr "Sekmeyi Ye_rleştir"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#~ msgid "_Minimize Tab"
-#~ msgstr "Sekmeyi küçült"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
 
-#~ msgid "Spell Checking"
-#~ msgstr "Yazım Denetimi"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Yazım sözlükleri:"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
 
-#~ 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\""
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "_Başlatıcı Oluştur"
 
-#~ msgid "Console"
-#~ msgstr "Uçbirim"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
 
-#~ msgid "Copy _All"
-#~ msgstr "_Hepsini Kopyala"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "Copy All"
-#~ msgstr "Hepsini Kopyala"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "Aktarımlar"
 
-#~ msgid "Erroneous clock time"
-#~ msgstr "Saat zamanı hatalı"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "Hepsini Temizle"
 
-#~ 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"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
 
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "%s %s dizinine kopyala."
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "Hedef _Dizini Aç"
 
-#~ msgid "_Cookie Manager"
-#~ msgstr "_Çerez Yöneticisi"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "Konum Bağlantısını Kopyala"
 
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Kısayol sayısını ayarla"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "Dosya '<b>%s</b>' indirildi."
 
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Kısayol sayısını gir"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
 
-#~ msgid "User_styles"
-#~ msgstr "Kullanıcı _biçimleri"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "Aktarım tamamlandı"
 
-#~ msgid "URIs"
-#~ msgstr "URIs"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "Bazı dosyalar indiriliyor"
 
-#~ msgid "[URIs]"
-#~ msgstr "[URIs]"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "Midori'den _çık"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Midori kapatılırsa aktarmalar iptal edilecek."
 
-#~ msgid "Root"
-#~ msgstr "Kök"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "Ç_abuk Bul"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Hemen kelime yada ibarenin olduğu yeri göster"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "View Selection Source"
-#~ msgstr "Seçim Kaynağını Görüntüle"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Her ikisi de"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "İkisi de yatay"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Load on Startup"
-#~ msgstr "Açılışta Yükle"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Son form girişlerini hatırla"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Son form girişlerinin saklanacağı en çok gün sayısı"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Önbellek boyutu"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "İzin verilen önbellek boyutu"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Open URL in New _Tab"
-#~ msgstr "URL'yi yeni _sekmede aç"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Source"
-#~ msgstr "Kaynak"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Resimleri otomatik küçült"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Metin alanlarını yeniden boyutlandır"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Enable developer tools"
-#~ msgstr "Geliştirici araçlarına izin ver"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "_Icon (name or file):"
-#~ msgstr "S_imge (isim ya da dosya):"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Manage search engines"
-#~ msgstr "Arama motorlarını yönet"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Dikkat: Süper kullanıcı hesabı kullanıyorsunuz!"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s böyle bir özelliğe sahip değil '%s'"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s şuna eşitlenemiyor %s.%s"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "Erişilemiyor: %s.%s "
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "_Enable"
-#~ msgstr "_Etkinleştir"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "_Disable"
-#~ msgstr "_Devre dışı bırak"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Reklam engelleyici"
 
-#~ msgid "Plugins"
-#~ msgstr "Eklentiler"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Filtre listesine göre reklamları engelle"
 
-#~ msgid "Last pageholder URI"
-#~ msgstr "Son sayfa tutacı URI"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Reklam filtresini yapılandır"
 
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "Sayfa tutucu içinde son açılan URI"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Resim _Engelle"
 
-#~ msgid "Load Provisional"
-#~ msgstr "Koşullu Yükle"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Bağlantıyı engelle"
 
-#~ msgid "Load Committed"
-#~ msgstr "İşlenmişi Yükle"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Kuralı düzenle"
 
-#~ msgid "Load Finished"
-#~ msgstr "Tamamlananı Yükle"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Kural:"
index 894b5b170e422181f0e6f774c201d488bb22486b..2b367721028380693dd70f08c92b77e58008ee14 100644 (file)
--- a/po/ug.po
+++ b/po/ug.po
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Gheyret Kenji <gheyret@gmail.com>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-24 23:57+0000\n"
-"PO-Revision-Date: 2011-11-09 16:10+0900\n"
-"Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2013-06-02 11:52+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\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"
+"X-Launchpad-Export-Date: 2014-11-26 06:05+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+"Language: \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:138 ../midori/main.c:151
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "مىدورى(Midori)"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "توركۆرگۈ"
+
+#: ../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 "New Private Browsing Window"
-msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى"
+msgid "Internet;WWW;Explorer"
+msgstr "ئىنتېرنېت؛WWW؛Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "يېڭى بەتكۈچ"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "يېڭى كۆزنەك"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "توركۆرگۈ"
+msgid "New Private Browsing Window"
+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:3929
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "شەخسىي كۆرۈش"
 
-#: ../midori/main.c:62
+# tooltip
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكىدىن بىرنى ئاچىدۇ"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "كۆرۈنۈش بۇ يەرگە ساقلاندى :%s\n"
 
-#: ../midori/main.c:87
+# CLI --help
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىلىدۇ"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:89
+# CLI --help
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلىتىدۇ"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:91
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "شەخسىي كۆرۈش، ئۆزگىرىشلەر ساقلانمىدى"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "قۇلاي ھالەت، بارلىق ئىجرا بولىدىغان پروگراممىلار بىر يەرگە ساقلىنىدۇ"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "GtkLauncher بىلەن ئوخشاش تۇردىكى WebKit ئىشلەتكەن سىدام GTK+ كۆزنىكى"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "دىئاگنوز سۆزلەشكۈسىنى كۆرسىتىدۇ"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+# CLI --help
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript  دەپ قاراپ ئىجرا قىلىدۇ"
 
-#: ../midori/main.c:103
+# CLI --help
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "كۆرسىتىلگەن URI نىڭ كۆرۈنۈشىنى ئالىدۇ"
 
-#: ../midori/main.c:105
+# CLI --help
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىلىدۇ"
 
-#: ../midori/main.c:107
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr ""
 "تاللانما -e/ --execute بىلەن بىرگە ئىجرا قىلغىلى بولىدىغان بۇيرۇقلارنى "
 "كۆرسىتىدۇ"
 
-#: ../midori/main.c:109
+# CLI --help
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "پروگرامما نەشرى كۆرسىتىدۇ"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "ئادرېسلار"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATTERN"
 
+# CLI --help
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr ""
 "مىدورى(Midori) ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا،  Midori نى ئەسلىگە "
 "قايتىدۇ"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:152
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:"
 
-#: ../midori/main.c:154
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:"
 
-#: ../midori/main.c:299
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "نامەلۇم خاتالىق كۆرۈلدى"
 
-#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "تاسادىپىي مەشغۇلات ‹%s›"
-
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5999
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "خەتكۈش(_B)"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "خەتكۈش قوش(_K)"
 
-#: ../midori/midori-app.c:1353
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "كېڭەيتمىلەر(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "ئىز(_H)"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Userscripts"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "ئىشلەتكۈچى ئۇسلۇبى(_S)"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "يېڭى بەتكۈچ(_T)"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "ئۇزىتىش(_T)"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape قىستۇرمىلىرى(_L)"
 
-#: ../midori/midori-app.c:1360
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "تاقالغان بەتكۈچلەر(_C)"
 
-#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5138
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "يېڭى كۆزنەك(_W)"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "يېڭى مۇندەرىجە(_F)"
 
-#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420
-#: ../midori/midori-app.c:1423
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[ئادرېسلار]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "فورماتى خاتا بولغان پۈتۈك."
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "فورماتى خاتا بولغان خەتكۈش."
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "يېزىش مەغلۇپ بولدى."
-
-#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5274
+# tooltip
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 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:344 ../midori/midori-browser.c:5282
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "كېيىنكى بالا بەتكە يۆتكىلىدۇ"
 
-#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5223
-#: ../midori/midori-browser.c:5232
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ"
 
-#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ"
 
-#: ../midori/midori-browser.c:509
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n"
 
-#: ../midori/midori-browser.c:604
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "قىممەت ‹%s› ئىناۋەتسىز (%s نىڭ قىممىتى)"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "ئويلىمىغان تەڭشەك ‹%s›"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "تاسادىپىي مەشغۇلات ‹%s›"
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (شەخسىي كۆرۈش)"
 
-#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "خەتكۈش"
 
-#: ../midori/midori-browser.c:810
-msgid "New folder"
-msgstr "يېڭى مۇندەرىجە"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:810
-msgid "Edit folder"
-msgstr "مۇندەرىجە تەھرىرلەيدۇ"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
 
-#: ../midori/midori-browser.c:812
-msgid "New bookmark"
-msgstr "يېڭى خەتكۈش"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:812
-msgid "Edit bookmark"
-msgstr "خەتكۈش تەھرىرلەش"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
 
-#: ../midori/midori-browser.c:846
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "خەتكۈشنىڭ ئاتىنى كىرگۈزۈپ ساقلايدىغان ئورۇننى كۆرسىتىپ بېرىدۇ."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:902
-msgid "Add to _Speed Dial"
-msgstr "تەز تېلېفون قىلىشنى قوش(_S)"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
 
-#: ../midori/midori-browser.c:908
-msgid "Show in the tool_bar"
-msgstr "قورال بالدىقىدا كۆرسەت(_B)"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
 
-#: ../midori/midori-browser.c:916
-msgid "Run as _web application"
-msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "تەز تېلېفون قىلىشنى قوش(_S)"
 
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "باشقا نامدا ساقلا"
 
-#: ../midori/midori-browser.c:1036
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "مۇناسىۋەتلىك مەنبەلەرنى ساقلا(_R)"
 
-#: ../midori/midori-browser.c:1265
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "يېڭى بىر كۆزنەك ئېچىلدى"
 
-#: ../midori/midori-browser.c:1268
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "يېڭى بەتكۈچ ئېچىلدى"
 
-#: ../midori/midori-browser.c:1285
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "مەزكۇر سۈرەتنى ئېچىشتا خاتالىق كۆرۈلدى!"
 
-#: ../midori/midori-browser.c:1286
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "تاللانغان سۈرەتنى كۆڭۈلدىكى كۆرگۈدە ئاچقىلى بولمىدى."
 
-#: ../midori/midori-browser.c:1292
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "مەزكۇر سۈرەتنى چۈشۈرۈشتە خاتالىق كۆرۈلدى!"
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "تاللانغان سۈرەتنى چۈشۈرگىلى بولمىدى."
 
-#: ../midori/midori-browser.c:1350
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "ھۆججەت ساقلا"
 
-#: ../midori/midori-browser.c:2318
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "غەملىمەيلا ھۆججەتنى قايتا ئوقۇسۇن"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "ھۆججەتنى ئاچ"
 
-#: ../midori/midori-browser.c:2444
+#: ../midori/midori-browser.c:2692
 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"
@@ -349,28 +393,29 @@ msgstr ""
 "يۇقىرىدىكى URI نى ئىشلىتىش ئۈچۈن خەۋەر ئوقۇغۇچ(news aggregator) نى ئېچىڭ. بۇ "
 "يەردە ئادەتتە «يېڭىدىن مۇشتەرى بولىمەن»، «يېڭى خەۋەر ئوقۇغۇچ» ياكى بولمىسا "
 "شۇنىڭغا يېقىن مەنىدىكى توپچا بار بولىدۇ.\n"
-"ياكى بولمىسا مىدورى(Midori) نىڭ مايىللىق دېگەن يېرىگە بېرىپ، خەۋەر ئوقۇغۇچ"
-"(news aggregator)نى تاللاڭ. شۇنىڭ بىلەن كېيىن قېتىم خەۋەر ئوقۇغۇچ "
+"ياكى بولمىسا مىدورى(Midori) نىڭ مايىللىق دېگەن يېرىگە بېرىپ، خەۋەر "
+"ئوقۇغۇچ(news aggregator)نى تاللاڭ. شۇنىڭ بىلەن كېيىن قېتىم خەۋەر ئوقۇغۇچ "
 "سىنبەلگىسىنى چەكسىڭىز، ئاپتوماتىك قوشۇلىدۇ."
 
-#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "يېڭى feed"
 
-#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5298
-#: ../panels/midori-bookmarks.c:527
+# tooltip
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "يېڭى خەتكۈش قوشىدۇ"
 
-#: ../midori/midori-browser.c:3017 ../midori/midori-searchaction.c:481
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "قۇرۇق"
 
-#: ../midori/midori-browser.c:3412 ../midori/midori-browser.c:3413
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "تېكىست نۇر بەلگىسى ئارقىلىق كۆرۈشكە ئۆزگەرت"
 
-#: ../midori/midori-browser.c:3415
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -378,111 +423,101 @@ msgstr ""
 "كۇنۇپكا F7 بېسىلسا نۇربەلگە بىلەن كۆرۈشكە ئۆزگىرىدۇ. ئاكتىپ ھالەتتە بارلىق "
 "تور بەتلىرىدە تېكىست نۇر بەلگىسى كۆرۈنىدۇ."
 
-#: ../midori/midori-browser.c:3418
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "نۇربەلگە بىلەن كۆرۈش ئىناۋەتلىك قىل(_R)"
 
-#: ../midori/midori-browser.c:3802 ../midori/midori-browser.c:5746
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/midori-browser.c:4128 ../panels/midori-bookmarks.c:840
-#: ../panels/midori-history.c:797
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)"
 
-#: ../midori/midori-browser.c:4135 ../panels/midori-bookmarks.c:846
-#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519
-msgid "Open in New _Tab"
-msgstr "يېڭى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-browser.c:4138 ../midori/midori-view.c:2637
-#: ../midori/midori-view.c:4435 ../panels/midori-bookmarks.c:848
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "يېڭى كۆزنەكتە ئاچ(_W)"
 
-#: ../midori/midori-browser.c:4227
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4228
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4229
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4230
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4231
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4232
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4233
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "مىدورى(Midori 0.2.6)"
 
-#: ../midori/midori-browser.c:4251
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "خەتكۈش ئىمپورت قىل…"
 
-#: ../midori/midori-browser.c:4254 ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "خەتكۈش ئىمپورت قىل(_I)"
 
-#: ../midori/midori-browser.c:4265
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "پروگرامما(_A):"
 
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "XBEL ياكى HTML دىن ئىمپورت قىلىش"
 
-#: ../midori/midori-browser.c:4358
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "ھۆججەتتىن ئىمپورت قىلىدۇ"
 
-#: ../midori/midori-browser.c:4370
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى"
 
-#: ../midori/midori-browser.c:4401
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL خەتكۈش"
 
-#: ../midori/midori-browser.c:4406
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape خەتكۈش"
 
-#: ../midori/midori-browser.c:4420
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr ""
 "مىدورى(Midori) پەقەتلا XBEL (*.xbel) ۋە Netscape (*.html) غا ئېكسپورت "
 "قىلالايدۇ"
 
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى"
 
-#: ../midori/midori-browser.c:4656
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "يېنىك ۋە ئەپچىل توركۆرگۈ."
 
-#: ../midori/midori-browser.c:4657
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "نەشر ئۇچۇرىنى about:version دىن كۆرۈڭ."
 
-#: ../midori/midori-browser.c:4659
+#: ../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 "
@@ -494,415 +529,440 @@ msgstr ""
 "ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ ئىككىنچى نەشرى ياكى يۇقىرى "
 "نەشرىنى ئىشلەتسىڭىز بولىدۇ."
 
-#: ../midori/midori-browser.c:4689
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "غەيرەت ت.كەنجى <gheyret@gmail.com>"
+msgstr ""
+"غەيرەت ت.كەنجى <gheyret@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Gheyret T.Kenji https://launchpad.net/~gheyretkenji\n"
+"  WebKit Team https://launchpad.net/~webkit-team"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "بەتكۈچنى تۇغدۇر(_D)"
 
-#: ../midori/midori-browser.c:5136
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: ../midori/midori-browser.c:5139
+# tooltip
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "يېڭى كۆزنەكتىن بىرنى ئاچىدۇ"
 
-#: ../midori/midori-browser.c:5142
+# tooltip
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "يېڭى بەتكۈچتىن بىرنى ئاچىدۇ"
 
-#: ../midori/midori-browser.c:5144
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى(_R)"
 
-#: ../midori/midori-browser.c:5148
+# tooltip
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "ھۆججەت ئاچىدۇ"
 
-#: ../midori/midori-browser.c:5150
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "بەتنى باشقا ئاتتا ساقلا(_S)…"
 
-#: ../midori/midori-browser.c:5151
+# tooltip
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "ھۆججەتكە ساقلايدۇ"
 
-#: ../midori/midori-browser.c:5153
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "تەز تېلېفون قىلىشنى قوش(_D)"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5157
-msgid "Create _Launcher"
-msgstr "ئىجراچى قۇر(_L)"
-
-#: ../midori/midori-browser.c:5160
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "خەۋەر feed غا مۇشتەرى بول(_F)"
 
-#: ../midori/midori-browser.c:5166
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "بەتكۈچنى تاقا(_C)"
 
-#: ../midori/midori-browser.c:5167
+# tooltip
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "ھازىرقى بەتكۈچنى تاقايدۇ"
 
-#: ../midori/midori-browser.c:5169
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "كۆزنەك تاقا(_L)"
 
-#: ../midori/midori-browser.c:5173
-msgid "_Share"
-msgstr "ھەمبەھىرلە(_S)"
-
-#: ../midori/midori-browser.c:5174
-msgid "Share this page"
-msgstr "مەزكۇر بەتنى ھەمبەھىرلە"
-
-#: ../midori/midori-browser.c:5178
+# tooltip
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "ھازىرقى بەتنى باسىدۇ"
 
-#: ../midori/midori-browser.c:5181
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "بارلىق كۆزنەكلەر تاقا(_L)"
 
-#: ../midori/midori-browser.c:5184
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "ئىزدە(_F)…"
 
-#: ../midori/midori-browser.c:5208
+# tooltip
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "كېيىنكىسىنى ئىزدە(_N)"
 
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "ئالدىنقىنى ئىزدە(_P)"
 
-#: ../midori/midori-browser.c:5217
+# tooltip
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "قورال بالدىقى(_T)"
 
-#: ../midori/midori-browser.c:5225
-msgid "Reload page without caching"
-msgstr "غەملىمەيلا ھۆججەتنى قايتا ئوقۇسۇن"
-
-#: ../midori/midori-browser.c:5235
+# tooltip
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى چوڭايتىدۇ"
 
-#: ../midori/midori-browser.c:5238
+# tooltip
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى كىچىكلىتىدۇ"
 
-#: ../midori/midori-browser.c:5242
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "كودلىشى(_E)"
 
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "مەنبەنى كۆرسەت(_U)"
 
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "نۇربەلگىسىدە كۆرۈش(_R)"
 
-#: ../midori/midori-browser.c:5251
+# tooltip
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "تولۇق ئېكران كۆرسىتىش/كۆرسەتمەسلىكنى ئالماشتۇرىدۇ"
 
-#: ../midori/midori-browser.c:5253
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "سولغا سىيرىل(_L)"
 
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "پەسكە سىيرىل(_D)"
 
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "ئۈستىگە سىيرىلىدۇ(_U)"
 
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "ئوڭغا سىيرىل(_R)"
 
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "ئوقۇغىلى بولىدۇ(_R)"
 
-#: ../midori/midori-browser.c:5268
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "يۆتكەل(_G)"
 
-#: ../midori/midori-browser.c:5271
+# tooltip
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "ئالدىنقى بەتكە قايتىدۇ"
 
+# tooltip
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "ئالدىنقى بالا بەتكە قايتىدۇ"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "ماكان بەت(_H)"
 
-#: ../midori/midori-browser.c:5288
+# tooltip
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "ئانا بەتكە يۆتكىلىدۇ"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "ئەخلەت ساندۇقىنى تازىلاش"
 
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)"
 
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "يېڭى مۇندەرىجە قوش(_F)"
 
-#: ../midori/midori-browser.c:5306
-msgid "_Export bookmarks"
-msgstr "خەتكۈشنى ئېكسپورت قىل(_E)"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5309 ../midori/midori-searchaction.c:490
-msgid "_Manage Search Engines"
-msgstr "ئىزدەش ماتورىنى باشقۇر(_M)"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5312
-msgid "_Clear Private Data"
-msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا(_C)"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "بەتنى تەكشۈر(_I)"
 
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "ئالدىنقى بەتكۈچ(_P)"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "كېيىنكى بەتكۈچ(_N)"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "تۇنجى ئورۇنغا Tab نى يۆتكە(_F)"
 
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "بەتكۈچنى كەينىگە يۆتكەش(_B)"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "بەتكۈچنى ئالدىغا يۆتكەش(_B)"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "ئەڭ ئاخىرقى ئورۇنغا Tab نى يۆتكە(_F)"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "كېيىنكى كۆرۈنۈشكە فوكۇسلان(_N)"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "پەقەت نۆۋەتتىكى بەتكۈچتىلا سىنبەلگىنى كۆرسەتسۇن(_C)"
 
-#: ../midori/midori-browser.c:5342
-msgid "_Duplicate Current Tab"
-msgstr "بەتكۈچنى تۇغدۇر(_D)"
-
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "باشقا بەتكۈچلەرنى تاقا(_H)"
 
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)"
 
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "كۆپ سورىلىدىغان سوئاللار(_F)"
 
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "كەمتۈك مەلۇم قىل(_R)"
 
-#: ../midori/midori-browser.c:5361 ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "قورال(_T)"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "تىزىملىك بالدىقى(_M)"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "يولچى بالدىقى(_N)"
 
-#: ../midori/midori-browser.c:5376
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "يان كۆزنەك(_P)"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "يان كۆزنەك"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "خەتكۈش بالدىقى(_B)"
 
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "ھالەت بالدىقى(_S)"
 
-#: ../midori/midori-browser.c:5393 ../midori/midori-websettings.c:200
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "ئۆزلۈكىدىن(_A)"
 
-#: ../midori/midori-browser.c:5396 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "مۇرەككەپ خەنزۇچە(BIG5)"
 
-#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:125
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "ئاددىيلاشتۇرۇلغان خەنزۇچە (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "ياپونچە (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "كورېيەچە(EUC-KR)"
 
-#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "رۇسچە(KOI8-R)"
 
-#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "يۇنىكود (UTF-8)"
 
-#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:130
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "غەربچە (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "ئىختىيارىي…"
 
-#: ../midori/midori-browser.c:5924
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "ئىزنى دەسلەپلەشتۈرۈش مەغلۇپ بولدى: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "ئايرىغۇ(_S)"
 
-#: ../midori/midori-browser.c:5931
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "ئورۇن(_L)…"
 
-#: ../midori/midori-browser.c:5933
+# tooltip
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ"
 
-#: ../midori/midori-browser.c:5955
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "توردىن ئىزدە(_W)…"
 
-#: ../midori/midori-browser.c:5957
+# tooltip
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "توردىن ئىزدەيدۇ"
 
-#: ../midori/midori-browser.c:5984
+# tooltip
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ"
 
-#: ../midori/midori-browser.c:6001
+# tooltip
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ"
 
-#: ../midori/midori-browser.c:6034
-msgid "_Window"
-msgstr "كۆزنەك(_W)"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
 
-#: ../midori/midori-browser.c:6036
+# tooltip
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ"
 
-#: ../midori/midori-browser.c:6050
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "تىزىملىك(_M)"
 
-#: ../midori/midori-browser.c:6052
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "تىزىملىك"
 
-#: ../midori/midori-browser.c:6832
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "ئويلىمىغان تەڭشەك ‹%s›"
-
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-locationaction.c:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "گۇۋاھنامىنى ئېكسپورت قىلىش"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "ئىمزالىق گۇۋاھنامە تارقاتقۇچى ئېنىق ئەمەس."
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
-msgstr "گۇۋاھنامە، ئۇنى قايتۇرۇپ ئالغان تورتۇرادىن كەلگىنى بىلەن بىردەك ئەمەس."
+msgstr ""
+"گۇۋاھنامە، ئۇنى قايتۇرۇپ ئالغان تورتۇرادىن كەلگىنى بىلەن بىردەك ئەمەس."
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "گۇۋاھنامىنىڭ ئاكتىپلاش ۋاقتى يەنىلا كەلگۈسى ھالەتتە."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "مەزكۇر ئىسپاتنامىنىڭ ۋاقتى ئۆتۈپ كېتىپتۇ"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -910,11 +970,11 @@ msgstr ""
 "گۇۋاھنامە GTlsConnection نىڭ يوق ئەمەلدىن قالدۇرۇش تىزىمىغا ئاساسەن ئەمەلدىن "
 "قالدۇرۇلدى."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "گۇۋاھنامىنىڭ ھېسابلاش ئۇسۇلى(algorithm) بىخەتەر ئەمەستەك قىلىدۇ."
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "ئىسپاتنامىنى دەلىللەۋاتقاندا بەزى خاتالىقلار كۆرۈلدى."
 
@@ -922,28 +982,28 @@ msgstr "ئىسپاتنامىنى دەلىللەۋاتقاندا بەزى خات
 msgid "_Export certificate"
 msgstr "گۇۋاھنامىنى ئېكسپورت قىل(_E)"
 
-#: ../midori/midori-locationaction.c:1434
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "ئۆزىنىڭ ئىمزاسى"
 
-#: ../midori/midori-locationaction.c:1468
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "بىخەتەرلىك تەپسىلاتلىرى"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1555
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "چاپلا ۋە داۋاملاشتۇر(_R)"
 
-#: ../midori/midori-locationaction.c:1787
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "تەھقىقلەنمىگەن"
 
-#: ../midori/midori-locationaction.c:1795
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "تەھقىقلەنگەن ۋە شىفىرلانغان باغلىنىش"
 
-#: ../midori/midori-locationaction.c:1802
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "ئوچۇق، شىفىرلانمىغان باغلىنىش"
 
@@ -960,458 +1020,471 @@ msgstr "كۆزنەكنى تاقا"
 msgid "Align sidepanel to the left"
 msgstr "يان كۆزنەكنى سول تەرەپكە ئورۇنلاشتۇرىدۇ"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "تېز تېلېفون قىلىشنى كۆرسەت"
 
-#: ../midori/midori-websettings.c:107
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "ماكان بەتنى كۆرسەت"
 
-#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:339
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچنى كۆرسەت"
 
-#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:338
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتنى قايتا ئوقۇماي كۆرسەت"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "ياپونچە (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "ئىختىيارىي…"
-
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "يېڭى بەتكۈچ"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "يېڭى كۆزنەك"
 
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "ھازىرقى بەتكۈچ"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "سىنبەلگىلەر"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "كىچىك سىنبەلگە"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "تېكىست"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "سىنبەلگە ۋە تېكىست"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "ۋاكالەتچى مۇلازىمېتىر يوق"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "خىروم(Chrome)"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:280
-msgid "Toolbar Style:"
-msgstr "قورال بالدىقىنىڭ ئۇسلۇبى:"
-
-#: ../midori/midori-websettings.c:281
+# tooltip
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ"
 
-#: ../midori/midori-websettings.c:290
-msgid "When Midori starts:"
-msgstr "مىدورى(Midori) قوزغالغاندا:"
-
-#: ../midori/midori-websettings.c:327
-msgid "Open new pages in:"
-msgstr "يېڭى بەت ئاچقاندا:"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:390
-msgid "Identify as"
-msgstr "تونۇتۇلىدۇ"
-
-#: ../midori/midori-websettings.c:391
-msgid "What to identify as to web pages"
-msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ"
-
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "ھەمىشە مەن تاللىغان خەت نۇسخىسىنى ئىشلەت"
 
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr ""
 "تور بەتلىرىدىكى خەت نۇسخىلىرىدىنمۇ بەكرەك ئىشلەتكۈچى تەڭشىكى ئابرۇيلۇق بولسۇن"
 
-#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-websettings.c:1360
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "قىممەت ‹%s› ئىناۋەتسىز (%s نىڭ قىممىتى)"
-
-#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "سەپلىمە قىممەت ‹%s› ئىناۋەتسىز"
 
-#: ../midori/midori-tab.vala:117
-#, fuzzy, c-format
+#: ../midori/midori-tab.vala:133
+#, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "بەتكۈچ ئەنىنى كۆرسەت(_L)"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "پەقەت بەتكۈچ سىنبەلگىسىنىلا كۆرسەت(_I)"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "باشقا بەتكۈچلەرنى تاقا(_H)"
 
-#: ../midori/midori-view.c:725 ../midori/midori-view.c:866
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "بۇ تورتۇراغا ئىشەن"
 
-#: ../midori/midori-view.c:864
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "بىخەتەرلىكى نامەلۇم"
 
-#: ../midori/midori-view.c:1162
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s نىڭ بىر HTML ساندىنىغا ساقلىغۇسى بار ئىكەن."
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "رەت قىل(_D)"
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "ئىجازەت(_A)"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s نىڭ ئورنىڭىزنى بىلگۈسى بار ئىكەن."
 
-#: ../midori/midori-view.c:1305
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "خاتالىق - %s"
+msgid "Oops - %s"
+msgstr ""
 
-#: ../midori/midori-view.c:1306
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "بەت ‹%s› نى ئوقۇغىلى بولمىدى."
+msgid "Something went wrong with '%s'."
+msgstr ""
 
-#: ../midori/midori-view.c:1308
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "قايتا سىناپ كۆر"
 
-#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2578
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "%s غا ئۇچۇر ئەۋەتىدۇ"
 
-#: ../midori/midori-view.c:2362
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "ئىزدەش ماتورى قوش(_S)…"
 
-#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2713
-msgid "Inspect _Element"
-msgstr "ئېلېمېنتلارنى تەكشۈر(_E)"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
 
-#: ../midori/midori-view.c:2457
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)"
 
-#: ../midori/midori-view.c:2461
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)"
 
-#: ../midori/midori-view.c:2462
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)"
 
-#: ../midori/midori-view.c:2465
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)"
 
-#: ../midori/midori-view.c:2468
-msgid "Open Link as Web A_pplication"
-msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)"
-
-#: ../midori/midori-view.c:2473
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)"
 
-#: ../midori/midori-view.c:2489
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)"
 
-#: ../midori/midori-view.c:2492
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "سۈرەتنى كۆچۈر(_I)"
 
-#: ../midori/midori-view.c:2495
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "سۈرەتنى ساقلا(_M)"
 
-#: ../midori/midori-view.c:2498
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "سۈرەت كۆرگۈدە ئاچ(_V)"
 
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "سىن ئادرېسىنى كۆچۈر(_A)"
 
-#: ../midori/midori-view.c:2508
-msgid "Save _Video"
-msgstr "سىننى ساقلا(_V)"
-
-#: ../midori/midori-view.c:2508
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "سىننى چۈشۈر(_V)"
 
-#: ../midori/midori-view.c:2534
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "ئىزدە(_W)"
 
-#: ../midori/midori-view.c:2566
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "توردا ئىزدە(_S)"
 
-#: ../midori/midori-view.c:2586
-msgid "Open Address in New _Tab"
-msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-view.c:2633
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "كاندۇكنى يېڭى بەتكۈچتە ئاچ(_F)"
 
-#: ../midori/midori-view.c:2845
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "ئېلېمېنتلارنى تەكشۈر(_E)"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "ھۆججەتنى %s دىن ئېچىش ياكى چۈشۈرۈش"
 
-#: ../midori/midori-view.c:2858
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "ھۆججەت ئاتى: ‹%s›"
 
-#: ../midori/midori-view.c:2863
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "ھۆججەت تىپى: ‹%s›"
 
-#: ../midori/midori-view.c:2865
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "ھۆججەت تىپى: %s (‹%s›)"
 
-#: ../midori/midori-view.c:2902
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "چوڭلۇقى: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2913
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "%s نى ئاچ"
 
-#: ../midori/midori-view.c:3439
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "بەتنى تەكشۈر - %s"
 
-#: ../midori/midori-view.c:3854
-#, c-format
-msgid "No documentation installed"
-msgstr "پۈتۈك ئورنىتىلمىغان"
-
-#: ../midori/midori-view.c:3930
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "مىدورى(Midori) ھېچقانداق شەخسىي ئۇچۇرلارنى ساقلىمايدۇ:"
 
-#: ../midori/midori-view.c:3931
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "ھېچقانداق ئىز ۋە cookies لار ساقلانمىغان."
 
-#: ../midori/midori-view.c:3932
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "كېڭەيتىلمىلەر چەكلەنگەن."
 
-#: ../midori/midori-view.c:3933
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "يەرلىك ساندان، HTML5 ساقلىغۇچى ۋە پروگرامما غەملىكى چەكلەنگەن."
 
-#: ../midori/midori-view.c:3934
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "مىدورى(Midori) تورتۇرالارنىڭ ئىشلەتكۈچىنى ئىزلىشىنى توسىدۇ:"
 
-#: ../midori/midori-view.c:3935
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "بۇنىڭدا «Referer» كومپيۇتېر ئاتىغا قىسقارتىلىۋېتىلىدۇ."
 
-#: ../midori/midori-view.c:3936
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "ئالدىن DNS تۇتۇش ئىنۋەتسىز قىلىنغان."
 
-#: ../midori/midori-view.c:3937
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "تىل ۋە ۋاقىت رايونى تورتۇراغا ئاشكارىلانمايدۇ."
 
-#: ../midori/midori-view.c:3938
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "بۇنىڭدا Flash ياكى Netscape قىستۇرمىلىرى تورتۇراغا خاتىرىلەنمەيدۇ."
 
-#: ../midori/midori-view.c:4017
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "تىرناق ئىچىدىكى نەشر نومۇرى، ئىجرا بولۇۋاتقاندا ئىشلىتىدىغان نەشر نومۇرىنى "
 "كۆرسىتىدۇ."
 
-#: ../midori/midori-view.c:4063
-msgid "Page loading delayed"
-msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
 
-#: ../midori/midori-view.c:4064
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى."
 
-#: ../midori/midori-view.c:4065
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "بەتنى ئوقۇش"
 
-#: ../midori/midori-view.c:4229
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "بوش بەت"
 
-#: ../midori/midori-view.c:4439
-msgid "_Duplicate Tab"
-msgstr "بەتكۈچنى تۇغدۇر(_D)"
-
-#: ../midori/midori-view.c:4444
-msgid "Show Tab _Label"
-msgstr "بەتكۈچ ئەنىنى كۆرسەت(_L)"
-
-#: ../midori/midori-view.c:4444
-msgid "Show Tab _Icon Only"
-msgstr "پەقەت بەتكۈچ سىنبەلگىسىنىلا كۆرسەت(_I)"
-
-#: ../midori/midori-view.c:4451
-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:5126
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "ئالدىنقى"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5145
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "كېيىنكى"
 
-#: ../midori/midori-view.c:5158
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "تەگ سۈرىتىنى بېسىپ چىقار"
 
-#: ../midori/midori-view.c:5159
+# tooltip
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ"
 
-#: ../midori/midori-view.c:5191
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "ئىقتىدار"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:54
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:70
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d سائەت"
 
-#: ../midori/midori-download.vala:71
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d مىنۇت"
 
-#: ../midori/midori-download.vala:72
+#: ../midori/midori-download.vala:77
 #, 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:87
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s قالدى"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:98
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "؟ب"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:100
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:197
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "چۈشۈرگەن ھۆججەتتە خاتالىقلار بار."
 
-#: ../midori/midori-download.vala:198
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1419,165 +1492,160 @@ msgstr ""
 "ئۇلانمىدا كۆرسىتىلگەن يىغما(checksum) بىلەن ماس كەلمىدى. بۇ ھۆججەت چالا ياكى "
 "ھۆججەت ئۆزگەرتىلگەن دېگەنلىكتۇر."
 
-#: ../midori/midori-download.vala:312
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "ھۆججەت «%s» نى بۇ مۇندەرىجىگە ساقلىغىلى بولمىدى."
 
-#: ../midori/midori-download.vala:314
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "بۇ ئورۇنغا يېزىش ئىمتىيازىڭىز يوق."
 
-#: ../midori/midori-download.vala:317
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "«%s» نى چۈشۈرۈشكە يېتەرلىك بوشلۇق يوق."
 
-#: ../midori/midori-download.vala:319
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "ھۆججەتكە %s كېرەك ئىدى، بىراق %s  لا بار ئىكەن."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "تېز تېلېفون قىلىش"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "تېزلەتمە ئادرېسىنى كىرگۈز"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "قوزغات"
 
-#: ../midori/midori-preferences.c:305
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "مىدورى(Midori) قوزغالغاندا:"
+
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "ماكان بەت:"
 
-#: ../midori/midori-preferences.c:313
+# tooltip
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "ھازىرقى بەتنى ئىشلىتىدۇ(_C)"
 
-#: ../midori/midori-preferences.c:317
+# tooltip
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "ھازىرقى بەتنى ماكان بەت قىلىدۇ"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "خەت نۇسخىسى"
 
-#: ../midori/midori-preferences.c:328
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "كەڭلىكى تەڭ بولمىغان خەت نۇسخىلىرى"
 
-#: ../midori/midori-preferences.c:332
+# tooltip
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت"
 
-#: ../midori/midori-preferences.c:335
+# tooltip
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى"
 
-#: ../midori/midori-preferences.c:337
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "تەڭ كەڭلىكتىكى فونت"
 
-#: ../midori/midori-preferences.c:341
+# tooltip
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت"
 
-#: ../midori/midori-preferences.c:344
+# tooltip
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى"
 
-#: ../midori/midori-preferences.c:346
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
 
-#: ../midori/midori-preferences.c:350
+# tooltip
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
 
-#: ../midori/midori-preferences.c:354
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "ئامراق كودلاش"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "ھەرىكىتى"
 
-#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە"
 
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك"
 
-#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "قوليازما(script) ئىناۋەتلىك"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "WebGL نى ئىناۋەتلىك قىل"
 
-#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت"
-
-#: ../midori/midori-preferences.c:393
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت"
 
-#: ../midori/midori-preferences.c:396
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىل"
 
-#: ../midori/midori-preferences.c:397
+# tooltip
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىلىدۇ"
 
-#: ../midori/midori-preferences.c:403
-msgid "Kinetic scrolling"
-msgstr "Kinetic سىيرىلىش"
-
-#: ../midori/midori-preferences.c:404
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ"
-
-#: ../midori/midori-preferences.c:409
-msgid "Middle click opens Selection"
-msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ"
-
-#: ../midori/midori-preferences.c:410
-msgid "Load an address from the selection via middle click"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
 msgstr ""
-"ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ"
 
-#: ../midori/midori-preferences.c:415
-msgid "Flash window on background tabs"
-msgstr "ئارقا تەرەپتە بەتكۈچلەر ئېچىلسا كۆزنەك چاقنىسۇن"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "ئامراق تىللار"
 
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1585,95 +1653,119 @@ msgstr ""
 "كۆپ تىللىق بەتلەرنى كۆرسەتكەندە ئالدىن ئويلىشىدىغان تىللارنىڭ تىزىملىكى. "
 "مەسىلەن \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:426
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "كۆز يۈگۈرت"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "قورال بالدىقىنىڭ ئۇسلۇبى:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "يېڭى بەت ئاچقاندا:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت"
 
-#: ../midori/midori-preferences.c:451
-msgid "Always Show Tabbar"
-msgstr "بەتكۈچ بالدىقىنى كۆرسەت"
-
-#: ../midori/midori-preferences.c:455
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ"
 
-#: ../midori/midori-preferences.c:456
-msgid "Whether to open new tabs next to the current tab or after the last one"
+# tooltip
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ"
 
-#: ../midori/midori-preferences.c:459
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "بەتكۈچنى ئارقىدا تۇرۇپ ئاچ"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "تېكىست تەھرىرلىگۈ"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "خەۋەر يىغقۇچ"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:475
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "تور"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "ۋاكالەتچى مۇلازىمېتىر"
 
-#: ../midori/midori-preferences.c:482
-msgid "Hostname"
-msgstr "مۇلازىمېتىر نامى"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
 
-#: ../midori/midori-preferences.c:490
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "ئېغىز"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "تور غەملىكى"
 
-#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "دىسكىدىكى غەملەنگەن بەتلەرنىڭ ئەڭ چوڭ چوڭلۇقى"
 
-#: ../midori/midori-preferences.c:507
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "م ب"
 
-#: ../midori/midori-preferences.c:526
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "تونۇتۇلىدۇ"
+
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "شەخسىيەت"
 
-#: ../midori/midori-preferences.c:528
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "بۇ ۋاقىتتىن كېيىن كونا Cookies ئۆچۈرسۇن:"
 
-#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533
+# tooltip
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
 
-#: ../midori/midori-preferences.c:537
+# tooltip
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "سىز زىيارەت قىلغان تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "ئۈچىنچى تەرەپ تورتۇراسىغا Cookies لارنى ئەۋەتىشنى توسۇن"
 
-#: ../midori/midori-preferences.c:543
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1681,121 +1773,127 @@ msgstr ""
 "كۇكى(Cookies) غا كىرىش ئۇچۇرلىرى، ئويۇنلارنىڭ سانلىق-مەلۇماتلىرى، ئېلانلاردا "
 "ئىشلىتىدىغان ئىشلەتكۈچىنىڭ profiles  قاتارلىقلار ساقلىنىدۇ."
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت"
 
-#: ../midori/midori-preferences.c:553
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "HTML5 يەرلىك ساقلىغۇچنى قوللا"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:557
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "تورتۇرالارغا ئەۋەتىلىدىغان پايدىلىنىشنىڭ تەپسىلاتلىرى چىقىرىۋېتىلسۇن"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "بۇنىڭدا «Referer» قېشى قىسقارتىلىۋېتىلىدۇ."
 
-#: ../midori/midori-preferences.c:562
+# tooltip
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "ئىزدىن بەتلەرنى بۇ ۋاقىتتىن كېيىن ئۆچۈرسۇن:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+# tooltip
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
 
-#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "كېڭەيتىلمىلەر"
 
-#: ../midori/midori-searchaction.c:1068
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "ئىزدەش ماتورىنى باشقۇر(_M)"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "ئىزدەش ماتورى قوش"
 
-#: ../midori/midori-searchaction.c:1068
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "ئىزدەش ماتورى تەھرىرلە"
 
-#: ../midori/midori-searchaction.c:1096
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "ئاتى(_N):"
 
-#: ../midori/midori-searchaction.c:1111
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "چۈشەندۈرۈش(_D):"
 
-#: ../midori/midori-searchaction.c:1124 ../extensions/feed-panel/main.c:376
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "ئادرېس(_A):"
 
-#: ../midori/midori-searchaction.c:1143
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "ماياق(_T):"
 
-#: ../midori/midori-searchaction.c:1441
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "ئىزدەش ماتورىنى باشقۇرۇش"
 
-#: ../midori/midori-searchaction.c:1541
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)"
 
-#: ../midori/midori-searchaction.c:1652
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n"
 
-#: ../midori/midori-searchaction.c:1707
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "ئىز"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "ئىزنى دەسلەپلەشتۈرۈش مەغلۇپ بولدى: %s"
+msgid "Search for %s"
+msgstr "%s نى ئىزدە"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "ئىزدىن تاللاش مەغلۇپ بولدى: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "%s نى ئىزدە"
-
-#: ../midori/midori-searchcompletion.vala:23
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "ئىزدە…"
 
-#: ../midori/midori-searchcompletion.vala:50
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "%s دا ئىزدە"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "بۇنىڭدا ئاچ"
 
-#: ../midori/sokoke.c:259
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "«%s» نى ئاچىدىغان پروگرامما ياكى بۇيرۇقنى تاللاڭ."
 
-#: ../midori/sokoke.c:374 ../midori/sokoke.c:388
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى"
 
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
@@ -1817,118 +1915,143 @@ msgstr "چوڭ كىچىكلىكىگە قارىسۇن"
 msgid "Close Findbar"
 msgstr "تېپىش بالدىقىنى تاقاش"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "ھۆججەت '<b>%s</b>' چۈشۈرۈلدى."
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "ئۇزىتىش تاماملاندى"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "ھەممىنى تازىلا"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
-msgid "Some files are being downloaded"
-msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:278
-msgid "_Quit Midori"
-msgstr "مىدورى(Midori) نى ئاخىرلاشتۇر(_Q)"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
 
-#: ../toolbars/midori-transferbar.c:280
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "مىدورى(Midori) ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ."
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n"
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "خەتكۈش يېڭىلاش مەغلۇپ بولدى: %s\n"
+msgid "%s and %s"
+msgstr ""
 
-#: ../panels/midori-bookmarks.c:535
+# tooltip
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "تاللانغان خەتكۈشنى تەھرىرلەيدۇ"
 
-#: ../panels/midori-bookmarks.c:543
+# tooltip
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "تاللانغان خەتكۈشنى ئۆچۈرىدۇ"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "يېڭى مۇندەرىجە قوش"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>ئايرىغۇچ</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "يېڭى بەتكۈچتە ئاچ(_T)"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1017
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "خەتكۈش ئىزدە"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "ئىز"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "بۈگۈن"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "تۈنۈگۈن"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن بۇرۇن"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "بىر ھەپتە بۇرۇن"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "بارلىق ئىزلارنى ئۆچۈرەمسىز؟"
 
-#: ../panels/midori-history.c:409
+# tooltip
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "تاللانغان ئىزنى خەتكۈچكە قوشىدۇ"
 
-#: ../panels/midori-history.c:418
+# tooltip
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "تاللانغان ئىزنى ئۆچۈرىدۇ"
 
-#: ../panels/midori-history.c:426
+# tooltip
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "بارلىق ئىزنى تازىلايدۇ"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:988
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "ئىزدەش ئىزلىرى"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "ئۇزاتقانلىرى"
-
-#: ../panels/midori-transfers.c:435
-msgid "Open Destination _Folder"
-msgstr "نىشان مۇندەرىجىنى ئاچ(_F)"
-
-#: ../panels/midori-transfers.c:438
-msgid "Copy Link Loc_ation"
-msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "دەلىللەش زۆرۈر"
@@ -1953,113 +2076,63 @@ msgstr "ئىم"
 msgid "_Remember password"
 msgstr "ئىمنى ئەستە تۇتۇۋال(_R)"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "ئات قويۇلغان سىنبەلگە ‹%s› نى ئوقۇغىلى بولمىدى"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "تەييار سىنبەلگە ‹%s› نى ئوقۇغىلى بولمىدى."
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "جانلاندۇرۇم كاندۇكى بۇزۇلغان"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "يوق"
 
-#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "خاسلىق ‹%s› ئىناۋەتسىز (%s نىڭ خاسلىقى)"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "ھۆججەت تاللا"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "مۇندەرىجە تاللا"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "يوق"
-
-#: ../katze/katze-utils.c:687
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "بىر سائەت"
 
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "بىر كۈن"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "بىر ھەپتە"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "بىر ئاي"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "بىر يىل"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s نى تەڭشىكى"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5-Checksum:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1-Checksum:"
 
-#: ../extensions/adblock.c:492
-msgid "Configure Advertisement filters"
-msgstr "ئېلان سۈزگۈچىنى تەڭشەش"
-
-#: ../extensions/adblock.c:523
-#, 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:937
-msgid "Edit rule"
-msgstr "تۇزۇم تەھرىرلە"
-
-#: ../extensions/adblock.c:951
-msgid "_Rule:"
-msgstr "تۇزۇم(_R):"
-
-#: ../extensions/adblock.c:1005
-msgid "Bl_ock image"
-msgstr "سۈرەتنى چەكلە(_O)"
-
-#: ../extensions/adblock.c:1010
-msgid "Bl_ock link"
-msgstr "ئۇلانمىنى چەكلە(_O)"
-
-#: ../extensions/adblock.c:1936
-msgid "Advertisement blocker"
-msgstr "ئېلان چەكلىگۈ"
-
-#: ../extensions/adblock.c:1937
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
 "مەزكۇر بەتتە ئىشلەتكۈچى قوليازما پروگراممىسى بار ئىكەن. ئورناتقۇڭىز بارمۇ؟"
 
@@ -2080,72 +2153,73 @@ msgstr "ئىشلەتكۈچى قوليازما پروگراممىسىنى ئور
 msgid "Don't install"
 msgstr "ئورناتما"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Userscripts"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "ئىشلەتكۈچى ئۇسلۇبى"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:128
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "خاتالىق"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "سىزنىڭ ‹%s› نى ئۆچۈرگۈڭىز بارمۇ؟"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "ئىشلەتكۈچى قوليازما پروگراممىسىنى ئۆچۈر"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "ئىشلەتكۈچى ئۇسلۇبىنى ئۆچۈر"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "ھۆججەت <b>%s</b> مەڭگۈلۈككە ئۆچۈرۈلىدۇ."
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "تېكىست تەھرىرلىگۈدە ئېچىش"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "نىشان مۇندەرىجىنى ئېچىش"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "يېڭى قوشۇلما قوش"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "تاللانغان قوشۇلمىنى ئۆچۈر"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "ئىشلەتكۈچى قوشۇلمىسى"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "قىسقۇچ ‹%s› نى كۆزەتكىلى بولمىدى: %s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr ""
 "ئىشلەتكۈچى قوليازمىسى(userscripts ۋە) ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "رەڭلىك بەتكۈچلەر"
 
-#: ../extensions/colorful-tabs.c:204
+# description
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرسەت"
 
@@ -2154,11 +2228,11 @@ msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرس
 msgid "Cookie Manager"
 msgstr "كۇكى(Cookie) باشقۇرغۇ"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "ھەممىنى ئۆچۈر…"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2166,31 +2240,34 @@ msgstr ""
 "كۆرۈنگەن ھەممە كۇكى(Cookie) نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، "
 "سۈزۈلگەننىلا ئۆچۈرىدۇ."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+# tooltip
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "ھەممىنى يايىدۇ"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+# tooltip
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "ھەممىنى قاتلايدۇ"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "ھەممە كۇكى(Cookie)نى راستلا ئۆچۈرەمسىز؟"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:574
+# Dialog title
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "سوئال"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "سۈزۈلگەن  كۇكى(Cookie) نىلا ئۆچۈرىدۇ."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "ئەڭگىمەنىڭ ئاخىرىغىچە"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2207,16 +2284,18 @@ msgstr ""
 "<b>بىخەتەر</b>: %s\n"
 "<b>مۇددىتى</b>: %s"
 
+# cookie: Secure flag is set.
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "ھەئە"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+# cookie: Secure flag isn't set.
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "ياق"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:699
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2225,22 +2304,25 @@ msgstr ""
 "<b>دائىرە</b>: %s\n"
 "<b>كۇكى(Cookie) سانى</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1022
+# Column name of cookie browser
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "ئاتى"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1074
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "ھەممىنى ياي(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1082
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "ھەممىنى قاتلا(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1134
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "ئاتى ياكى دائىرە بويىچە كۇكى(Cookie)لارنى ئىزدەش"
 
+# description
 #: ../extensions/cookie-manager/main.c:36
 msgid "List, view and delete cookies"
 msgstr "كۇكى(Cookie) نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ"
@@ -2257,24 +2339,38 @@ msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "بارلىق بەتكۈچنىڭ ئادرېسىنى چاپلاش تاختىسىغا كۆچۈرىدۇ"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "كېچىكتۈرۈپ ئوقۇش"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "بەتنى ئوقۇپ بولغۇچە كېچىكتۈرۈش ۋاقتى:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "بەتكۈچنى ئىشلەتكۈچە بەتنىڭ ئوقۇشىنى كېچىكتۈرىدۇ"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "ھۆججەتنى تۆۋەندىكى قىستۇرمىدا چۈشۈرۈۋاتقاندا خاتالىق كۆرۈلدى:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2301,38 +2397,38 @@ msgstr "بۇيرۇق:"
 msgid "Download files with \"%s\" or a custom command"
 msgstr "ھۆججەتلەرنى «%s» دا ياكى ئىختىيارى بىر چۈشۈرگۈچتە چۈشۈرسۇن"
 
-#: ../extensions/external-download-manager.vala:318
+#: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
 msgstr "سىرتقى چۈشۈرگۈچ - CommandLine"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "XML غا زۆرۈر بولغان Atom \"entry\" ئېلېمېنتى تېپىلمىدى."
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 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:378
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "يېڭىلانغان ۋاقتى: %s"
 
-#: ../extensions/feed-panel/feed-panel.c:644
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "فىدلار(Feeds)"
 
-#: ../extensions/feed-panel/feed-panel.c:697
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "يېڭى فىد(feed) قوش"
 
-#: ../extensions/feed-panel/feed-panel.c:704
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "فىد(feed) ئۆچۈر"
 
-#: ../extensions/feed-panel/feed-panel.c:784
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "فىدلار(_Feeds)"
 
@@ -2341,48 +2437,50 @@ msgstr "فىدلار(_Feeds)"
 msgid "Failed to find root element in feed XML data."
 msgstr "فىد(feed) XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "بۇ خىل فىد(feed) فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ"
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "XML فىد(feed) نى تەھلىل قىلىش مەغلۇپ بولدى: %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "RSS XML ئىچىدىن \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "RSS نىڭ بۇ نەشرىنى تېخى ئىشلىتەلمەيمەن"
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"item\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
+msgstr ""
+"XML ئىچىدىن زۆرۈر بولغان RSS \"item\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 "XML ئىچىدىن زۆرۈر بولغان RSS \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
 
-#: ../extensions/feed-panel/main.c:130
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "فىد(feed) ‹%s› مەۋجۇت"
 
-#: ../extensions/feed-panel/main.c:207
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "فىد(feed) ‹%s› نى ئوقۇشتا خاتالىق كۆرۈلدى"
 
-#: ../extensions/feed-panel/main.c:517
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "فىد(feed) كۆزنىكى"
 
-#: ../extensions/feed-panel/main.c:518
+# description
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Atom/RSS فىد(feed) نى ئوقۇۋاتىدۇ"
 
@@ -2403,410 +2501,1051 @@ msgstr ""
 "ئىم ساندانىنى ئېچىش ئۈچۈن\n"
 "ئاساسىي ئىم زۆرۈردۇر"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "بۇ بەتنىڭ ئىمنى ئەستە تۇتۇۋالسۇنمۇ(_R)"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "ئەستە تۇتۇۋالسۇن"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "ھازىر ئەمەس"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "بۇ بەتنىڭكىنى زادىلا ئەستە تۇتمىسۇن"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئالماشتۇرۇش"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr ""
 "نۆۋەتتىكى بەتكۈچنىڭ جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئاكتىپلايدۇ/ئاكتىپسىزلايدۇ"
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "سانداننى ئېچىش مەغلۇپ بولدى: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "ھەر بىر بەتكۈچنىڭ جەدۋەل(form) ئىزىنى پەقەت (Ctrl+Shift+F) ئارقىلىق "
 "ئاكتىپلىسۇن"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "جەدۋەل(form) ئىزى تولدۇرغۇ"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "جەدۋەل(form) كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "نامزاتنى تاللاش مەغلۇپ بولدى\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "زىيارەت قىلىنمىغان بەتكۈچ يوق"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "ئىز-تىزىم"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "بەتكۈچ يېپىلغاندا"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "ھېچ ئىش قىلما"
 
-#: ../extensions/history-list.vala:289
+# tooltip
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "ئەڭ ئاخىرى كۆرگەن بەتكۈچكە ئالمىشىدۇ"
 
-#: ../extensions/history-list.vala:295
+# tooltip
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "ئەڭ يېڭى بەتكۈچكە ئالمىشىدۇ"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "ئارقا تەرەپتە بەتكۈچلەر ئېچىلسا كۆزنەك چاقنىسۇن"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "كېيىنكى بەتكۈچ(ئىز تىزىمى)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "ئىزدىكى كېيىنكى يېڭى بەتكۈچ"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "ئالدىنقى يېڭى بەتكۈچ (ئىز تىزىمى)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "ئىزدىكى ئالدىنقى يېڭى بەتكۈچ"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "بەتكۈچنى ئارقىدا ئاچ(ئىز تىزىمى)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "نۆۋەتتە تاللانغان بەتكۈچنى ئارقىدا ئاچىدۇ"
 
-#: ../extensions/history-list.vala:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "ئىز تىزىمى"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "بەتكۈچلەر يېپىلغاندا ياكى ئالماشتۇرۇلغاندا ئەڭ ئاخىرقى قېتىم ئىشلىتىلگەن "
 "بەتكۈچكە يۆتكەلسۇن"
 
-#: ../extensions/mouse-gestures.c:297
-msgid "Mouse Gestures"
-msgstr "چاشقىنەك ئىشارىتى"
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
 
-#: ../extensions/mouse-gestures.c:298
-msgid "Control Midori by moving the mouse"
-msgstr "چاشقىنەك ھەرىكىتىدە مىدورى(Midori) نى باشقۇرىدۇ"
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
 
-#: ../extensions/shortcuts.c:109
-msgid "Reload page or stop loading"
-msgstr "بەتنى قايتا ئوقۇيدۇ ياكى ئوقۇشنى توختىتىدۇ"
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
 
-#: ../extensions/shortcuts.c:176
-msgid "Customize Keyboard shortcuts"
-msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر"
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
 
-#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "تېزلەتمىلەرنى ئۆزلەشتۈر(_O)…"
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
 
-#: ../extensions/shortcuts.c:320
-msgid "Shortcuts"
-msgstr "تېزلەتمىلەر"
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
 
-#: ../extensions/shortcuts.c:321
-msgid "View and edit keyboard shortcuts"
-msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ"
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/status-clock.c:177
-msgid "Statusbar Clock"
-msgstr "ھالەت بالداق سائىتى"
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
 
-#: ../extensions/status-clock.c:178
-msgid "Display date and time in the statusbar"
-msgstr "چېسلا ۋە ۋاقىتنى ھالەت بالداقتا كۆرسىتىدۇ"
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:152
-msgid "Images"
-msgstr "سۈرەتلەر"
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:162
-msgid "Scripts"
-msgstr "قوليازمىلار"
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:174
-msgid "Netscape plugins"
-msgstr "Netscape قىستۇرمىلىرى"
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
 
-#: ../extensions/statusbar-features.c:259
-msgid "Statusbar Features"
-msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى"
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
 
-#: ../extensions/statusbar-features.c:260
-msgid "Easily toggle features on web pages on and off"
-msgstr "تور بەتنىڭ ئىقتىدارىنى ئاسانلا ئىناۋەتلىك/ئىناۋەتسىز قىلىدۇ"
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
 
-#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673
-msgid "Tab Panel"
-msgstr "بەتكۈچ كۆزنەك"
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
 
-#: ../extensions/tab-panel.c:656
-msgid "T_ab Panel"
-msgstr "بەتكۈچ كۆزنەك(_A)"
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
 
-#: ../extensions/tab-panel.c:674
-msgid "Show tabs in a vertical panel"
-msgstr "بەتكۈچلەرنى تىك كۆزنەكتە كۆرسىتىدۇ"
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:76
-msgid "Only Icons on Tabs by default"
-msgstr "كۆڭۈلدە بەتكۈچلەرنىڭ سىنبەلگىسىلا"
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
 
-#: ../extensions/tabs-minimized.c:77
-msgid "New tabs have no label by default"
-msgstr "كۆڭۈلدە يېڭى بەتكۈچلەرنىڭ ئەنى كۆرسىتىلمەيدۇ"
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:395
-msgid "Customize Toolbar"
-msgstr "قورال ئىستونىنى ئۆزلەشتۈرۈش"
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:411
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
 msgstr ""
-"قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ "
-"تاشلاپ ئۆزگەرتىشكە بولىدۇ"
 
-#: ../extensions/toolbar-editor.c:427
-msgid "Available Items"
-msgstr "بار تۈرلەر"
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:448
-msgid "Displayed Items"
-msgstr "كۆرسىتىدىغان تۈرلەر"
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:588
-msgid "_Customize Toolbar…"
-msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_C)…"
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:617
-msgid "Toolbar Editor"
-msgstr "قورال بالدىقى تەھرىرلىگۈ"
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
 
-#: ../extensions/toolbar-editor.c:618
-msgid "Easily edit the toolbar layout"
-msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ"
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ"
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
 
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "cookie لارنى ئوقۇش مەغلۇپ بولدى\n"
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
 
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr "چاشقىنەك ئىشارىتى"
+
+# description
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr "چاشقىنەك ھەرىكىتىدە مىدورى(Midori) نى باشقۇرىدۇ"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "بەتنى قايتا ئوقۇيدۇ ياكى ئوقۇشنى توختىتىدۇ"
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر"
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr "تېزلەتمىلەر"
+
+# description
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ"
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr "ھالەت بالداق سائىتى"
+
+#: ../extensions/status-clock.c:169
+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:177
+msgid "Enable 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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr "بەتكۈچ كۆزنەك"
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr "بەتكۈچ كۆزنەك(_A)"
+
+# description
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr "قورال ئىستونىنى ئۆزلەشتۈرۈش"
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ "
+"تاشلاپ ئۆزگەرتىشكە بولىدۇ"
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr "بار تۈرلەر"
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr "كۆرسىتىدىغان تۈرلەر"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_C)…"
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr "قورال بالدىقى تەھرىرلىگۈ"
+
+# description
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ"
+
+# Dialog title
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلايدۇ"
 
-#: ../midori/midori-privatedata.c:124
+# Button label
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "شەخسىي سانلىق-مەلۇماتلار تازىلا(_C)"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "تۆۋەندىكى سانلىق-مەلۇماتلارنى تازىلا:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچلەر"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr ""
 "مىدورى(Midori) نى ئاخىرلاشقاندا شەخسىي سانلىق-مەلۇماتلار تازىلانسۇن(_Q)"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:298
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "ساقلانغان كىرىشلەر ۋە ئىملار(_P)"
 
-#: ../midori/midori-privatedata.c:300
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Cookies ۋە تورتۇرا سانلىق-مەلۇماتلىرى"
 
-#: ../midori/midori-privatedata.c:307
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "تورتۇرا سىنبەلگىسى"
 
 #: ../midori/midori-viewcompletion.vala:18
-#, fuzzy
 msgid "Open tabs"
-msgstr "%s نى ئاچ"
+msgstr ""
 
-#: ../midori/midori-viewcompletion.vala:67
-#, fuzzy
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
-msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچلەر"
+msgstr ""
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "ئىزنى تازىلاش مەغلۇپ بولدى: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "كونا ئىزلارنى ئۆچۈرۈش مەغلۇپ بولدى: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "كونا db غا قېتىلىش مەغلۇپ بولدى"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "كونا سانداندىن ئىمپورت قىلىش مەغلۇپ بولدى"
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n"
 
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
 msgstr ""
 
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "ئايرىلىش مەغلۇپ بولدى"
-
-#: ../midori/midori-bookmarks.c:259
-#, fuzzy, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "خەتكۈش يېڭىلاش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "كونا سانداندىن ئىمپورت قىلغىلى بولمىدى: %s\n"
-
-#: ../midori/midori-bookmarks.c:311
-#, fuzzy, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
 
-#: ../midori/midori-session.c:187
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "ئالىي ئىشلەتكۈچى ئىسپاتنامە ھۆججىتى يوق. SSL ئىسپاتنامىسىنى دەلىللىگىلى "
 "بولمايدۇ."
 
-#: ../midori/midori-session.c:355
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s"
 
-#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:448
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/midori-session.c:406
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:126
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s"
 
-#: ../midori/midori-frontend.c:309
+#: ../midori/midori-frontend.c:335
+#, c-format
 msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
+"Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"مىدورى(Midori) ئالدىنقى قېتىم قوزغىتىلغاندا غۇلاپ كەتكەندەك قىلىدۇ. بۇ يەنە "
-"تەكرارلانسا تۆۋەندىكى تاللانمىلارنى تاللاپ كۆرۈپ بېقىڭ."
 
-#: ../midori/midori-frontend.c:319
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "تەڭشەكنى ئۆزگەرت(_P)"
 
-#: ../midori/midori-frontend.c:323
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "بارلىق كېڭەيتمىنى چەكلە(_E)"
 
-#: ../midori/midori-frontend.c:332
+# tooltip
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "مىدورى(Midori)  غۇلاپ كېتىپ، قايتا قوزغالغاندا كۆزنەك كۆرسىتىدۇ"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "كونا بەتكۈچلەرنى تاشلىۋەت"
 
-#: ../midori/midori-frontend.c:400
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "مىدورى(Midori)نىڭ ئۈلگىسى ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n"
 
-#: ../midori/midori-frontend.c:433
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "خەتكۈشنى ئوقۇغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-frontend.c:464
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-frontend.c:472
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n"
 
-#: ../midori/midori-frontend.c:483
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:"
 
-#: ../midori/midori-frontend.c:488
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "پەرۋا قىلما(_I)"
 
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "ئېكراندىكى ئاگاھلاندۇرۇشلارنى FILENAME غا يوللايدۇ"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "ئىجراچى قۇر(_L)"
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
 
-#~ msgid "FILENAME"
-#~ msgstr "FILENAME"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "ئۇزاتقانلىرى"
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "ھەممىنى تازىلا"
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "نىشان مۇندەرىجىنى ئاچ(_F)"
 
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "ئۈستەلئۈستىگە تېزلەتمە قوش(_D)"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)"
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "ھۆججەت '<b>%s</b>' چۈشۈرۈلدى."
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "ئۇزىتىش تاماملاندى"
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ"
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "مىدورى(Midori) نى ئاخىرلاشتۇر(_Q)"
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "مىدورى(Midori) ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ."
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "ئېلان چەكلىگۈ"
+
+# description
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "سۈزگۈچ تىزىملىكىگە ئاساسەن ئېلاننى چەكلەيدۇ"
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "ئېلان سۈزگۈچىنى تەڭشەش"
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "سۈرەتنى چەكلە(_O)"
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "ئۇلانمىنى چەكلە(_O)"
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "تۇزۇم تەھرىرلە"
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "تۇزۇم(_R):"
index ed7ab14dd2eb8c848f254670ed636e5a2ddc88fa..1f29dd9442d8a968c4f4e52dd276ef2caefbf6cb 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
 # Ukrainian translation for midori package.
 # Copyright (C) 2010 THE midori'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the midori package.
-# 
-# 
+#
+#
 # Yarema aka Knedlyk <yupadmin@gmail.com> 2010, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: midori svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-28 08:21+0000\n"
-"PO-Revision-Date: 2012-11-11 19:55+0200\n"
-"Last-Translator: Pavlo Bilyak <jpavlo11@ukr.net>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-12-28 13:38+0000\n"
+"Last-Translator: Ksenia Dylova <ksjenka@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\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-Launchpad-Export-Date: 2014-12-29 05:45+0000\n"
+"X-Generator: Launchpad (build 17286)\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"
-"X-Generator: Poedit 1.5.4\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:162
-#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228
-#: ../midori/midori-view.c:4069
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Мідорі"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Веб-переглядач"
+
+#: ../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 "New Private Browsing Window"
-msgstr "Нове вікно в режимі приватності"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "Нова вкладка"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "Нове вікно"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "Ð\9fеÑ\80еглÑ\8fдаÑ\87 Ð\92еб"
+msgid "New Private Browsing Window"
+msgstr "Ð\9dове Ð²Ñ\96кно Ð² Ñ\80ежимÑ\96 Ð¿Ñ\80иваÑ\82ноÑ\81Ñ\82Ñ\96"
 
 #: ../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:4412
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "Режим приватності"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Відкрити нове вікно перегляду в режимі приватності"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "Знімок екрану збережено до: %s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "Запустити АДРЕСУ як веб-додаток"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "АДРЕСА"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "Використайте ТЕКУ як теку конфігурації"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "ТЕКА"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "Захищений перегляд, жодні зміни не записуються"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "Портативний режим, всі файли запуску збережено в одному місці"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "Звичайне GTK+ вікно з WebKit, аналогічно до GtkLauncher"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "Показати діалог діагностики"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "Запустити з gdb і зберегти вивід крешу"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "Виконати визначений файл як джава-скрипт"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "Зробити знімок вибраної сторінки/адреси"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "Виконати вибрану команду"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "Список можливих команд для запуску з -e/ --execute"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "Відобразити версію програми"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "Блокувати URI згідно з регулярним виразом PATTERN"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
-msgstr "PATTERN"
+msgstr "ШАБЛОН"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "Зареєструвати Midori після СЕКУНД неактивності"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "СЕКУНД"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "Помилка: \"gdb\" неможливо знайти\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "Перевірити на наявність нової версії на:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "Сталася невідома помилка"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "_Закладки"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "_Додати закладку"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "_Розширення"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "_Історія"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "_Скрипти користувача"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "Стилі користувача"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "Нова _вкладка"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "_Завантаження"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Роз_ширення Netscape"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "_Закриті вкладки"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "_Нове вікно"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "Нова _тека"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[Адреси]"
 
@@ -230,134 +231,146 @@ msgstr "Неправильний документ."
 msgid "Unrecognized bookmark format."
 msgstr "Нерозпізнаний формат закладки."
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "Перейти до наступної сторінки"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "Перейти до наступної сторінки"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "Пошук у Веб…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "Оновити поточну сторінку"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "Зупинити завантаження поточної сторінки"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "Невдача при оновленні назви: %s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Значення '%s' є неправильним для %s"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Несподівані властивості '%s'"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Несподівана дія '%s'."
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (Режим приватності)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Неможливо вставити новий об'єкт історії: %s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "Вибрати [текст]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "Ð\9dова Ñ\82ека"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "Ð\9dовий ÐºÐ°Ñ\82алог"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
-msgstr "Редагувати теку"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr "Редагувати папку"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
-msgstr "Ð\9dова Ð·акладка"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "Ð\9dова Ð\97акладка"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "Редагувати закладку"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "Ð\9dапиÑ\88Ñ\96Ñ\82Ñ\8c Ð½Ð°Ð·Ð²Ñ\83 Ð´Ð»Ñ\8f Ñ\86Ñ\96Ñ\94Ñ\97 Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ñ\96 Ð²Ð¸Ð±ÐµÑ\80Ñ\96Ñ\82Ñ\8c Ð´Ðµ Ñ\97Ñ\97 Ð·Ð±ÐµÑ\80егÑ\82и."
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "Ð\92ведÑ\96Ñ\82Ñ\8c Ð½Ð°Ð·Ð²Ñ\83 Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ñ\82а Ð¾Ð±ÐµÑ\80Ñ\96Ñ\82Ñ\8c Ð¼Ñ\96Ñ\81Ñ\86е Ñ\97Ñ\97 Ð·Ð±ÐµÑ\80еженнÑ\8f"
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "Ð\94одаÑ\82и Ð´Ð¾ Ñ\88ви_дкого Ð²Ð¸ÐºÐ»Ð¸ÐºÑ\83"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "Ð\92ведÑ\96Ñ\82Ñ\8c Ð½Ð°Ð·Ð²Ñ\83 Ð¿Ð°Ð¿ÐºÐ¸ Ñ\82а Ð¾Ð±ÐµÑ\80Ñ\96Ñ\82Ñ\8c Ð¼Ñ\96Ñ\81Ñ\86е Ñ\97Ñ\97 Ð·Ð±ÐµÑ\80еженнÑ\8f"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "Показати в панелі інструментів"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "Показати в панелі закладок"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "Ð\97апÑ\83Ñ\81Ñ\82иÑ\82и Ñ\8fк Ð²ÐµÐ±-додаÑ\82ок"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Ð\94одаÑ\82и Ð´Ð¾ Ñ\88ви_дкого Ð²Ð¸ÐºÐ»Ð¸ÐºÑ\83"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "Зберегти файл як"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "Показати пов’язані _ресурси"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "Відкрито нове вікно"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "Відкрито нову вкладку"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "Помилка відкривання малюнка!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "Неможливо відкрити вибраний малюнок в типовому переглядачі."
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "Помилка звантаження малюнка!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "Неможливо звантажити вибраний малюнок."
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "Зберегти файл"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "Перезавантажити сторінку без кешування"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 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"
@@ -372,31 +385,24 @@ msgstr ""
 "Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то "
 "вони будуть додані автоматично."
 
-#: ../midori/midori-browser.c:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "Нова стрічка новин"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "Додати нову закладку"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "Поділитись цією сторінкою"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "Пусто"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "Переключити текстовий курсор навігації"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
@@ -404,109 +410,99 @@ msgstr ""
 "Натискання F7 включає курсорний перегляд. Після включення на всіх веб-"
 "сторінках появляється текстовий курсор."
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "_Включення курсорного перегляду"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Неможливо вставити новий об'єкт історії: %s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "Відкрити все у в_кладках"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "Відкрити у новій _вкладці"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2932
-#: ../midori/midori-view.c:4888 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "Відкрити у новому _вікні"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Мідорі 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "Імпорт закладок…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "_Імпорт закладок"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "_Програма:"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "Імпорт з XBEL або HTML файлу"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "Імпорт з файлу"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "Не вдалося імпортувати закладки"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL Закладки"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Закладки Netscape"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Мідорі може експортувати тільки до XBEL (*.xbel) і Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "Не вдалося експортувати закладки"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "Легкий переглядач Веб."
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "Дивіться about:version для отримання інформації про версію."
 
-#: ../midori/midori-browser.c:4764
+#: ../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 "
@@ -519,366 +515,396 @@ msgstr ""
 "Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою "
 "версією."
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
-msgstr "Yarema aka Knedlyk <yupadmin@gmail.com>"
+msgstr ""
+"Yarema aka Knedlyk <yupadmin@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Andre https://launchpad.net/~chipqq1\n"
+"  Andrij Mizyk https://launchpad.net/~andmizyk\n"
+"  Andy Karaushu https://launchpad.net/~karandriy\n"
+"  IxI_JOKER_IxI https://launchpad.net/~vovan-bax-m\n"
+"  Klimenko Mikola https://launchpad.net/~kolyaklimenko\n"
+"  Knedlyk https://launchpad.net/~yupadmin\n"
+"  Ksenia Dylova https://launchpad.net/~ksjenka\n"
+"  Max_ym https://launchpad.net/~kontact-cat\n"
+"  Pavlo Bilyak https://launchpad.net/~pavlo1997\n"
+"  Scald_Scalmold https://launchpad.net/~14gainward88\n"
+"  Sergey Kostyuk https://launchpad.net/~ks-hot-ua\n"
+"  Serhiy Filatov https://launchpad.net/~sf-pfil\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  sawka6600 https://launchpad.net/~sawik87"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "_Дублювати поточну вкладку"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "_Файл"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "Відкрити нове вікно"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "Відкрити нову вкладку"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "Нове _вікно в режимі приватності"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "Відкрити файл"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "_Зберегти сторінку як…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "Зберегти в файл"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "Додати до шви_дкого виклику"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "Підписатися на _стрічки новин"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "_Закрити вкладку"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "Закрити поточну вкладку"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "З_акрити вікно"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "_Поділитися"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "Надрукувати поточну сторінку"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "З_акрити всі вікна"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "_Знайти…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "Шукати слово чи фразу на сторінці"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "Шукати _наступне"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "Шукати _попереднє"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "Налаштувати властивості програми"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "_Вигляд"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "Панелі _Інструментів"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "Перезавантажити сторінку без кешування"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "Збільшити розмір перегляду"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "Зменшити розмір перегляду"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "_Кодування"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "Перегляд _коду"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "Переглянути DOM-джерело"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "_Перегляд вставками"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "Перемкнути в повноекранний режим"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "Прокрутити _ліворуч"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "Прокрутити в_низ"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "Прокрутити в_верх"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "Прокрутити _праворуч"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "_Можна читати"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "_Перейти"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "Повернутись на попередню сторінку"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "Повернутись на попередню суб-сторінку"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "Вперед або Назад"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "Перейти до наступної вкладки або до наступної сторінки у історії"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "Д_омашня сторінка"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "Перейти на домашню сторінку"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "Спорожнити смітник"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "Повернути закриту вкладку"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "Додати нову _теку"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "_Експорт закладок"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "Імпортувати закладки..."
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "_Налаштувати пошукові машини"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "Експортувати закладки"
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "_Очистити приватні дані"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "Змінити пошукові системи..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "_Очистити приватні дані..."
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "Перевірити сторінку"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "_Попередня вкладка"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "_Наступна вкладка"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "Пересунути вкладку на _першу позицію"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "_Перенести вкладку назад"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "_Перенести вкладку вперед"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "Пересунути вкладку на _останню позицію"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "Фокусувати поточну вкладку"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "Фокусувати перегляд _наступного"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "Показувати тільки іконку _поточної вкладки"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "_Дублювати поточну вкладку"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "_Закрити інші вкладки"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "Відкрити останню _сесію"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "_Допомога"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "_Часті запитання"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "П_овідомити про проблему…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "_Інструменти"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "Панель _меню"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "Панель _навігації"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "_Бічна панель"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "Бічна панель"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "Панель _закладок"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "Панель _стану"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "_Автоматично"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "Китайська Традиційна (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "Китайська Спрощена (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "Японська (SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "Російська (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Юнікод (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "Західний (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "Інша…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "Невдача при ініціалізації історії: %s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "_Роздільник"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "_Адреса…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "Відкрити певну адресу"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "_Пошук у Веб…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "Запустити пошук у Веб"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "Знову відкрити закриту вкладку чи вікно"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "Показати збережені закладки"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "_Вкладки"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "Показати список відкритих вкладок"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "_Меню"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "Меню"
 
@@ -887,35 +913,35 @@ msgstr "Меню"
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "Неможливо завантажити конфігурацію розширення '%s': %s\n"
 
-#: ../midori/midori-extension.c:880 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "Неможливо зберегти конфігурацію розширення '%s': %s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "Експортувати сертифікат"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "Підпис сертифікату невідомий."
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr ""
 "Сертифікат не відповідає очікуваному сертифікату, який отриманий з сторінки."
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "Час активації сертифікату все ще у майбутньому."
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "Термін дії сертифіката закінчився"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
@@ -923,40 +949,40 @@ msgstr ""
 "Сертифікат був анульований згідно зі списком відкликаних сертифікатів "
 "GTlsConnection"
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгоритм сертифікату вважається небезпечним."
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "Інші помилки появилися під час перевірки сертифікату."
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "_Експортувати сертифікат"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "Самопідписаний"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "Відомості про захист"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "Вставити і про_довжити"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "Не перевірено"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "Перевірене і захищене з'єднання"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "Відкрите, незахищене з'єднання"
 
@@ -973,421 +999,437 @@ msgstr "Закрити панель"
 msgid "Align sidepanel to the left"
 msgstr "Рівняти бічну панель по лівому краю"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "Показати швидкий виклик"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "Показати домашню сторінку"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "Показати останні відкриті вкладки"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "Показати останні вкладки без завантаження"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "Показати порожню сторінку"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "Показати типову пошукову машину"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "Показати користувацьку сторінку"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Японська (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "Нова вкладка"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "Нове вікно"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "Поточна вкладка"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "Типово"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "Значки"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "Маленькі значки"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "Текст"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "Значки і текст"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "Текст за значками"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "Автоматично (GNOME або змінні оточення)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "Сервер HTTP проксі"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "Немає сервера проксі"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "Стиль панелі"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "Завжди використовувати мій вибір шрифтів"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "Неможливо завантажити конфігурацію: %s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Неправильне значення конфігурації '%s'"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "Невдача при ініціалізації стилів: %s"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:986
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "Показати мітку _вкладки"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "Показати тільки _іконки вкладки"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "Закрити вкладку _праворуч"
+msgstr[1] "Закрити вкладки _праворуч"
+msgstr[2] "Закрити вкладки _праворуч"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Закрити _іншу вкладку"
+msgstr[1] "Закрити _інші вкладки"
+msgstr[2] "Закрити _інші вкладки"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "Довіряти цій веб-сторінці"
 
-#: ../midori/midori-view.c:984
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "Захист невідомий"
 
-#: ../midori/midori-view.c:1336
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s бажає зберегти базу даних HTML5."
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "_Заборонити"
 
-#: ../midori/midori-view.c:1340 ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "_Дозволити"
 
-#: ../midori/midori-view.c:1368
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s бажає знати Ваше знаходження."
 
-#: ../midori/midori-view.c:1499
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "Ð\9fомилка - %s"
+msgid "'%s' can't be found"
+msgstr "Ð\9dеможливо Ð·Ð½Ð°Ð¹Ñ\82и '%s'"
 
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "СÑ\82оÑ\80Ñ\96нкÑ\83 '%s' Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ\82ажиÑ\82и."
+msgid "The page '%s' couldn't be loaded:"
+msgstr "Ð\9dеможливо Ð·Ð°Ð²Ð°Ð½Ñ\82ажиÑ\82и Ð½Ð°Ñ\81Ñ\82Ñ\83пнÑ\83 Ñ\81Ñ\82оÑ\80Ñ\96нкÑ\83 '%s'"
 
-#: ../midori/midori-view.c:1502 ../midori/midori-view.c:1646
-msgid "Try again"
-msgstr "Спробуйте знову"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "Перевірити адресу на помилки"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+"Переконайтеся, що під’єднано ethernet-кабель або активовано карту "
+"бездротової мережі."
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "Перевірте правильність налаштувань мережі"
 
-#: ../midori/midori-view.c:1643
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "Спробувати знову"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "Ой - %s"
 
-#: ../midori/midori-view.c:1644
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "Щось пішло не так з '%s'."
 
-#: ../midori/midori-view.c:1791 ../midori/midori-view.c:2873
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "Спробуйте знову"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "Послати повідомлення до %s"
 
-#: ../midori/midori-view.c:2658
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "Додати _пошукову машину"
 
-#: ../midori/midori-view.c:2701 ../midori/midori-view.c:3005
-msgid "Inspect _Element"
-msgstr "Ð\9fеÑ\80евÑ\96Ñ\80иÑ\82и _елеменÑ\82"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "Ð\92Ñ\96дкÑ\80иÑ\82и _поÑ\81иланнÑ\8f"
 
-#: ../midori/midori-view.c:2753
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "Відкрити посилання у новій в_кладці"
 
-#: ../midori/midori-view.c:2757
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "Відкривати посилання у в_кладці переднього плану"
 
-#: ../midori/midori-view.c:2758
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "Відкрити посилання у фоновій в_кладці"
 
-#: ../midori/midori-view.c:2761
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "Відкрити посилання у новому _вікні"
 
-#: ../midori/midori-view.c:2764
-msgid "Open Link as Web A_pplication"
-msgstr "Відкрити посилання як веб-_додаток"
-
-#: ../midori/midori-view.c:2769
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "Копіювати поси_лання"
 
-#: ../midori/midori-view.c:2775
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "_Зберегти як…"
 
-#: ../midori/midori-view.c:2785
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "Відкрити малюнок у новому _вікні"
 
-#: ../midori/midori-view.c:2786
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "Відкрити зображення у новій _вкладці"
 
-#: ../midori/midori-view.c:2790
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "Копіювати _картинку"
 
-#: ../midori/midori-view.c:2793
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "Зберегти з_ображення"
 
-#: ../midori/midori-view.c:2796
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "Відкрити малюнок в _Переглядачі зображень"
 
-#: ../midori/midori-view.c:2803
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "Скопіювати адресу _відео"
 
-#: ../midori/midori-view.c:2806
-msgid "Save _Video"
-msgstr "Зберегти _відео"
-
-#: ../midori/midori-view.c:2806
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "Завантажити _відео"
 
-#: ../midori/midori-view.c:2832
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "Відкрити адресу у новій _вкладці"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "Шукати _з"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "_Шукати Веб"
 
-#: ../midori/midori-view.c:2881
-msgid "Open Address in New _Tab"
-msgstr "Відкрити адресу у новій _вкладці"
-
-#: ../midori/midori-view.c:2928
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "Відкрити _фрейм у новій _вкладці"
 
-#: ../midori/midori-view.c:3149
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "Перевірити _елемент"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "Відкрити або завантажити файл з %s"
 
-#: ../midori/midori-view.c:3163 ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "Ім'я файлу: %s"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "Тип файлу: '%s'"
 
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "Тип файлу: %s ('%s')"
 
-#: ../midori/midori-view.c:3212
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3225 ../midori/midori-view.c:3227
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "Відкрити %s"
 
-#: ../midori/midori-view.c:3773
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Перевірка сторінки - %s"
 
-#: ../midori/midori-view.c:4337
-#, c-format
-msgid "No documentation installed"
-msgstr "Документація не встановлена"
-
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Мідорі не зберігає жодні персональні дані:"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "Історія і тістечка зберігаються."
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "Додатки виключено."
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "Сховище HTML5, локальна база даних і кеш програм виключено."
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Мідорі забороняє веб-сторінкам відслідковувати користувача:"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "URL реферера обмежується до назви вузла."
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "Попереднє отримання DNS виключено."
 
-#: ../midori/midori-view.c:4420
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "Мова і часовий пояс не показуються веб-сторінкам."
 
-#: ../midori/midori-view.c:4421
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Flash та інші додатки Netscape не можуть бути показані веб-сторінкам."
+msgstr ""
+"Flash та інші додатки Netscape не можуть бути показані веб-сторінкам."
 
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr ""
 "Номери версії в дужках показують версію, що використовується в робочому "
 "процесі."
 
-#: ../midori/midori-view.c:4511
-msgid "Page loading delayed"
-msgstr "Ð\97аванÑ\82аженнÑ\8f Ñ\81Ñ\82оÑ\80Ñ\96нки Ð·Ð°Ñ\82Ñ\80имане"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "Ð\97аванÑ\82аженнÑ\8f Ñ\81Ñ\82оÑ\80Ñ\96нки Ð¿Ñ\80изÑ\83пинено"
 
-#: ../midori/midori-view.c:4512
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr ""
 "Завантаження затримане або в зв'язку з останнім крахом або з налаштуваннями "
 "завантаження."
 
-#: ../midori/midori-view.c:4513
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "Завантажити сторінку"
 
-#: ../midori/midori-view.c:4678
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "Пуста сторінка"
 
-#: ../midori/midori-view.c:4892
-msgid "_Duplicate Tab"
-msgstr "_Дублювати вкладку"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Label"
-msgstr "Показати мітку _вкладки"
-
-#: ../midori/midori-view.c:4897
-msgid "Show Tab _Icon Only"
-msgstr "Показати тільки _іконки вкладки"
-
-#: ../midori/midori-view.c:4904
-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:5598
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "попереднє"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5617
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "наступне"
 
-#: ../midori/midori-view.c:5631
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "Відобразити зображення тла"
 
-#: ../midori/midori-view.c:5632
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "Чи відобразити зображення тла"
 
-#: ../midori/midori-view.c:5662
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "Опції"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s з %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1395,7 +1437,7 @@ msgstr[0] "%d година"
 msgstr[1] "%d години"
 msgstr[2] "%d годин"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1403,7 +1445,7 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилини"
 msgstr[2] "%d хвилин"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1412,27 +1454,27 @@ msgstr[1] "%d секунди"
 msgstr[2] "%d секунд"
 
 #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/midori-download.vala:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - %s залишилось"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?Б"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/c)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "Завантажений файл містить помилки."
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 msgid ""
 "The checksum provided with the link did not match. This means the file is "
 "probably incomplete or was modified afterwards."
@@ -1440,131 +1482,127 @@ msgstr ""
 "Контрольна сума надана з посиланням не збігається. Це означає, що файл може "
 "бути неповним або був зміненим пізніше."
 
-#: ../midori/midori-download.vala:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "Файл \"%s\" неможливо зберегти в цій теці."
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "Ви не маєте прав доступу для запису."
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "Немає достатньо вільного місця для завантаження \"%s\"."
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "Файл потребує %s, але тільки %s залишилося."
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "Швидкий виклик"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "Клікніть щоб додати скорочення"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "Введіть адресу скорочення"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "Введіть назву скорочення"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "Ви впевнені, що бажаєте видалити це скорочення?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "Початкові"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "Коли Мідорі стартує:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "Домашня сторінка:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "Використати _поточну сторінку"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "Використати поточну сторінку як домашню"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "Пропорційне сімейство шрифтів"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "Шрифт по замовчуванню для відображення тексту"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "Розмір шрифту по замовчуванню для відображення тексту"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "Шрифти фіксованої ширини"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "Шрифт для відображення тексту фіксованої ширини"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "Розмір шрифту для відображення тексту фіксованої ширини"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "Мінімальний розмір шрифту"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "Мінімальний розмір шрифту для відображення тексту"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "Типове кодування"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "Поведінка"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "Автоматично завантажити зображення"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "Ввімкнути перевірку правопису"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "Ввімкнути скрипти"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "Ввімкнути підтримку WebGL"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "Ввімкнути розширення Netscape"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "Збільшувати/зменшувати текст і зображення"
@@ -1577,11 +1615,19 @@ msgstr "Дозволити скриптам відкривати спливаю
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "Масштаб за замовчуванням"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "Типові мови"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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\""
@@ -1589,117 +1635,117 @@ msgstr ""
 "Розділений комами список бажаних мов для відображання веб-сторінок, "
 "наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\""
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "Зберігати завантажені файли до:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "Перегляд сторінок"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "Оформлення:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "Стиль панелі:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "Відкривати нові сторінки в:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "Поведінка нової вкладки:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "Кнопки закриття на вкладках"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "Завжди відображати панель вкладок"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "Відкривати вкладки у наступних після поточної"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr ""
 "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "Відкривати вкладки в фоні"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "Текстовий редактор"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "Читалка новин"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "Мережа"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "Сервер проксі"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "Назва сервера"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI-адреса"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "Порт"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "Типи проксі, що підтримуються:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "Веб-кеш"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "Максимальний розмір кешованих сторінок на диску"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "МБ"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "Ідентифікувати як"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "Приватність"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "Вилучити старі тістечка через:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "Максимальне число днів зберігання тістечок для"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "Блокувати тістечка що посилаються сторонніми сторінками"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
@@ -1707,123 +1753,122 @@ msgstr ""
 "Тістечка зберігають дані входу, зберігають ігри або профілі користувачів для "
 "рекламних цілей."
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "Ввімкнути підтримку локального сховища HTML5"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "Видалити сторінку з історії через:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "Максимальне число днів зберігання історії для"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "Розширення"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "_Налаштувати пошукові машини"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "Додати пошукову машину"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "Редагувати пошукову машину"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "_Опис:"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "_Ознака:"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "Налаштувати пошукові машини"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "Використовувати по _замовчуванню"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "Неможливо завантажити пошукову машину. %s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "Неможливо зберегти пошукові машини. %s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "Історія"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "Ð\97акладки Ñ\82а Ð\86Ñ\81Ñ\82оÑ\80Ñ\96Ñ\8f"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "Ð\9dевдаÑ\87а Ð¿Ñ\80и Ñ\96нÑ\96Ñ\86Ñ\96алÑ\96заÑ\86Ñ\96Ñ\97 Ñ\96Ñ\81Ñ\82оÑ\80Ñ\96Ñ\97: %s"
+msgid "Search for %s"
+msgstr "ШÑ\83каÑ\82и %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "Невдача при виборі з історії: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "Шукати %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "Шукати з…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "Шукати з %s"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "Відкрити з"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "Виберіть програму або команду для відкриття \"%s\":"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "Неможливо запустити зовнішню програму."
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "Неправильна адреса"
 
@@ -1848,46 +1893,105 @@ msgstr "Врахувати регістр"
 msgid "Close Findbar"
 msgstr "Закрити панель пошуку"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "Не вдалося додати закладку: %s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d закладка"
+msgstr[1] "%d закладки"
+msgstr[2] "%d закладок"
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d вкладена папка"
+msgstr[1] "%d вкладені папки"
+msgstr[2] "%d вкладених папок"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "Порожня папка"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "Папка з %s та без закладки"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "Папка з %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "Папка з %s і %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "Закладка веде до: %s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s та без закладки"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "Не вдалося оновити закладку : %s\n"
+msgid "%s and %s"
+msgstr "%s і %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "Редагувати вибрану закладку"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "Видалити вибрану закладку"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "Додати нову теку"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>Роздільник</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Відкрити у новій _вкладці"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "Шукати закладки"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "Історія"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "Вчора"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1895,33 +1999,33 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "Тижневої давності"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Невдача при видаленні об'єкту історії: %s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "Додати в закладки вибраний об'єкт історії"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "Видалити вибраний об'єкт історії"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "Очистити історію"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "Шукати в історії"
 
@@ -1949,121 +2053,70 @@ msgstr "Пароль"
 msgid "_Remember password"
 msgstr "За_пам'ятати пароль"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "Названий значок '%s' не може бути завантажений"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Значок '%s' не вдається завантажити"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "Кадри анімації пошкоджені"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "Нічого"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Властивості '%s' неправильні для %s"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "Вибрати файл"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "Вибрати теку"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "1 година"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "1 день"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "1 тиждень"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "1 місяць"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "1 рік"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:243
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "Налаштування для %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "Контрольна сума MD5:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "Контрольна сума SHA1:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "Конфігурувати фільтр реклам"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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."
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr ""
-"Введіть адресу сконфігурованого списку фільтрів в поле для вводу тексту та "
-"натисніть кнопку \"Додати\", щоб додати його до списку. Ви можете знайти "
-"більше списків на %s."
+"Здається, що ця сторінка містить користувацький скрипт. Ви бажаєте "
+"встановити його?"
 
-#: ../extensions/adblock.c:926
-msgid "Edit rule"
-msgstr "Додати правило"
-
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "_Правило:"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "Блокувати зображення"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "Блокувати посилання"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "Блокіратор реклами"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr ""
-"Здається, що ця сторінка містить користувацький скрипт. Ви бажаєте "
-"встановити його?"
-
-#: ../extensions/addons.c:223
-msgid "_Install user script"
-msgstr "_Встановити скрипт користувача"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "_Встановити скрипт користувача"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
@@ -2080,16 +2133,16 @@ msgstr "_Встановити стиль користувача"
 msgid "Don't install"
 msgstr "Не встановлювати"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "Скрипти користувача"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "Стилі користувача"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "Помилка"
 
@@ -2111,40 +2164,40 @@ msgstr "Видалити стиль користувача"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "Файл <b>%s</b> буде безповоротно вилучено."
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "Відкрити в текстовому редакторі"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "Відкрити теку призначення"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "Додати новий додаток"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "Видалити вибраний додаток"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "Додатки користувача"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "Не можу моніторувати теку '%s': %s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "Підтримка користувацьких скриптів і стилів"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "Кольорові вкладки"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "Забарвити кожну вкладку окремо"
 
@@ -2153,11 +2206,11 @@ msgstr "Забарвити кожну вкладку окремо"
 msgid "Cookie Manager"
 msgstr "Менеджер тістечок"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "Видалити все"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
@@ -2165,31 +2218,31 @@ msgstr ""
 "Видаляє всі відображені тістечка. Якщо налаштований фільтр, то будуть "
 "видалені тільки ті тістечка, які відповідають фільтрові."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "Розкрити все"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "Згорнути все"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "Ви впевнені, що бажаєте видалити всі тістечка?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "Питання"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "Будуть видалені тільки ті тістечка, які відповідають фільтрові."
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "Наприкінці сесії"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2207,15 +2260,15 @@ msgstr ""
 "<b>Дата закінчення</b>: %s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "Так"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "Ні"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2224,20 +2277,20 @@ msgstr ""
 "<b>Домен</b>: %s\n"
 "<b>Тістечка</b>: %d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "Назва"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "Роз_крити все"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "З_горнути все"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "Шукати коржики за назвою або доменом"
 
@@ -2257,25 +2310,45 @@ msgstr "Копіювати адреси вкладок"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "Копіювати адреси усіх вкладок до буфера обміну"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "Затримане завантаження"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "Затримка в секундах поки не завантажиться сторінка:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "Затримка завантаження сторінки поки Ви використовуєте вкладку"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "Це розширення показує помилки glib у системному лотку."
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "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."
 msgstr ""
-"Трапилася помилка при спробі звантаження файлу за допомогою такого додатку:\n"
+"Помилка при спробі завантаження файлу з допомогою наступного плагіну:\n"
+"%s\n"
+"\n"
+"Помилка:\n"
+"%s\n"
+"\n"
+"Продовжуйте без цього плагіну."
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2315,25 +2388,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "Востаннє оновлювалося: %s."
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "Стрічки новин"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "Додати нову стрічку новин"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "Видалити стрічку новин"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "Стрічки _новин"
 
@@ -2352,37 +2425,37 @@ msgstr "Формат стрічки новин не підтримується."
 msgid "Failed to parse XML feed: %s"
 msgstr "Не вдалось відкрити стрічку новин XML : %s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "Не можу знайти елемент \"channel\" в даних RSS XML."
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "Ця версія RSS не підтримується."
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "Не можу знайти потрібний елемент RSS \"item\" в даних XML."
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "Не можу знайти потрібний елемент RSS \"channel\" в даних XML."
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "Стрічка новин '%s' вже існує"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "Помилка завантаження стрічки новин '%s'"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "Панель стрічок новин"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "Читати Atom/ RSS стрічки новин"
 
@@ -2403,125 +2476,405 @@ msgstr ""
 "Вимагається майстер пароль\n"
 "для відкриття бази даних паролів"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "Запам'ятати пароль на даній сторінці?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "Запам'ятати"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "Не зараз"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "Ніколи для даної сторінки"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "Переключити стан форми історії"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "Активувати чи деактивувати форму історії для поточної вкладки."
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "Не вдалось відкрити базу даних: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Не вдалось виконати запит бази даних: %s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr ""
 "Тільки активувати форму історії за допомогою гарячих клавіш (Ctrl+Shift+F) "
 "для вкладки"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "Заповнювач історії форм"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "Зберігає історію введених даних форм"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "Невдача при виборі пропозиції\n"
 
-#: ../extensions/history-list.vala:205
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "Немає непроглянутих вкладок"
 
-#: ../extensions/history-list.vala:243
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "Історія-Список"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "Поведінка замикання вкладки"
 
-#: ../extensions/history-list.vala:291
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "Не робити нічого"
 
-#: ../extensions/history-list.vala:297
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "Перейти до останньої переглянутої вкладки"
 
-#: ../extensions/history-list.vala:303
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "Перейти до найновішої вкладки"
 
-#: ../extensions/history-list.vala:317
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "Відкрити вікно у фонових вкладках"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "Наступна нова вкладка (список історії)"
 
-#: ../extensions/history-list.vala:450
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "Наступна нова вкладка з історії"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "Попередня нова вкладка (список історії)"
 
-#: ../extensions/history-list.vala:460
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "Попередня нова вкладка з історії"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "Показувати вкладку в тлі (Список історії)"
 
-#: ../extensions/history-list.vala:470
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "Показати поточну вибрану вкладку в тлі"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "Історія вкладок"
 
-#: ../extensions/history-list.vala:598
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr ""
 "Перейти до останньої використаної вкладки при переключанні або закривання "
 "вкладок"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL видало помилку: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "Прийняти"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "Приймати для сесії"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "Блок"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "Не вдалося відкрити базу даних розширення %s."
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "Не вдалось виконати запит бази даних: %s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "Ви справді хочете видалити всі дозволи JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "Видалити всі дозволи JavaScript?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+"Ця дія видалить всі дозволи JavaScript. Ви отримаєте запит на надання "
+"дозволів при відвідуванні кожного нового сайту."
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "Налаштувати NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+"Нижче наведено список всіх веб-сайтів і встановлені для них політики. Ви "
+"можете видалити політики, позначивши записи і натиснувши на <i>Видалити</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "Домен"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "Поведінка"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "Видалити _все"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "Невизначено"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "Помилка у розширенні NoJS"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "Причина"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "Неможливо створити теку налаштування для розширення: %s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "Неможливо створити теку налаштування для розширення."
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "Не вдалось відкрити базу даних."
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "не вдалося налаштувати структуру бази даних для розширення."
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "Екземпляр розширення"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "Екземпляр розширення Мідорі для цього розширення"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "Екземпляр програми"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "Екземпляр програми Мідорі, до якої належить це розширення"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "Екземпляр бази даних"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+"Звертання до екземпляру бази даних sqlite, яке використовує це розширення"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "Шлях до бази даних"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+"Звертання до екземпляру бази даних sqlite, яке використовує це розширення"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "Дозволити всім сайтам"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "Тимчасово прийняти"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "Жести миші"
@@ -2550,11 +2903,11 @@ msgstr "Скорочення"
 msgid "View and edit keyboard shortcuts"
 msgstr "Переглянути і редагувати скорочення клавіатури"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "Годинник панелі статусу"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "Показувати дату і час на панелі статусу"
 
@@ -2570,6 +2923,10 @@ msgstr "Скрипти"
 msgid "Netscape plugins"
 msgstr "Розширення Netscape"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Ввімкнути розширення Netscape"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "Властивості панелі _стану"
@@ -2578,15 +2935,15 @@ msgstr "Властивості панелі _стану"
 msgid "Easily toggle features on web pages on and off"
 msgstr "Просте включання і виключання перемикання функцій на веб-сторінках"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "Панель вкладок"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "Панель в_кладок"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "Показати вкладки у вертикальній панелі"
 
@@ -2598,11 +2955,11 @@ msgstr "По замовчуванню тільки іконки на вклад
 msgid "New tabs have no label by default"
 msgstr "Нові вкладки по замовчуванню не будуть мати міток"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "Змінити панель інструментів"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
@@ -2610,67 +2967,58 @@ msgstr ""
 "Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна "
 "перевпорядкувати, пересуваючи їх мишою (drag'n'drop)."
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "Доступні елементи"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "Елементи для показу"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "Змінити панель _інструментів…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "Редактор панелі інструментів"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "Легко редагувати формат панелі інструментів"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "Кешувати комунікацію HTTP на диск"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "Не вдалося завантажити коржики\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "Очистити приватні дані"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "_Очистити приватні дані"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "Очистити наступні дані:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "Останні відкриті _вкладки"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "Очистити приватні дані при _виході з Мідорі"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "Збережені логіни і _паролі"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "Дані коржиків і веб-сторінки"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "Значки веб-сторінок"
 
@@ -2678,211 +3026,153 @@ msgstr "Значки веб-сторінок"
 msgid "Open tabs"
 msgstr "Відкрити вкладки"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "Більше відкритих вкладок..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Невдача при очищенні історії: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Невдача видалення старих об'єктів історії: %s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "не вдалося ПРИЄДНАТИ стару базу даних"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "не вдалося імпортувати зі старої бази даних"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "не вдалося відкотити трансакцію"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "не вдалося ВІД’ЄДНАТИ"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "Не вдалося створити таблицю закладок: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "Не вдалося додати закладку: %s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "Ð\9dе Ð²Ð´Ð°Ð»Ð¾Ñ\81Ñ\8f Ñ\96мпоÑ\80Ñ\82Ñ\83ваÑ\82и Ð· Ñ\81Ñ\82аÑ\80оÑ\97 Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ\85: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "Ð\9fомилка Ð¿Ñ\80и Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ\96 Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸: %s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ð\9dеможливо Ð·Ð±ÐµÑ\80егÑ\82и Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸. %s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "Ð\9fомилка Ð¿Ñ\80и Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ\96 Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸: %s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr ""
 "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити."
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "Неможливо зберегти конфігурацію. %s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Неможливо завантажити сесію: %s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Сесія не може бути збережена. %s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "Неможливо зберегти смітник. %s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr ""
-"Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, "
-"то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми."
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "Змінити _налаштування"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "Заборонити всі розширення"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Показати діалог, коли Мідорі зазнає краху"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "Видалити старі вкладки"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "Показати журнал останнього _краху"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "Запустити в _відладнику програм"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr ""
 "Один із екземплярів програми Midori вже працює, але не відповідає на "
 "запити.\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "Неможливо завантажити закладки: %s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Неможливо завантажити сесію: %s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "Неможливо завантажити смітник: %s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "Неможливо завантажити історію: %s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "Отримано наступні помилки:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "_Ігнорувати"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL видало помилку: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "Прийняти"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "Приймати для сесії"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "Блок"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
 msgstr "Не вдалось відкрити базу даних: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "Не вдалось виконати запит бази даних: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "Ви впевнені, що бажаєте видалити всі дозволи тістечок?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "Вилучити дозволи тістечок?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
 msgstr ""
 "Ця дія вилучить всі дозволи тістечок. Вас будуть запитувати про дозволи "
-"знову для кожної сторінки, яку Ви відвідаєте. "
+"знову для кожної сторінки, яку Ви відвідаєте."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "Менеджер дозволів тістечок"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "Екземпляр поточного менеджера дозволів тістечок"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "Налаштувати дозволи тістечок"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2895,23 +3185,13 @@ msgstr ""
 "можете додавати поведінку для домену нижче, вибираючи поведінку і клацаючи "
 "на <i>Додати</i>."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "Домен"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "Поведінка"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "Видалити _все"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "_Запитати про поведінку, якщо її не визначено для домену"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2925,152 +3205,135 @@ msgstr ""
 msgid "Error in cookie permission manager extension"
 msgstr "Помилка розширення менеджера дозволів тістечок"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "Причина"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "Неможливо створити теку налаштування для розширення: %s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "Неможливо створити теку налаштування для розширення."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "Не вдалось відкрити базу даних."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "не вдалося налаштувати структуру бази даних для розширення."
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr ""
 "Неможливо визначити налаштування глобальної поведінки тістечок для домену: %s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "Аж до кінця сеансу"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "Вебсторінка %s бажає зберегти %d тістечка."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "Вебсторінка %s бажає зберегти тістечко."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "Багато вебсторінок бажають зберегти %d тістечка повністю."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "_Прийняти"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "Прийняти для цієї _сесіЇ"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "_Заборонити"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "Відмовити _цим разом"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "Шлях"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "Значення"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "Закінчення терміну дії"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "Екземпляр розширення"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "Екземпляр розширення Мідорі для цього розширення"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "Ð\95кземплÑ\8fÑ\80 Ð¿Ñ\80огÑ\80ами"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Ð\9cенеджеÑ\80 Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ñ\82Ñ\96Ñ\81Ñ\82еÑ\87ок"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "Ð\95кземплÑ\8fÑ\80 Ð¿Ñ\80огÑ\80ами Ð\9cÑ\96доÑ\80Ñ\96, Ð´Ð¾ Ñ\8fкоÑ\97 Ð½Ð°Ð»ÐµÐ¶Ð¸Ñ\82Ñ\8c Ñ\86е Ñ\80озÑ\88иÑ\80еннÑ\8f"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "Ð\9aеÑ\80Ñ\83ваннÑ\8f Ð´Ð¾Ð·Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ñ\82Ñ\96Ñ\81Ñ\82еÑ\87ок Ð´Ð»Ñ\8f ÐºÐ¾Ð¶Ð½Ð¾Ñ\97 Ñ\81Ñ\82оÑ\80Ñ\96нки"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "Екземпляр бази даних"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
 msgstr ""
-"Звертання до екземпляру бази даних sqlite, яке використовує це розширення"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "Шлях до бази даних"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
 msgstr ""
-"Звертання до екземпляру бази даних sqlite, яке використовує це розширення"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "Запитати про невідому поведінку"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "Тепер ви можете відкрити <b>%s</b> з вашої панелі запуску або меню"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
-msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
 msgstr ""
-"Якщо так, тоді це розширення запитає про поведінку для кожного невідомого "
-"домену. Якщо ні, тоді це розширення використає глобальні налаштування "
-"поведінки тістечок в налаштуваннях Мідорі."
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "Ð\9dевизнаÑ\87ено"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "Ð\9fÑ\80огÑ\80ама"
 
-#: ../extensions/cookie-permissions/main.c:62
-msgid "Cookie Security Manager"
-msgstr "Ð\9cенеджеÑ\80 Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ñ\82Ñ\96Ñ\81Ñ\82еÑ\87ок"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "Ð\9dовий Ð\9fÑ\80оÑ\84Ñ\96лÑ\8c"
 
-#: ../extensions/cookie-permissions/main.c:63
-msgid "Manage cookie permission per site"
-msgstr "Керування дозволами тістечок для кожної сторінки"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "Програма"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "Помилка запуску"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "Створити _Запускач"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "Менеджер веб-програм"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "Керування веб-сторінками, що встановлені як програми"
 
@@ -3078,888 +3341,190 @@ msgstr "Керування веб-сторінками, що встановле
 msgid "Transfers"
 msgstr "Завантаження"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "Очистити все"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "Відкрити теку при_значення"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "Копіювати поси_лання"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "Файл '<b>%s</b>' завантажено."
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "Передачу завершено"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
-msgstr "Деякі файли завантажено"
+msgstr "Деякі файли ще завантажуються"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "_Вийти з Мідорі"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі."
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "Менеджер завантажень"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "Показати завантажені файли"
 
-#~ msgid "Middle click opens Selection"
-#~ msgstr "Середня кнопка відкриває виділене"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr ""
-#~ "Завантажувати посилання URL з виділеного через клацання середньої кнопки"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "Неможливо отримати шлях для налаштування розширення: шлях є NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "Неможливо отримати шлях для налаштування розширення."
-
-#~ msgid "Custom..."
-#~ msgstr "Інше…"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "Підтвердження збереження тістечка"
-
-#~ msgid "_Details"
-#~ msgstr "_Деталі"
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "Що ідентифікувати для веб-сторінок"
-
-#~ msgid "Writing failed."
-#~ msgstr "Невдача запису."
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "Кінетичне прокручування"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості"
-
-#~ msgid "_Window"
-#~ msgstr "_Вікно"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "Додати скорочення до _стільниці"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "Перенаправити попередження консолі до вказаного ФАЙЛ"
-
-#~ msgid "FILENAME"
-#~ msgstr "ФАЙЛ"
-
-#~ msgid "Highlight Matches"
-#~ msgstr "Підсвітити збіги"
-
-#~ 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 "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 specified configuration folder is invalid."
-#~ msgstr "Це невластива тека конфігурації."
-
-#~ msgid "Cookies"
-#~ msgstr "Тістечка"
-
-#~ msgid "'Flash' Cookies"
-#~ msgstr "'Очистити' тістечка"
-
-#~ msgid "HTML5 _Databases"
-#~ msgstr "_Бази даних HTML5"
-
-#~ msgid "Offline Application Cache"
-#~ msgstr "Кеш програми при праці без мережі"
-
-#~ msgid "Lightweight web browser"
-#~ msgstr "Легкий переглядач Веб"
-
-#~ msgid "Not available: %s"
-#~ msgstr "Недоступно: %s"
-
-#~ msgid "Resource files not installed"
-#~ msgstr "Файли ресурсів не встановлені"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Не зберігати будь-яких даних під час перегляду Веб"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Додати скорочення до швидкого виклику"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Додати скорочення до стільниці"
-
-#~ msgid "Create a launcher"
-#~ msgstr "Створити запускач"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Підписатися на цю стрічку новин"
-
-#~ msgid "Close this window"
-#~ msgstr "Закрити це вікно"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Закрити всі відкриті вікна"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Скасувати останню зміну"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Повернутися до останньої зміни"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Вирізати вибраний текст"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Копіювати вибраний текст"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Вставити текст з буфера"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Видалити вибраний текст"
-
-#~ msgid "Select all text"
-#~ msgstr "Виділити весь текст"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Шукати наступне входження слова або фрази"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Шукати попереднє входження слова або фрази"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Відновити розмір перегляду"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Переглянути вихідний код сторінки"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Прокрутити вліво"
-
-#~ msgid "Scroll down"
-#~ msgstr "Прокрутити вниз"
-
-#~ msgid "Scroll up"
-#~ msgstr "Прокрутити вверх"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Прокрутити вправо"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Видалити вміст смітника"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Відкрити останню закриту вкладку"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Додати нову теку закладок"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "Додати, редагувати чи видалити пошукові машини…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "Очистити приватні дані…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "Перевірити сторінку і доступні знаряддя розробника"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Перейти до попередньої вкладки"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Перейти до наступної вкладки"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Перенести вкладку позаду попередню вкладку"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Перенести вкладку попереду наступної вкладки"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Фокусувати поточну вкладку"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Циклічне фокусування між переглядами"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Показувати тільки іконку поточної вкладки"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Дублювати поточну вкладку"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Закрити всі вкладки окрім поточної вкладки"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Відкрити вкладки, що збережені під час останньої сесії"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Показати найуживаніші запитання (FAQ)"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Відкрити баг-трекер Мідорі"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Показати інформацію про програму"
-
-#~ msgid "Show menubar"
-#~ msgstr "Показати панель меню"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "Показати панель навігації"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "Показати бічну панель"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Показати панель закладок"
-
-#~ msgid "Show statusbar"
-#~ msgstr "Показати панель стану"
-
-#~ msgid "No filename specified"
-#~ msgstr "Не вказано назви файлу"
-
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Встановити кількість колонок і рядків"
-
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Введіть кількість колонок і рядків:"
-
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Неправильні дані для розміру швидкого виклику"
-
-#~ msgid "Thumb size:"
-#~ msgstr "Розмір значка:"
-
-#~ msgid "Small"
-#~ msgstr "Маленький"
-
-#~ msgid "Medium"
-#~ msgstr "Середній"
-
-#~ msgid "Big"
-#~ msgstr "Великий"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "Конфігурувати фільтри _реклам…"
-
-#~ msgid "Not found - %s"
-#~ msgstr "Не знайдено - %s"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Не можу відобразити документ"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Примусити 96 пікселів на дюйм"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Примусити 96 DPI для відео"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr ""
-#~ "Переключити вкладки за допомогою Ctrl+Tab, впорядкованим по часу "
-#~ "останнього використання"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Вилучити старі тістечка через 1 годину"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Вилучити старі тістечка через 1 тиждень"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Вилучити старі тістечка через 1 рік"
-
-#~ msgid "All cookies"
-#~ msgstr "Всі тістечка"
-
-#~ msgid "Session cookies"
-#~ msgstr "Тістечка сесії"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Показати панель завантажень"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Чи показувати панель завантажень"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Доповнення рядка в вікні пошуку"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "Чи автоматично доповнювати стрічку в рядку пошуку"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Показати об’єкти налаштування панелі"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Чи показувати пульт оправління панелі"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Показати швидкий виклик в новій вкладці"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Показувати швидкий виклик в щойно відкритих вкладках"
-
-#~ msgid "Download Manager"
-#~ msgstr "Менеджер завантажень"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "Відкривати зовнішні сторінки в:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Де відкривати сторінки зовнішнього виклику"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Тістечка якого типу приймати"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "Тривалість життя тістечка"
-
-#~ msgid "Maximum history age"
-#~ msgstr "Тривалість життя історії"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Запам'ятовувати останні завантажені файли"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "Чи зберігати останні завантажені файли"
-
-#~ msgid "Appearance"
-#~ msgstr "Зовнішній вигляд"
-
-#~ msgid "Web Cookies"
-#~ msgstr "Веб-тістечка"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "Вилучити тістечка при _виході з Мідорі"
-
-#~ msgid "General"
-#~ msgstr "Основні"
-
-#~ msgid "Font settings"
-#~ msgstr "Налаштування шрифтів"
-
-#~ msgid "Interface"
-#~ msgstr "Інтерфейс"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Панель навігації"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "Наступна вкладка (список історії)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "Попередня вкладка (список історії)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "Попередня вкладка з історії"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "Не вдалось виконати запит бази даних\n"
-
-#~ msgid "%s of %s, %s/s"
-#~ msgstr "%s з %s, %s/s"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "Відкрити теку призначення для вибраного додатку"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "Завантажувати в менеджері завантажень"
-
-#~ msgid "External applications"
-#~ msgstr "Зовнішні рограми"
-
-#~ msgid "Pageholder"
-#~ msgstr "Тримач сторінок"
-
-#~ msgid "_Pageholder"
-#~ msgstr "_Тримач сторінки"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr ""
-#~ "Зберігати одну або кілька сторінок відкритими паралельно до ваших вкладок"
-
-#~ msgid "Quit the application"
-#~ msgstr "Вийти з програми"
-
-#~ msgid "_Contents"
-#~ msgstr "_Зміст"
-
-#~ msgid "Show the documentation"
-#~ msgstr "Показати документацію"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "Збер_ігати віддаленні посилання"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "За_вантажувати віддалені посилання"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% завантажено"
-
-#~ msgid "Show transferbar"
-#~ msgstr "Показати панель завантажень"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "Показати поступ у рядку адреси"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "Чи показувати прогрес завантаження в рядку адреси"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "Запитати про теку призначення"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "Чи запитувати про теку призначення при завантаженні файлу"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "Чи показувати повідомлення про завершення завантаження"
-
-#~ msgid "Download I_mage"
-#~ msgstr "Завантажити _зображення"
-
-#~ msgid "Failed to clear search history: %s\n"
-#~ msgstr "Неможливо очистити історію пошуку: %s\n"
-
-#~ msgid "Detach chosen panel from the window"
-#~ msgstr "Від’єднати вибрану панель від вікна"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "Приховати панель _управління"
-
-#~ msgid "Spell Checking"
-#~ msgstr "Перевірка орфографії"
-
-#~ msgid ""
-#~ "A comma separated list of languages to be used for spell checking, for "
-#~ "example \"en_GB,de_DE\""
-#~ msgstr ""
-#~ "Розділений комами список мов, що використовуються для перевірки "
-#~ "правопису, наприклад: \"uk_UA,en_US\""
-
-#~ msgid "Minimize _Current Tab"
-#~ msgstr "Мінімізувати _поточну вкладку"
-
-#~ msgid "Minimize the current tab"
-#~ msgstr "Мінімізувати поточну вкладку"
-
-#~ msgid "External Applications"
-#~ msgstr "Зовнішні програми"
-
-#~ msgid "Associate URL schemes with external commands"
-#~ msgstr "Асоціювати схеми URL із зовнішніми командами"
-
-#~ msgid "Spelling dictionaries:"
-#~ msgstr "Словники перевірки правопису:"
-
-#~ msgid "Console"
-#~ msgstr "Консоль"
-
-#~ msgid "Copy _All"
-#~ msgstr "Копіювати _все"
-
-#~ msgid "Copy All"
-#~ msgstr "Копіювати все"
-
-#~ msgid "_Cookie Manager"
-#~ msgstr "Менеджер _тістечок"
-
-#~ msgid "_Restore Tab"
-#~ msgstr "_Відновити вкладку"
-
-#~ msgid "_Minimize Tab"
-#~ msgstr "_Мінімізувати вкладку"
-
-#~ msgid "Erroneous clock time"
-#~ msgstr "Неправильний час годинника"
-
-#~ msgid ""
-#~ "The clock time lies in the past. Please check the current date and time."
-#~ msgstr "Час годинника є в минулому. Перевірте поточні дату і час."
-
-#~ msgid "Copy %s to the folder %s."
-#~ msgstr "Копіювання %s до каталогу %s."
-
-#~ msgid "Minimize new Tabs"
-#~ msgstr "Мінімізувати нові вкладки"
-
-#~ msgid "New tabs open minimized"
-#~ msgstr "Нові вкладки відкриваються мінімізованими"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "_Останньо відвідані сторінки"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "Знову відкрити сторінки, що були переглянуті раніше"
-
-#~ msgid "Original cookies only"
-#~ msgstr "Тільки оригінальні тістечка"
-
-#~ msgid "Remember last visited pages"
-#~ msgstr "Запам'ятати останні відвідані сторінки"
-
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "Чи зберігати останні відвідані сторінки"
-
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "Визначити сервер проксі автоматично"
-
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "Чи визначати сервер проксі зі змінних оточення"
-
-#~ msgid "Set number of shortcuts"
-#~ msgstr "Встановити кількість скорочень"
-
-#~ msgid "Enter number of shortcuts:"
-#~ msgstr "Введіть кількість скорочень:"
-
-#~ msgid ""
-#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-#~ msgstr ""
-#~ "Копіювати скрипти користувачів до теки %s і копіювати стилі до теки %s."
-
-#~ msgid "Open _Link"
-#~ msgstr "Відкрити _посилання"
-
-#~ msgid "REGEX"
-#~ msgstr "REGEX"
-
-#~ msgid "Failed to get current time: %s\n"
-#~ msgstr "Не вдалось отримати поточний час: %s\n"
-
-#~ msgid "Not available on this platform"
-#~ msgstr "Недоступно для цієї платформи"
-
-#~ msgid "Enable developer tools"
-#~ msgstr "Ввімкнути знаряддя розробника"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "Дозволений розмір кешу"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
 
-#~ msgid "Resizable text areas"
-#~ msgstr "Розширюване текстове поле"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
 
-#~ msgid "Both"
-#~ msgstr "Обоє"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
 
-#~ msgid "Both horizontal"
-#~ msgstr "Обоє горизонтальні"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
 
-#~ msgid "Disable"
-#~ msgstr "_Заборонити"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
 
-#~ msgid "_Quick Find"
-#~ msgstr "_Швидко знайти"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
 
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "Швидко перескочити до слова або фрази"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "Поепердження: Ви використовуєте рахунок суперкористувача!"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
 
-#~ msgid "Show panel _titles"
-#~ msgstr "Показати панель"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
 
-#~ msgid "Options"
-#~ msgstr "Налаштування"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
 
-#~ msgid "View Selection Source"
-#~ msgstr "Перегляд _коду"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
 
-#~ msgid "View the source code of the selection"
-#~ msgstr "Переглянути вихідний код сторінки"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "Ввімкнути спеціальні розширення для розробників"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "Автоматично завантажити зображення"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "Автоматично стягнути окремі зображення щоб вмістити в сторінку"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "Запам'ятати останній розмір вікна"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "Чи зберігати останні відвідані сторінки"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
 
-#~ msgid "Cache size"
-#~ msgstr "Врахувати регістр"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
 
-#~ msgid "Encoding"
-#~ msgstr "_Кодування"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "Типове кодування символів"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "Чи зберігати останні відвідані сторінки"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "Блокіратор реклами"
 
-#~ msgid "Load on Startup"
-#~ msgstr "Початкові"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "Блокувати рекламу використовуючи список фільтрів"
 
-#~ msgid "Configure _Toolbar…"
-#~ msgstr "Редагувати _панель…"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "Конфігурувати фільтр реклам"
 
-#~ msgid "Enable"
-#~ msgstr "Ввімкнути скрипти"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "Блокувати зображення"
 
-#~ msgid "_Disable"
-#~ msgstr "_Файл"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "Блокувати посилання"
 
-#~ msgid "Search"
-#~ msgstr "Шукати _з"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "Додати правило"
 
-#~ msgid "%d days ago"
-#~ msgstr "%d день тому"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "_Правило:"
diff --git a/po/ur.po b/po/ur.po
new file mode 100644 (file)
index 0000000..586b04d
--- /dev/null
+++ b/po/ur.po
@@ -0,0 +1,3425 @@
+# Urdu translation for midori
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-03-22 19:42+0000\n"
+"Last-Translator: whizkid <ahmedkn.201@hotmail.com>\n"
+"Language-Team: Urdu <ur@li.org>\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-Launchpad-Export-Date: 2015-03-23 05:09+0000\n"
+"X-Generator: Launchpad (build 17405)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "مادورا"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "ویب براؤزر"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "مادورا ویب براؤزر"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "ویب کو براؤز کریں"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "انٹرنیٹ;دیکھیے ورلڈ وائڈ ویب;ایکسپلورر"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "نیا ٹیب"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "نئی ونڈو"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "نئے نجی براؤزنگ کی ونڈو"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "مادورا نجی براؤزنگ"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "نجی براؤزنگ"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "ایک نئی نجی براؤزنگ ونڈو کھو لیں"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "ایک ویب ایپلیکیشن کے طور پر چلانے کا پتہ"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "پتہ"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "ایک ترتیب فولڈر کے طور پر فولڈر منتخب کریں"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "فولڈر"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "کوئی تبدیلی محفوظ نہیں ہیں;نجی براؤزنگ"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "پورٹ ایبل موڈ، تمام رن ٹائم فائلوں کو ایک جگہ میں محفوظ کیا جاتا ہے"
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr "ایک تشخیصی ڈائلاگ دکھائیں"
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  whizkid https://launchpad.net/~ahmedkn-201"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/uz.po b/po/uz.po
new file mode 100644 (file)
index 0000000..90307df
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,3425 @@
+# Uzbek translation for midori
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-02-19 19:32+0000\n"
+"Last-Translator: Shukrullo Turgunov <shukrullo@umail.uz>\n"
+"Language-Team: Uzbek <uz@li.org>\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"
+"X-Launchpad-Export-Date: 2015-02-20 05:10+0000\n"
+"X-Generator: Launchpad (build 17341)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Veb brauzer"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Yangi oyna"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Yangi ichki mahfiy oyna ochish"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Snapshot saqlandi: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Manzilni web qo'llanma sifatida ishga tushirish"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "MANZIL"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "FOLDER ni sozlanmalar papkasi sifatida ishlatish"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "JILD"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Shukrullo Turgunov https://launchpad.net/~shukrullo"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
new file mode 100644 (file)
index 0000000..0dfd5e0
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,3434 @@
+# Vietnamese translation for midori
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-11-26 22:27+0000\n"
+"Last-Translator: Zombifier <duckhoi1234@yahoo.com.vn>\n"
+"Language-Team: Vietnamese <vi@li.org>\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"
+"X-Launchpad-Export-Date: 2014-11-27 05:47+0000\n"
+"X-Generator: Launchpad (build 17261)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr "Midori"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "Trình duyệt Web"
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Trình duyệt web Midori"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr "Duyệt web"
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;Web"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr "Tab mới"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr "Cửa sổ mới"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "Mở cửa sổ duyệt web riêng tư mới"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Duyệt web riêng tư Midori"
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr "Duyệt web riêng tư"
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "Mở một cửa sổ duyệt web riêng tư mới"
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Đã lưu snapshot vào: %s\n"
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr "Chạy ĐỊA CHỈ như là một ứng dụng web"
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr "ĐỊA CHỈ"
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr "Sử dụng THƯ MỤC làm nơi lưu trữ thiết lập"
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr "THƯ MỤC"
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr "Duyệt web riêng tư, không lưu thay đổi nào hết"
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr "Chạy file javascript được lựa chọn"
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr "Chạy lệnh đã cho"
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+"Hiện danh sách các lệnh được dùng với tùy chọn -e/ --execute (thực thi)"
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr "Hiện phiên bản chương trình"
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr "Địa chỉ"
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Chặn các URI khớp với biểu thức chính quy (regex): MẪU-SO-SÁNH"
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr "MẪU-SO- SÁNH"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Cài đặt lại midori sau SỐ-GIÂY không hoạt động"
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr "SỐ-GIÂY"
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Hãy gửi những ý kiến đóng góp và thông báo lỗi tới địa chỉ:"
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr "Kiểm tra phiên bản mới tại địa chỉ:"
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr "Gặp một lỗi không rõ"
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr "Đánh _dấu trang"
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr "Thê_m đánh dấu trang"
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr "Phần _mở rộng"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr "Lịch _sử duyệt web"
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr "Mã _lệnh tùy biến người dùng (JS)"
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr "Tùy biến _giao diện trang web (CSS)"
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr "_Tab mới"
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr "Tải _về"
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr "_Plugin theo chuẩn Netscape"
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr "Các t_ab đã tắt"
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr "_Cửa sổ mới"
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr "Thư _mục mới"
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr "[Địa chỉ]"
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr "Không tìm thấy tập tin."
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr "Tài liệu sai cấu trúc/cú pháp."
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr "Không nhận dạng được kiểu đánh dấu trang."
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr "Tải lại trang hiện tại"
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr "Dừng tải trang hiện tại"
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Không thể cập nhật tiêu đề: %s\n"
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "Giá trị '%s' không phù hợp với %s"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Hành động lạ '%s'."
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Duyệt web riêng tư)"
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr "Đánh dấu trang"
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "Thêm vào trang Truy cập _nhanh"
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr "Lưu thành file riêng"
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr "Lưu cả các file đi _kèm"
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr "Đã mở một cửa sổ mới"
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr "Đã mở một tab mới"
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr "Không thể mở ảnh!"
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr "Không thể mở ảnh đã chọn bằng trình xem ảnh mặc định."
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr "Không thể tải ảnh!"
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr "Không thể tải ảnh đã chọn."
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr "Lưu file"
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr "Mở file"
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr "Nguồn tin mới"
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr "Thêm đánh dấu trang mới"
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr "Trống"
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr "Bật tắt di chuyển con chạy văn bản"
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Nhấn nút F7 để bật tắt chế độ Duyệt web bằng con chạy. Khi bật sẽ có một con "
+"chạy văn bản trên mọi trang web."
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr "Bật Duyệt web bằng con _chạy"
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr "Mở tất các thành các tab mới"
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr "Mở trong _cửa sổ mới"
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr "Nhập các trang đánh dấu..."
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr "Nhập các trang đánh _dấu"
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr "Ứn_g dụng:"
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr "Nhập từ file XBEL hay HTML"
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr "Nhập từ file"
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr "Không thể nhập các trang đánh dấu"
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr "Các trang đánh dấu XBEL"
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr "Các trang đánh dấu Netscape"
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+"Midori chỉ có thể nhập từ định dạng XBEL (*.xbel) hoặc Netscape (*.html)"
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr "Không thể xuất các trang đánh dấu"
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr "Một trình duyệt web nhanh và nhẹ."
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Bui Le Chi Bao https://launchpad.net/~chibao-600\n"
+"  Trung Ngô https://launchpad.net/~ndtrung4419\n"
+"  Zombifier https://launchpad.net/~duckhoi1234\n"
+"  hai https://launchpad.net/~hailataone"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr "Hiện tab gần đây nhất"
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr "Hiện tab gần đây nhất nhưng không tải"
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "Không thể nạp cấu hình: %s\n"
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "Tùy chỉnh không hợp lệ '%s'"
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Không thể lưu file \"%s\" vào thư mục này."
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr "Bạn không có quyền ghi vào vị trí này."
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Không đủ chỗ trống để lưu \"%s\"."
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "File này cần %s nhưng chỉ còn %s."
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr "Bộ nhớ tạm web"
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr "Quyền riêng tư"
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Cookie dùng để lưu dữ liệu đăng nhập, quá trình chơi game, hay tài khoản "
+"người dùng cho mục đích quảng cáo."
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "Phần mở rộng"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Không thể nạp máy tìm kiếm. %s\n"
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Không thể lưu danh sách máy tìm kiếm. %s"
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "Mở trong _tab mới"
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr "Xóa dữ liệu riêng tư"
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr "_Xóa dữ liệu riêng tư"
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr "Xóa những dữ liệu sau:"
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr "Các tab mở gần đây nhất"
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr "Xóa dữ liệu riêng tư khi th_oát Midori"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr "Các _mật khẩu và tài khoản đã lưu"
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr "Cookie và dữ liệu duyệt web"
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr "Biểu tượng website"
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "Xóa lịch sử thất bại: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "Không thể xóa dữ liệu duyệt web: %s\n"
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Không thể lưu thiết lập. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Không thể lưu danh sách các tab đã đóng. %s"
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr "Thay đổi _tùy chỉnh"
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr "Tắt tất cả _phần mở rộng"
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr "Bỏ những tab cũ"
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Đã có một phiên bản Midori đang chạy nhưng không trả lời.\n"
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "Không thể tải đánh dấu trang: %s\n"
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Không thể tải phiên duyệt web: %s\n"
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Không thể tải các tab đã tắt: %s\n"
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Không thể tải lịch sử duyệt web: %s\n"
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr "Có lỗi xảy ra:"
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr "_Bỏ qua"
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index c0d2eb12c00a186d4f2382fbeb726619c62dc667..f8d6a7e2e16d7884a324dde532114cdd9f8f66eb 100644 (file)
 # Stanley Zhang <yatzhang@gmail.com>, 2009.
 # Hunt Xu <mhuntxu@gmail.com>, 2009, 2010, 2011, 2012.
 # Chipong Luo <chipong.luo@yahoo.com>, 2011, 2012.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 03:27+0000\n"
-"PO-Revision-Date: 2012-12-31 12:03+0800\n"
-"Last-Translator: Hunt Xu <huntxu@live.cn>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-03-19 12:19+0000\n"
+"Last-Translator: colindemian <dengmengpc@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n-cn@xfce.org>\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"
+"X-Launchpad-Export-Date: 2015-03-20 04:38+0000\n"
+"X-Generator: Launchpad (build 17405)\n"
+"Language: zh_CN\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:138 ../midori/main.c:151
-#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori 浏览器"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "网络浏览器"
+
+#: ../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 "New Private Browsing Window"
-msgstr "新建私人浏览窗口"
+msgid "Internet;WWW;Explorer"
+msgstr "互联网;WWW;浏览器"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
 msgstr "新建标签"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "新建窗口"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "网络浏览器"
+msgid "New Private Browsing Window"
+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:3925
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "私人浏览"
 
-#: ../midori/main.c:62
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "打开新的私人浏览窗口"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "截图保存至:%s\n"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "将‘地址’作为网络应用程序运行"
 
-#: ../midori/main.c:87
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "地址"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "使用‘文件夹’作为配置文件夹"
 
-#: ../midori/main.c:89
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "文件夹"
 
-#: ../midori/main.c:91
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "私人浏览,未保存更改"
 
-#: ../midori/main.c:94
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "便携模式,所有的运行时文件存放在同一位置"
 
-#: ../midori/main.c:97
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "带有 WebKit 的纯 GTK+ 窗口,类似 GtkLauncher"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "显示诊断对话框"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr "在 gdb 内运行并在崩溃时保存回溯信息"
+
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "将指定的文件名作为 javascript 运行"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "对指定的 URI 截图"
 
-#: ../midori/main.c:105
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "执行指定的命令"
 
-#: ../midori/main.c:107
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "列出可以带 -e/ --execute 执行的命令"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "显示程序版本"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "地址"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "按正则表达式‘类型’屏蔽 URI"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "类型"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "在‘秒’秒内无响应后重置 Midori"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "秒"
 
-#: ../midori/main.c:152
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr "错误:找不到“gdb”\n"
+
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "请将意见、建议和缺陷报告至:"
 
-#: ../midori/main.c:154
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "在此检查新版本:"
 
-#: ../midori/main.c:299
+#: ../midori/main.c:358
 msgid "An unknown error occured"
-msgstr "å\8f\91ç\94\9fäº\86ä¸\80个æ\9cªç\9f¥é\94\99误"
+msgstr "发生一个未知错误"
 
-#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "意外的动作 ‘%s’。"
-
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6070
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "添加书签(_K)"
 
-#: ../midori/midori-app.c:1353
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
 msgstr "扩展(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../midori/midori-app.c:1355
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
 msgstr "用户脚本(_U)"
 
-#: ../midori/midori-app.c:1356
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "用户样式(_S)"
 
-#: ../midori/midori-app.c:1357
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "新建标签(_T)"
 
-#: ../midori/midori-app.c:1358
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "传输(_T)"
 
-#: ../midori/midori-app.c:1359
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
 msgstr "Netscape 插件(_L)"
 
-#: ../midori/midori-app.c:1360
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "已关闭的标签(_C)"
 
-#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5209
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "新建文件夹(_F)"
 
-#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420
-#: ../midori/midori-app.c:1423
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[地址]"
 
-#: ../midori/midori-array.c:522
+#: ../midori/midori-array.c:549
 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:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
 msgid "Malformed document."
 msgstr "异常文档。"
 
-#: ../midori/midori-array.c:628
+#: ../midori/midori-array.c:656
 msgid "Unrecognized bookmark format."
 msgstr "无法识别的书签格式。"
 
-#: ../midori/midori-array.c:915
-msgid "Writing failed."
-msgstr "无法写入。"
-
-#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "进入下一页面"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5353
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "转到下一子页面"
 
-#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5294
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr "在网络上搜索..."
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "重载当前页面"
 
-#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "停止载入当前页面"
 
-#: ../midori/midori-browser.c:509
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "无法更新标题:%s\n"
 
-#: ../midori/midori-browser.c:604
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "值 ‘%s’ 对 %s 无效"
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "意外的设置 ‘%s’"
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "意外的动作 ‘%s’。"
+
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s(私人浏览)"
 
-#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "无法插入新的历史项目:%s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "选择 [文本]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../midori/midori-browser.c:810
-msgid "New folder"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
 msgstr "新建文件夹"
 
-#: ../midori/midori-browser.c:810
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "编辑文件夹"
 
-#: ../midori/midori-browser.c:812
-msgid "New bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
 msgstr "新建书签"
 
-#: ../midori/midori-browser.c:812
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "编辑书签"
 
-#: ../midori/midori-browser.c:846
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "输入书签名字并选择保存位置"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "输入此书签的名称并选择保存位置。"
 
-#: ../midori/midori-browser.c:902
-msgid "Add to _Speed Dial"
-msgstr "添加至快速拨号(_S)"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "输入此文件夹的名称并选择保存位置。"
 
-#: ../midori/midori-browser.c:908
-msgid "Show in the tool_bar"
-msgstr "在工具栏中显示(_B)"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "显示在书签栏(_B)"
 
-#: ../midori/midori-browser.c:916
-msgid "Run as _web application"
-msgstr "作为网络应用程序运行(_W)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "添加至快速拨号(_S)"
 
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4447
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "文件另存为"
 
-#: ../midori/midori-browser.c:1036
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "保存相关资源(_R)"
 
-#: ../midori/midori-browser.c:1265
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "已打开了一个新窗口"
 
-#: ../midori/midori-browser.c:1268
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "已打开了一个新标签"
 
-#: ../midori/midori-browser.c:1285
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "打开图片时出错!"
 
-#: ../midori/midori-browser.c:1286
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "未能在默认的查看器中打开选中的图片。"
 
-#: ../midori/midori-browser.c:1292
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "下载图片时出错!"
 
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "未能下载选中的图片。"
 
-#: ../midori/midori-browser.c:1350
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../midori/midori-browser.c:2318
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "重载页面但不缓存"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:2444
+#: ../midori/midori-browser.c:2692
 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"
@@ -345,568 +379,570 @@ 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:2450 ../extensions/feed-panel/main.c:356
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "新建源"
 
-#: ../midori/midori-browser.c:2485 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "添加新书签"
 
-#: ../midori/midori-browser.c:3009 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "清空"
 
-#: ../midori/midori-browser.c:3404 ../midori/midori-browser.c:3405
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "切换文字光标导航"
 
-#: ../midori/midori-browser.c:3407
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr "按下 F7 切换光标浏览。激活时,一个文字光标将在所有网页上出现。"
 
-#: ../midori/midori-browser.c:3410
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "光标浏览(_E)"
 
-#: ../midori/midori-browser.c:3851 ../midori/midori-browser.c:5817
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "无法插入新的历史项目:%s\n"
-
-#: ../midori/midori-browser.c:4179 ../panels/midori-bookmarks.c:840
-#: ../panels/midori-history.c:797
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "全部在标签中打开(_T)"
 
-#: ../midori/midori-browser.c:4186 ../panels/midori-bookmarks.c:846
-#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519
-msgid "Open in New _Tab"
-msgstr "在新标签中打开(_T)"
-
-#: ../midori/midori-browser.c:4189 ../midori/midori-view.c:2633
-#: ../midori/midori-view.c:4431 ../panels/midori-bookmarks.c:848
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
 
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4279
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4280
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4281
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4282
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox(%s)"
 
-#: ../midori/midori-browser.c:4284
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4302
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "导入书签…"
 
-#: ../midori/midori-browser.c:4305 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "导入书签(_I)"
 
-#: ../midori/midori-browser.c:4316
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "应用程序(_A):"
 
-#: ../midori/midori-browser.c:4381
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "从 XBEL 或 HTML 文件导入"
 
-#: ../midori/midori-browser.c:4409
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "从文件导入"
 
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "无法导入书签"
 
-#: ../midori/midori-browser.c:4452
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL 书签"
 
-#: ../midori/midori-browser.c:4457
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape 书签"
 
-#: ../midori/midori-browser.c:4471
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Midori 只能导出为 XBEL(*.xbel) 和 Netscape(*.html)"
 
-#: ../midori/midori-browser.c:4486
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "无法导出书签"
 
-#: ../midori/midori-browser.c:4707
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "轻量级的网络浏览器。"
 
-#: ../midori/midori-browser.c:4708
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "查看 about:version 获取版本信息。"
 
-#: ../midori/midori-browser.c:4710
+#: ../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 ""
-"此库文件是自由软件;您可以以自由软件基金会发布的 GNU 宽通用公共许可协议 2.1 "
-"版或(您可以选择)更高版方式重新发布和/或修改它。"
+msgstr "此库文件是自由软件;您可以以自由软件基金会发布的 GNU 宽通用公共许可协议 2.1 版或(您可以选择)更高版方式重新发布和/或修改它。"
 
-#: ../midori/midori-browser.c:4745
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "张翼 <yatzhang@gmail.com>, 2009.\n"
 "Hunt Xu <mhuntxu@gmail.com>, 2009, 2010, 2011.\n"
-"Chipong Luo <chipong.luo@yahoo.com>, 2011, 2012."
+"Chipong Luo <chipong.luo@yahoo.com>, 2011, 2012.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Chipong Luo https://launchpad.net/~chipong-l\n"
+"  Chipong Luo https://launchpad.net/~chipong-luo\n"
+"  George Wells https://launchpad.net/~cimmia\n"
+"  Guanlin zhu https://launchpad.net/~784123822-6\n"
+"  Hunt Xu https://launchpad.net/~huntxu-live\n"
+"  Senzung https://launchpad.net/~chaoyan\n"
+"  Wang Dianjin https://launchpad.net/~tuhaihe\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  Whisper Blues https://launchpad.net/~youlansedeninan\n"
+"  Wylmer Wang https://launchpad.net/~wantinghard\n"
+"  Yangyu Huang https://launchpad.net/~yangyu-huang\n"
+"  colindemian https://launchpad.net/~dengmengpc\n"
+"  tomttou https://launchpad.net/~tomttou\n"
+"  wushanjun https://launchpad.net/~sjwuny"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "复制当前标签(_D)"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "打开一个新窗口"
 
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "打开一个新标签"
 
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "新建私人浏览窗口(_R)"
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "页面另存为(_S)…"
 
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "保存至文件"
 
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "添加至快速拨号(_D)"
 
-#. N_("Add Shortcut to the _desktop"), "",
-#: ../midori/midori-browser.c:5228
-msgid "Create _Launcher"
-msgstr "创建启动器(_L)"
-
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "订阅至新闻源(_F)"
 
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "关闭标签(_C)"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "关闭当前标签"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "关闭窗口(_L)"
 
-#: ../midori/midori-browser.c:5244
-msgid "_Share"
-msgstr "分享(_S)"
-
-#: ../midori/midori-browser.c:5245
-msgid "Share this page"
-msgstr "分享此页面"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "打印当前页面"
 
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "关闭所有窗口(_L)"
 
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "查找(_F)…"
 
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "在页面中查找字词或短语"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "配置应用程序首选项"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "工具栏(_T)"
 
-#: ../midori/midori-browser.c:5296
-msgid "Reload page without caching"
-msgstr "重载页面但不缓存"
-
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "增加缩放等级"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "减小缩放等级"
 
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "编码(_E)"
 
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "查看源码(_U)"
 
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "查看DOM代码(_D)"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "光标浏览(_R)"
 
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "切换全屏视图"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "向左滚动(_L)"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "向下滚动(_D)"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "向上滚动(_U)"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "向右滚动(_R)"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "可读(_R)"
 
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "返回上一页面"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "转到上一子页面"
 
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "后退或前进"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "前往历史记录的下一页面或子页面"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "主页(_H)"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "进入您的主页"
 
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "清空回收站"
 
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "撤销关闭标签(_C)"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "添加新文件夹(_F)"
 
-#: ../midori/midori-browser.c:5377
-msgid "_Export bookmarks"
-msgstr "导å\87ºä¹¦ç­¾(_E)"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "导å\85¥ä¹¦ç­¾(_I)..."
 
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "管理搜索引擎(_M)"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "导出书签(_E)..."
 
-#: ../midori/midori-browser.c:5383
-msgid "_Clear Private Data"
-msgstr "清除隐私数据(_C)"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "管理搜索引擎(_M)..."
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "清除隐私数据(_C)..."
+
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "检查页面(_I)"
 
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "上一标签(_P)"
 
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "移动标签至第一位(_F)"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "向后移动标签(_B)"
 
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "向前移动标签(_M)"
 
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "移动标签至最后一位(_L)"
 
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "聚焦当前标签(_C)"
 
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "聚焦下一视图(_N)"
 
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "仅显示当前标签的图标(_C)"
 
-#: ../midori/midori-browser.c:5413
-msgid "_Duplicate Current Tab"
-msgstr "复制当前标签(_D)"
-
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "关闭其它标签(_H)"
 
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "打开上次会话(_S)"
 
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "常见问题(_F)"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "报告问题(_R)…"
 
-#: ../midori/midori-browser.c:5432 ../midori/midori-browser.c:6089
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "菜单栏(_M)"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "导航栏(_N)"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "侧边栏(_P)"
 
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "侧边栏"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "书签栏(_B)"
 
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "状态栏(_S)"
 
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:200
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "自动(_A)"
 
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:124
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "繁体中文 (BIG5)"
 
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:125
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "简体中文 (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "日语(SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:127
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "韩语(EUC-KR)"
 
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:128
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "俄语(KOI8-R)"
 
-#: ../midori/midori-browser.c:5483 ../midori/midori-websettings.c:129
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "Unicode(UTF-8)"
 
-#: ../midori/midori-browser.c:5486 ../midori/midori-websettings.c:130
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "西方语言(ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "自定义…"
 
-#: ../midori/midori-browser.c:5995
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "无法初始化历史记录:%s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "分隔符(_S)"
 
-#: ../midori/midori-browser.c:6002
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "位置(_L)…"
 
-#: ../midori/midori-browser.c:6004
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "打开特定位置"
 
-#: ../midori/midori-browser.c:6026
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "网络搜索(_W)…"
 
-#: ../midori/midori-browser.c:6028
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "运行网络搜索"
 
-#: ../midori/midori-browser.c:6055
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "重新打开先前关闭的标签或窗口"
 
-#: ../midori/midori-browser.c:6072
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "显示已保存的书签"
 
-#: ../midori/midori-browser.c:6105
-msgid "_Window"
-msgstr "窗口(_W)"
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr "标签(_T)"
 
-#: ../midori/midori-browser.c:6107
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "显示所有打开标签的列表"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "菜单(_M)"
 
-#: ../midori/midori-browser.c:6123
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "菜单"
 
-#: ../midori/midori-browser.c:6903
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "意外的设置 ‘%s’"
-
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
 msgstr "未能载入扩展 ‘%s’ 的配置:%s\n"
 
-#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
 msgstr "未能保存扩展 ‘%s’ 的配置:%s\n"
 
-#: ../midori/midori-locationaction.c:1328
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "导出证书"
 
-#: ../midori/midori-locationaction.c:1360
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "证书签名机构未知。"
 
-#: ../midori/midori-locationaction.c:1362
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "证书与获得该证书的网站特征不匹配。"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "证书的激活时间在未来。"
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "证书已过期"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr "根据 GTlsConnection 的证书撤销列表,该证书已被撤销。"
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "证书的算法被认为是非安全的。"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "验证证书时发生其他错误。"
 
@@ -914,28 +950,28 @@ msgstr "验证证书时发生其他错误。"
 msgid "_Export certificate"
 msgstr "导出证书(_E)"
 
-#: ../midori/midori-locationaction.c:1434
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "自签名"
 
-#: ../midori/midori-locationaction.c:1468
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "安全信息"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1555
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "粘贴并继续(_R)"
 
-#: ../midori/midori-locationaction.c:1787
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "未验证"
 
-#: ../midori/midori-locationaction.c:1795
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "已验证的加密连接"
 
-#: ../midori/midori-locationaction.c:1802
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "打开未加密的连接"
 
@@ -952,770 +988,788 @@ msgstr "关闭侧边栏"
 msgid "Align sidepanel to the left"
 msgstr "侧边栏放在左边"
 
-#: ../midori/midori-websettings.c:106
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "显示快速拨号"
 
-#: ../midori/midori-websettings.c:107
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "显示主页"
 
-#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:339
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "显示上次打开的标签"
 
-#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:338
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "显示上次打开的标签但不载入"
 
-#: ../midori/midori-websettings.c:126
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr "显示空白页"
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr "显示默认搜索引擎"
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr "显示自定义页面"
+
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "日语(SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207
-#: ../katze/katze-utils.c:603
-msgid "Custom..."
-msgstr "自定义..."
-
-#: ../midori/midori-websettings.c:146
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "新建标签"
 
-#: ../midori/midori-websettings.c:147
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "新建窗口"
 
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "当前标签"
 
-#: ../midori/midori-websettings.c:163
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "默认"
 
-#: ../midori/midori-websettings.c:164
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "图标"
 
-#: ../midori/midori-websettings.c:165
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "小图标"
 
-#: ../midori/midori-websettings.c:166
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "文字"
 
-#: ../midori/midori-websettings.c:167
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "图标和文字"
 
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "文字在图标旁"
 
-#: ../midori/midori-websettings.c:183
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "自动(GNOME 或其它环境)"
 
-#: ../midori/midori-websettings.c:184
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP 代理服务器"
 
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "无代理服务器"
 
-#: ../midori/midori-websettings.c:202
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:203
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:280
-msgid "Toolbar Style:"
-msgstr "工具栏样式:"
-
-#: ../midori/midori-websettings.c:281
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "工具栏的样式"
 
-#: ../midori/midori-websettings.c:290
-msgid "When Midori starts:"
-msgstr "Midori 启动时:"
-
-#: ../midori/midori-websettings.c:327
-msgid "Open new pages in:"
-msgstr "在此打开新页面:"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:390
-msgid "Identify as"
-msgstr "识别为"
-
-#: ../midori/midori-websettings.c:391
-msgid "What to identify as to web pages"
-msgstr "让网页识别为什么"
-
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "总是使用我的字体选择"
 
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "使用用户首选项替换网站采用的字体"
 
-#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "未能载入配置:%s\n"
 
-#: ../midori/midori-websettings.c:1360
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "值 ‘%s’ 对 %s 无效"
-
-#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "无效的配置值 ‘%s’"
 
-#: ../midori/midori-tab.vala:117
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
 msgstr "无法插入样式表:%s"
 
-#: ../midori/midori-view.c:725 ../midori/midori-view.c:866
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "显示标签标记(_L)"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "仅显示标签图标(_I)"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "关闭右边标签(_I)"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "关闭其它标签(_H)"
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "信任此站点"
 
-#: ../midori/midori-view.c:864
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "安全性未知"
 
-#: ../midori/midori-view.c:1162
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s 要保存 HTML5 数据库。"
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "允许(_A)"
 
-#: ../midori/midori-view.c:1194
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s 要获知您的位置。"
 
-#: ../midori/midori-view.c:1305
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr "无法找到“%s”"
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr "无法加载页面“%s”:"
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "检查地址里的拼写错误"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "请确保已经插入网线或已启用无线网络"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "验证您的网络设置是否正确"
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "重试"
+
+#: ../midori/midori-view.c:1346
 #, c-format
-msgid "Error - %s"
-msgstr "错误-%s"
+msgid "Oops - %s"
+msgstr "唉呀 - %s"
 
-#: ../midori/midori-view.c:1306
+#: ../midori/midori-view.c:1347
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "未能载入 ‘%s’ 页面。"
+msgid "Something went wrong with '%s'."
+msgstr "‘%s’ 中出错了。"
 
-#: ../midori/midori-view.c:1308
+#: ../midori/midori-view.c:1349
 msgid "Try again"
 msgstr "重试"
 
-#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2574
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "向 %s 发送邮件"
 
-#: ../midori/midori-view.c:2362
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "添加搜索引擎(_S)..."
 
-#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2709
-msgid "Inspect _Element"
-msgstr "æ£\80æ\9f¥å\85\83ç´ (_E)"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "æ\89\93å¼\80é\93¾æ\8e¥(_L)"
 
-#: ../midori/midori-view.c:2457
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "在新标签中打开链接(_T)"
 
-#: ../midori/midori-view.c:2461
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "在前台标签中打开链接(_F)"
 
-#: ../midori/midori-view.c:2462
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "在后台标签中打开链接(_B)"
 
-#: ../midori/midori-view.c:2465
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "在新窗口中打开链接(_W)"
 
-#: ../midori/midori-view.c:2468
-msgid "Open Link as Web A_pplication"
-msgstr "将链接作为网络应用程序打开(_P)"
-
-#: ../midori/midori-view.c:2473
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "复制链接目的地(_S)"
 
-#: ../midori/midori-view.c:2479
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "另存为(_A)…"
 
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr "在新窗口打开图像(_I)"
+
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "在新标签中打开图片(_I)"
 
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "复制图片(_A)"
 
-#: ../midori/midori-view.c:2494
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "保存图片(_M)"
 
-#: ../midori/midori-view.c:2497
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "在图片查看器中打开(_V)"
 
-#: ../midori/midori-view.c:2504
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "复制视频地址(_A)"
 
-#: ../midori/midori-view.c:2507
-msgid "Save _Video"
-msgstr "保存视频(_V)"
-
-#: ../midori/midori-view.c:2507
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "下载视频(_V)"
 
-#: ../midori/midori-view.c:2533
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "在新标签中打开地址(_T)"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "搜索方式(_W)"
 
-#: ../midori/midori-view.c:2562
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "搜索网络(_S)"
 
-#: ../midori/midori-view.c:2582
-msgid "Open Address in New _Tab"
-msgstr "在新标签中打开地址(_T)"
-
-#: ../midori/midori-view.c:2629
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "在新标签中打开帧(_F)"
 
-#: ../midori/midori-view.c:2841
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "检查元素(_E)"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "从 %s 打开或下载文件"
 
-#: ../midori/midori-view.c:2854
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "文件名:%s"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "文件类型:‘%s’"
 
-#: ../midori/midori-view.c:2861
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "文件类型:%s(‘%s’)"
 
-#: ../midori/midori-view.c:2898
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "大小: %s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "打开 %s"
 
-#: ../midori/midori-view.c:3435
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "检查页面-%s"
 
-#: ../midori/midori-view.c:3850
-#, c-format
-msgid "No documentation installed"
-msgstr "未安装文档"
-
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori 没有存储任何个人数据:"
 
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "未保存历史或网络隐私信息。"
 
-#: ../midori/midori-view.c:3928
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "已禁用扩展。"
 
-#: ../midori/midori-view.c:3929
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "已禁用 HTML5 存储、本地数据库和应用程序缓存。"
 
-#: ../midori/midori-view.c:3930
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori 阻止网站追踪用户:"
 
-#: ../midori/midori-view.c:3931
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "剥离提交信息 URL 为主机名。"
 
-#: ../midori/midori-view.c:3932
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "已禁用 DNS 预取。"
 
-#: ../midori/midori-view.c:3933
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "不向网站透露语言和时区。"
 
-#: ../midori/midori-view.c:3934
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "网站未能列出动画和其它 Netscape 插件。"
 
-#: ../midori/midori-view.c:4013
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "在括号中的版本号显示运行时的版本。"
 
-#: ../midori/midori-view.c:4059
-msgid "Page loading delayed"
-msgstr "页面载入发生延迟"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "页面加载延时:"
 
-#: ../midori/midori-view.c:4060
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "由于最近的崩溃或启动首选项,载入页面发生延迟。"
 
-#: ../midori/midori-view.c:4061
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "载入页面"
 
-#: ../midori/midori-view.c:4225
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "空白页面"
 
-#: ../midori/midori-view.c:4435
-msgid "_Duplicate Tab"
-msgstr "复制标签(_D)"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Label"
-msgstr "显示标签标记(_L)"
-
-#: ../midori/midori-view.c:4440
-msgid "Show Tab _Icon Only"
-msgstr "仅显示标签图标(_I)"
-
-#: ../midori/midori-view.c:4447
-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:5122
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "上一个"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5141
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "下一个"
 
-#: ../midori/midori-view.c:5154
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "打印背景图片"
 
-#: ../midori/midori-view.c:5155
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "是否打印页面的背景图片"
 
-#: ../midori/midori-view.c:5179
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "功能"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:54
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s/%s"
 
-#: ../midori/midori-download.vala:70
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../midori/midori-download.vala:71
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
-#: ../midori/midori-download.vala:72
+#: ../midori/midori-download.vala:77
 #, 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:87
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
-msgstr "-%s 剩余"
+msgstr " -%s 剩余"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:98
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:100
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
-msgstr "(%s/s)"
+msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:197
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "已下载的文件不正确。"
 
-#: ../midori/midori-download.vala:198
+#: ../midori/midori-download.vala:221
 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:312
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "未能在此文件夹中保存 “%s“ 文件。"
 
-#: ../midori/midori-download.vala:314
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "您没有权限在此位置写入。"
 
-#: ../midori/midori-download.vala:317
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "没有足够的空闲空间用来下载 “%s”。"
 
-#: ../midori/midori-download.vala:319
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "此文件需要 %s 但只剩余 %s。"
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "快速拨号"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "点击添加快捷方式"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "输入快捷方式地址"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "输入快捷方式标题"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "您确定要删除此快捷方式吗?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "启动"
 
-#: ../midori/midori-preferences.c:305
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr "Midori 启动时:"
+
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "主页:"
 
-#: ../midori/midori-preferences.c:313
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "使用当前页面(_C)"
 
-#: ../midori/midori-preferences.c:317
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "使用当前页面作为主页"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "字体"
 
-#: ../midori/midori-preferences.c:328
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "合适的字体族"
 
-#: ../midori/midori-preferences.c:332
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "用来显示文字的默认字体族"
 
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "用来显示文字的默认字体大小"
 
-#: ../midori/midori-preferences.c:337
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "等宽字体族"
 
-#: ../midori/midori-preferences.c:341
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "用来显示等宽文字的字体族"
 
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "用来显示等宽文字的字体大小"
 
-#: ../midori/midori-preferences.c:346
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "最小字体大小"
 
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "用来显示文字的最小字体大小"
 
-#: ../midori/midori-preferences.c:354
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "首选编码"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "行为"
 
-#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "自动载入图片"
 
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "启用拼写检查"
 
-#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "启用脚本"
 
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "启用 WebGL 支持"
 
-#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "启用 Netscape 插件"
-
-#: ../midori/midori-preferences.c:393
+#: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "缩放文字和图片"
 
-#: ../midori/midori-preferences.c:396
+#: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
 msgstr "允许脚本打开弹出窗口"
 
-#: ../midori/midori-preferences.c:397
+#: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
 msgstr "是否允许脚本自动打开弹出窗口"
 
-#: ../midori/midori-preferences.c:403
-msgid "Kinetic scrolling"
-msgstr "动态滚动"
-
-#: ../midori/midori-preferences.c:404
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "滚动是否按速度动态地移动"
-
-#: ../midori/midori-preferences.c:409
-msgid "Middle click opens Selection"
-msgstr "中击打开所选内容"
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "默认页面放大比例"
 
-#: ../midori/midori-preferences.c:410
-msgid "Load an address from the selection via middle click"
-msgstr "通过中击从所选内容中载入地址"
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "放大新打开的标签的初始因子:"
 
-#: ../midori/midori-preferences.c:415
-msgid "Flash window on background tabs"
-msgstr "在后台标签的窗口闪烁"
-
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "首选语言"
 
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:426
 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”"
+"一个由逗号分隔的用以显示多语言网页的首选语言列表,例如 “de”,“ru,nl” 或 “en-us;q=1.0, fr-fr;q=0.667”"
 
-#: ../midori/midori-preferences.c:426
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "保存下载的文件至:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:433
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "浏览"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "主题:"
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr "工具栏样式:"
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr "在此打开新页面:"
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr "新标签行为:"
+
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "标签上有关闭按钮"
 
-#: ../midori/midori-preferences.c:451
-msgid "Always Show Tabbar"
-msgstr "总是显示标签栏"
-
-#: ../midori/midori-preferences.c:455
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "在当前标签后打开标签"
 
-#: ../midori/midori-preferences.c:456
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "在当前标签后还是在上一标签后打开新标签"
 
-#: ../midori/midori-preferences.c:459
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "在后台打开标签"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "文本编辑器"
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "新闻聚合器"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:475
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "网络"
 
-#: ../midori/midori-preferences.c:477
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "代理服务器"
 
-#: ../midori/midori-preferences.c:482
-msgid "Hostname"
-msgstr "主机名"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "统一资源定位符(URI)"
 
-#: ../midori/midori-preferences.c:490
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "端口"
 
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr "支持的代理类型:"
+
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "网页缓存"
 
-#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "磁盘上缓存页面最大值"
 
-#: ../midori/midori-preferences.c:507
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "M"
 
-#: ../midori/midori-preferences.c:526
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr "识别为"
+
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "私人"
 
-#: ../midori/midori-preferences.c:528
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "删除此后的原隐私信息:"
 
-#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "最长隐私信息保存天数"
 
-#: ../midori/midori-preferences.c:537
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "只接受您访问的网站的隐私信息"
 
-#: ../midori/midori-preferences.c:538
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "屏蔽第三方网站发送的隐私信息"
 
-#: ../midori/midori-preferences.c:543
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr "隐私信息存储登录数据、游戏状态或用于广告目的用户分布信息。"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "启用离线网络应用程序缓存"
 
-#: ../midori/midori-preferences.c:553
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "启用 HTML5 本地存储支持"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:557
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "剥离向站点发送的提交信息详情"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "“提交信息” 头文件是否缩短为主机名"
 
-#: ../midori/midori-preferences.c:562
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "删除此历史后的页面:"
 
-#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "最长历史保存天数"
 
-#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
 msgstr "扩展"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "管理搜索引擎(_M)"
+
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "添加搜索引擎"
 
-#: ../midori/midori-searchaction.c:1043
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "编辑搜索引擎"
 
-#: ../midori/midori-searchaction.c:1071
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "名称(_N):"
 
-#: ../midori/midori-searchaction.c:1086
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../midori/midori-searchaction.c:1099 ../extensions/feed-panel/main.c:368
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "地址(_A):"
 
@@ -1741,49 +1795,49 @@ msgstr "未能载入搜索引擎。%s\n"
 msgid "The search engines couldn't be saved. %s"
 msgstr "未能保存搜索引擎。%s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "历史"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "书签和历史"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "æ\97 æ³\95å\88\9då§\8bå\8c\96å\8e\86å\8f²è®°å½\95ï¼\9a%s"
+msgid "Search for %s"
+msgstr "æ\90\9cç´¢ %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "无法从历史记录中选择: %s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "搜索 %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "搜索方式…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "用 %s 搜索"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "打开方式"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "挑选打开 “%s” 的应用程序或命令:"
 
-#: ../midori/sokoke.c:366 ../midori/sokoke.c:380
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "未能运行外部程序。"
 
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr "无效的 URI"
+
 #. i18n: A panel at the bottom, to search text in pages
 #: ../toolbars/midori-findbar.c:233
 msgid "_Inline Find:"
@@ -1805,118 +1859,136 @@ msgstr "匹配大小写"
 msgid "Close Findbar"
 msgstr "关闭查找栏"
 
-#: ../toolbars/midori-transferbar.c:109
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "The file '<b>%s</b>' has been downloaded."
-msgstr "文件 ‘<b>%s</b>’ 已经下载。"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d 个书签"
 
-#: ../toolbars/midori-transferbar.c:114
-msgid "Transfer completed"
-msgstr "传输已完成"
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d 个子目录"
 
-#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
-msgid "Clear All"
-msgstr "全部清除"
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "空文件夹"
 
-#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
-msgid "Some files are being downloaded"
-msgstr "有些文件正在下载"
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "文件夹包含 %s,不含书签"
 
-#: ../toolbars/midori-transferbar.c:278
-msgid "_Quit Midori"
-msgstr "退出 Midori(_Q)"
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "文件夹包含 %s"
 
-#: ../toolbars/midori-transferbar.c:280
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "如果退出 Midori 则取消传输。"
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "文件夹包含 %s 和 %s"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "无法添加书签项目:%s\n"
+msgid "Bookmark leading to: %s"
+msgstr "书签指向:%s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s,没有书签"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "无法更新书签: %s\n"
+msgid "%s and %s"
+msgstr "%s 和 %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "编辑选中的书签"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "删除选中的书签"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "添加新文件夹"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>分隔符</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "在新标签中打开(_T)"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1017
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "搜索书签"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "历史"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "今天"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "一周前"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "无法移除历史项目:%s\n"
 
-#: ../panels/midori-history.c:362
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "您确定要移除所有历史项目吗?"
 
-#: ../panels/midori-history.c:409
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "将选中的历史项目加入书签"
 
-#: ../panels/midori-history.c:418
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "删除选中的历史项目"
 
-#: ../panels/midori-history.c:426
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "清除全部历史"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:988
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "搜索历史"
 
-#: ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "传输"
-
-#: ../panels/midori-transfers.c:435
-msgid "Open Destination _Folder"
-msgstr "打开目的地文件夹(_F)"
-
-#: ../panels/midori-transfers.c:438
-msgid "Copy Link Loc_ation"
-msgstr "复制链接位置(_A)"
-
 #: ../katze/katze-http-auth.c:210
 msgid "Authentication Required"
 msgstr "需要认证"
@@ -1941,113 +2013,63 @@ msgstr "密码"
 msgid "_Remember password"
 msgstr "记住密码(_R)"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "未能载入已命名图标 ‘%s’"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "未能载入备用图标 ‘%s’"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "动画帧损坏"
+#: ../katze/katze-utils.c:386
+msgid "None"
+msgstr "无"
 
-#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "属性 ‘%s’ 对 ‘%s’ 无效"
 
-#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488
-#: ../extensions/addons.c:309
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "挑选文件"
 
-#: ../katze/katze-utils.c:474
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "挑选文件夹"
 
-#: ../katze/katze-utils.c:572
-msgid "None"
-msgstr "无"
-
-#: ../katze/katze-utils.c:687
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "一小时"
 
-#: ../katze/katze-utils.c:688
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "一天"
 
-#: ../katze/katze-utils.c:689
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "一周"
 
-#: ../katze/katze-utils.c:690
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "一月"
 
-#: ../katze/katze-utils.c:691
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "一年"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:235
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "%s 首选项"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 校验和:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 校验和:"
 
-#: ../extensions/adblock.c:484
-msgid "Configure Advertisement filters"
-msgstr "配置广告过滤器"
-
-#: ../extensions/adblock.c:515
-#, 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:929
-msgid "Edit rule"
-msgstr "编辑规则"
-
-#: ../extensions/adblock.c:943
-msgid "_Rule:"
-msgstr "规则(_R):"
-
-#: ../extensions/adblock.c:997
-msgid "Bl_ock image"
-msgstr "屏蔽图片(_O)"
-
-#: ../extensions/adblock.c:1002
-msgid "Bl_ock link"
-msgstr "屏蔽链接(_O)"
-
-#: ../extensions/adblock.c:1928
-msgid "Advertisement blocker"
-msgstr "广告屏蔽器"
-
-#: ../extensions/adblock.c:1929
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
 msgstr "此页面看来包含一个用户脚本。您想安装它吗?"
 
 #: ../extensions/addons.c:223
@@ -2067,71 +2089,71 @@ msgstr "安装用户样式(_I)"
 msgid "Don't install"
 msgstr "不安装"
 
-#: ../extensions/addons.c:320 ../extensions/addons.c:675
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
 msgstr "用户脚本"
 
-#: ../extensions/addons.c:325 ../extensions/addons.c:677
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "用户样式"
 
-#: ../extensions/addons.c:371 ../extensions/addons.c:450
-#: ../extensions/feed-panel/main.c:120
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "错误"
 
-#: ../extensions/addons.c:412
+#: ../extensions/addons.c:411
 #, c-format
 msgid "Do you want to delete '%s'?"
 msgstr "您要删除 ‘%s’ 吗?"
 
-#: ../extensions/addons.c:418
+#: ../extensions/addons.c:417
 msgid "Delete user script"
 msgstr "删除用户脚本"
 
-#: ../extensions/addons.c:419
+#: ../extensions/addons.c:418
 msgid "Delete user style"
 msgstr "删除用户样式"
 
-#: ../extensions/addons.c:422
+#: ../extensions/addons.c:421
 #, c-format
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "将永远删除 <b>%s</b> 文件。"
 
-#: ../extensions/addons.c:564 ../extensions/addons.c:641
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "在文本编辑器中打开"
 
-#: ../extensions/addons.c:566 ../extensions/addons.c:650
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "打开目标文件夹"
 
-#: ../extensions/addons.c:632
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "添加新插件"
 
-#: ../extensions/addons.c:658
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "移除选中的插件"
 
-#: ../extensions/addons.c:1677 ../extensions/addons.c:1893
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "用户插件"
 
-#: ../extensions/addons.c:1807
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "未能监视 ‘%s’ 文件夹:%s"
 
-#: ../extensions/addons.c:1894
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
 msgstr "支持用户脚本和用户样式"
 
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "彩色标签"
 
-#: ../extensions/colorful-tabs.c:204
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "用不同颜色区分标签"
 
@@ -2140,43 +2162,41 @@ msgstr "用不同颜色区分标签"
 msgid "Cookie Manager"
 msgstr "隐私信息管理器"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "全部删除"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
-msgstr ""
-"删除所有已显示的隐私信息。如果设置了过滤器,则只删除与此过滤器匹配的隐私信"
-"息。"
+msgstr "删除所有已显示的隐私信息。如果设置了过滤器,则只删除与此过滤器匹配的隐私信息。"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "全部展开"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "全部折叠"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:572
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 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:573
 msgid "Question"
 msgstr "问题"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:583
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "只删除与此过滤器匹配的隐私信息。"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "在会话结束时"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2194,15 +2214,15 @@ msgstr ""
 "<b>有效期</b>:%s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "是"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:684
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "否"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:699
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2211,19 +2231,20 @@ msgstr ""
 "<b>域</b>:%s\n"
 "<b>隐私信息</b>:%d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1022
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "名称"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1074
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "全部展开(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1082
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "全部折叠(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1134
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "以名称或者域名搜索 Cookies"
 
@@ -2243,24 +2264,45 @@ msgstr "复制标签的地址"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "将所有标签的地址复制至剪贴板"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "延迟加载"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "加载页面前延迟的秒数:"
-
-#: ../extensions/delayed-load.vala:210
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "直到您使用该标签才加载页面内容。"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "双击查看更多信息"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "此插件在系统托盘里显示glib的错误信息。"
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "尝试使用以下插件下载文件时发生错误:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"在尝试下载下列插件的文件时遇到了一个错误:\n"
+"%s\n"
+"\n"
+"错误:\n"
+"%s\n"
+"\n"
+"不使用这个插件,继续。"
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2287,38 +2329,38 @@ msgstr "命令:"
 msgid "Download files with \"%s\" or a custom command"
 msgstr "使用 \"%s\" 或自定义命令下载文件"
 
-#: ../extensions/external-download-manager.vala:318
+#: ../extensions/external-download-manager.vala:320
 msgid "External Download Manager - CommandLine"
 msgstr "外部下载管理器 - 命令行"
 
-#: ../extensions/feed-panel/feed-atom.c:209
+#: ../extensions/feed-panel/feed-atom.c:208
 msgid "Failed to find required Atom \"entry\" elements in XML data."
 msgstr "无法在 XML 数据中查找所需的 Atom “条目” 元素。"
 
-#: ../extensions/feed-panel/feed-atom.c:315
+#: ../extensions/feed-panel/feed-atom.c:314
 msgid "Failed to find required Atom \"feed\" elements in XML data."
 msgstr "无法在 XML 数据中查找所需的 Atom “源” 元素。"
 
 #. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:378
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "最后更新:%s。"
 
-#: ../extensions/feed-panel/feed-panel.c:644
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "源"
 
-#: ../extensions/feed-panel/feed-panel.c:697
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "添加新源"
 
-#: ../extensions/feed-panel/feed-panel.c:704
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "删除源"
 
-#: ../extensions/feed-panel/feed-panel.c:784
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "源(_F)"
 
@@ -2327,47 +2369,47 @@ msgstr "源(_F)"
 msgid "Failed to find root element in feed XML data."
 msgstr "无法在源 XML 数据中查找根元素。"
 
-#: ../extensions/feed-panel/feed-parse.c:235
+#: ../extensions/feed-panel/feed-parse.c:237
 #, c-format
 msgid "Unsupported feed format."
 msgstr "不支持的源格式。"
 
-#: ../extensions/feed-panel/feed-parse.c:265
+#: ../extensions/feed-panel/feed-parse.c:267
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr "无法解析 XML 源:%s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "无法在 RSS XML 数据中查找 “频道” 元素。"
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "找到了不支持的 RSS 版本。"
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "无法在 XML 数据中查找所需的 RSS “项目” 元素。"
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "无法在 XML 数据中查找所需的 RSS “频道” 元素。"
 
-#: ../extensions/feed-panel/main.c:122
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "源 ‘%s’ 已经存在"
 
-#: ../extensions/feed-panel/main.c:199
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "载入源 ‘%s’ 时出错"
 
-#: ../extensions/feed-panel/main.c:509
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "源面板"
 
-#: ../extensions/feed-panel/main.c:510
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "阅读 Atom/RSS 源"
 
@@ -2388,122 +2430,400 @@ msgstr ""
 "需要主密码来\n"
 "打开密码数据库:"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "记住此页的密码?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "记住"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "现在不"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "对此页从不"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "切换表单历史状态"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "为当前标签激活或停用表单历史。"
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "无法打开数据库:%s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "无法执行数据库语句:%s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "在每个标签上通过热键(Ctrl + Shift + F)只激活表单历史"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "表单历史填写器"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "存储已输入的表单数据历史"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "无法选择建议\n"
 
-#: ../extensions/history-list.vala:197
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "没有未浏览的标签"
 
-#: ../extensions/history-list.vala:235
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "历史列表"
 
-#: ../extensions/history-list.vala:275
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "标签关闭行为"
 
-#: ../extensions/history-list.vala:283
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "不做"
 
-#: ../extensions/history-list.vala:289
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "切换至上次查看的标签"
 
-#: ../extensions/history-list.vala:295
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "切换至最新标签"
 
-#: ../extensions/history-list.vala:423
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr "在后台标签的窗口闪烁"
+
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "下一新标签(历史列表)"
 
-#: ../extensions/history-list.vala:424
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "历史中的下一新标签"
 
-#: ../extensions/history-list.vala:433
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "上一新标签(历史列表)"
 
-#: ../extensions/history-list.vala:434
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "历史中的上一新标签"
 
-#: ../extensions/history-list.vala:443
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "在后台显示标签(历史列表)"
 
-#: ../extensions/history-list.vala:444
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "在后台显示当前选中的标签"
 
-#: ../extensions/history-list.vala:571
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "历史列表"
 
-#: ../extensions/history-list.vala:572
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "切换或关闭标签时移动至上次使用的标签"
 
-#: ../extensions/mouse-gestures.c:297
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "执行 SQL 失败:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "接受"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "仅本次会话接受"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "拒绝"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "无法打开该扩展程序的数据库:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "执行数据库语句失败:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "确定删除所有JavaScript的权限许可吗?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "删除所有JavaScript的权限吗?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr "该操作将会删除所有JavaScript权限,当你打开每个网站时会被询问该权限。"
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "管理器实例"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "全局NoJS数据管理的实例"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "配置NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr "下面是所有网站和为他们设置的策略列表。你可以删除策略,通过选中条目点击  <i>删除</i>."
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "域名"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "策略"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "全部删除(_A)"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "允许所有站点执行脚本(_L)"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "默认屏蔽来自未知域名的脚本(_K)"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "设定二级域名许可(_E)"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "拒绝%s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "允许%s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "本次会话允许%s"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "浏览器窗口"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "此视图所属的 Midori 浏览器实例"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "视图"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "此视图所属的 Midori 视图实例"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "菜单图标状态"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "状态栏菜单图标的显示状态"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "未确认"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "已允许"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "混合"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "已拒绝"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr "出现一个阻止NoJS扩展运行的致命错误。您应该禁用该扩展。"
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "NoJS扩展出错"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "原因"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "无法为扩展程序“%s”创建配置文件夹。"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "无法为扩展程序创建配置文件夹"
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "无法打开扩展程序的数据库。"
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "无法建立扩展程序的数据库结构。"
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "扩展程序实例"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "这个扩展程序的 Midori 扩展程序实例"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "应用程序实例"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "这个扩展程序属于 Midori 应用程序实例"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "数据库实例"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "这个扩展程序使用的 sqlite 数据库实例指针"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "数据库路径"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "这个扩展程序使用的 sqlite 数据库实例路径"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "允许所有网站"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr "若允许,此扩展将不会检查每一个站点的条款而直接允许它们。"
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "仅限于第二阶乘"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr "若值为真,则此扩展会将每个域名简化为二级域名(www.example.org 将会简化为 example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "未知域名策略"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "对未知域名使用的策略。"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "暂时接受"
+
+#: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
-#: ../extensions/mouse-gestures.c:298
+#: ../extensions/mouse-gestures.c:514
 msgid "Control Midori by moving the mouse"
 msgstr "通过移动鼠标控制 Midori"
 
@@ -2516,8 +2836,8 @@ msgid "Customize Keyboard shortcuts"
 msgstr "自定义键盘快捷键"
 
 #: ../extensions/shortcuts.c:275
-msgid "Customize Sh_ortcuts..."
-msgstr "自定义快捷键(_O)..."
+msgid "Customize Sh_ortcuts"
+msgstr "自定义快捷键(_O)"
 
 #: ../extensions/shortcuts.c:312
 msgid "Shortcuts"
@@ -2527,11 +2847,11 @@ msgstr "快捷键"
 msgid "View and edit keyboard shortcuts"
 msgstr "查看和编辑键盘快捷键"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "状态栏时钟"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "在状态栏中显示日期和时间"
 
@@ -2547,6 +2867,10 @@ msgstr "脚本"
 msgid "Netscape plugins"
 msgstr "Netscape 插件"
 
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "启用 Netscape 插件"
+
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
 msgstr "状态栏功能"
@@ -2555,15 +2879,15 @@ msgstr "状态栏功能"
 msgid "Easily toggle features on web pages on and off"
 msgstr "方便地打开或关闭网页中的功能"
 
-#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "标签面板"
 
-#: ../extensions/tab-panel.c:656
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "标签面板(_A)"
 
-#: ../extensions/tab-panel.c:674
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "在竖直面板里显示标签"
 
@@ -2575,76 +2899,68 @@ msgstr "默认仅标签上的图标"
 msgid "New tabs have no label by default"
 msgstr "新标签默认没有标记"
 
-#: ../extensions/toolbar-editor.c:395
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "自定义工具栏"
 
-#: ../extensions/toolbar-editor.c:411
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr "选择要在工具栏上显示的项目。可以拖放各项目调整顺序。"
 
-#: ../extensions/toolbar-editor.c:427
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "可用项目"
 
-#: ../extensions/toolbar-editor.c:448
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "已显示的项目"
 
-#: ../extensions/toolbar-editor.c:588
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "自定义工具栏(_C)…"
 
-#: ../extensions/toolbar-editor.c:617
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "工具栏编辑器"
 
-#: ../extensions/toolbar-editor.c:618
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "轻松地编辑工具栏布局"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "在磁盘上缓存 HTTP 通讯"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "无法载入 cookies\n"
-
+#. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:120
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "清除隐私数据"
 
-#: ../midori/midori-privatedata.c:124
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "清除隐私数据(_C)"
 
-#: ../midori/midori-privatedata.c:137
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "清除以下数据:"
 
-#: ../midori/midori-privatedata.c:147
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "上次打开的标签(_T)"
 
-#: ../midori/midori-privatedata.c:173
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "退出 Midori 时清除隐私数据(_Q)"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:298
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "已保存的用户名和密码(_P)"
 
-#: ../midori/midori-privatedata.c:300
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "隐私信息和网站数据"
 
-#: ../midori/midori-privatedata.c:307
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "网站图标"
 
@@ -2652,388 +2968,495 @@ msgstr "网站图标"
 msgid "Open tabs"
 msgstr "打开的标签"
 
-#: ../midori/midori-viewcompletion.vala:67
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "更多打开的标签..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "无法清除历史:%s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "无法移除原历史项目:%s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "连接旧数据库失败"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "无法从旧数据库中导入"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "回滚事务失败"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "分离失败"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "无法创建书签表: %s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "无法添加书签项目:%s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "æ\97 æ³\95ä»\8eæ\95°æ\8d®åº\93中导å\85¥: %s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "æ\9b´æ\96°ä¹¦ç­¾ %s å¤±è´¥\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "未能保存书签。%s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "移除书签条目“%s”失败\n"
 
-#: ../midori/midori-session.c:187
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr "无有效的根证书文件。未能验证 SSL 证书。"
 
-#: ../midori/midori-session.c:355
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "未能保存配置。%s"
 
-#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:449
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "未能载入会话:%s\n"
-
-#: ../midori/midori-session.c:406
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "未能保存会话。%s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:126
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "未能保存回收站。%s"
 
-#: ../midori/midori-frontend.c:309
+#: ../midori/midori-frontend.c:335
+#, c-format
 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 crashed the last time it was opened. You can report the problem at %s."
+msgstr "Midori 上次在打开后崩溃了。你可以到 %s 报告问题。"
 
-#: ../midori/midori-frontend.c:319
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "修改首选项(_P)"
 
-#: ../midori/midori-frontend.c:323
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
 msgstr "禁用所有扩展(_E)"
 
-#: ../midori/midori-frontend.c:332
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Midori 崩溃后显示对话框"
 
-#: ../midori/midori-frontend.c:337
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "舍弃原标签"
 
-#: ../midori/midori-frontend.c:401
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr "显示上次的崩溃日志(_L)"
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr "在调试器内运行(_D)"
+
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "已有一个 Midori 实例在运行但无响应。\n"
 
-#: ../midori/midori-frontend.c:434
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "未能载入书签:%s\n"
 
-#: ../midori/midori-frontend.c:465
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "未能载入会话:%s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "未能载入回收站:%s\n"
 
-#: ../midori/midori-frontend.c:473
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "未能载入历史:%s\n"
 
-#: ../midori/midori-frontend.c:484
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "发生了以下错误:"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "重定向控制台警告信息至指定的‘文件名’"
-
-#~ msgid "FILENAME"
-#~ msgstr "文件名"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "添加快捷方式至桌面(_D)"
-
-#~ msgid "_Bookmark"
-#~ msgstr "书签(_B)"
-
-#~ msgid "_Console"
-#~ msgstr "控制台(_C)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr "无法打开扩展程序“%s”的数据库。"
 
-#~ msgid "Toplevel folder"
-#~ msgstr "最上层文件夹"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr "您确定要删除所有 cookie 的权限吗?"
 
-#~ msgid "_Title:"
-#~ msgstr "标题(_T):"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr "删除所有 cookie 的权限?"
 
-#~ msgid "_Folder:"
-#~ msgstr "文件夹(_F):"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr "这个操作将会删除所有 cookie 的权限。你将会被再一次询问你访问的每一个网站的权限。"
 
-#~ msgid "Remember last window size"
-#~ msgstr "记住上个窗口的大小"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr "Cookie 权限管理器"
 
-#~ msgid "Whether to save the last window size"
-#~ msgstr "是否保存上个窗口的大小"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr "当前 cookie 权限管理器的实例"
 
-#~ msgid "Last window width"
-#~ msgstr "上个窗口宽度"
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr "配置 cookie 权限"
 
-#~ msgid "The last saved window width"
-#~ msgstr "上个保存的窗口宽度"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+"下面列出的是所有网站和它们的策略。您可以标记条目并点击<i>删除</i>来删除策略。您还可以在下面输入域名,选择策略后点击<i>添加</i>来手动为一个域"
+"名添加一个策略。"
 
-#~ msgid "Last window height"
-#~ msgstr "上个窗口高度"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "对来自非列表内域名Cookie的策略: "
 
-#~ msgid "The last saved window height"
-#~ msgstr "上个保存的窗口高度"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "询问并决定"
 
-#~ msgid "Last panel position"
-#~ msgstr "上个侧边栏位置"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr "发生了一个致命错误阻止扩展程序“Cookie 权限管理器”继续运行。您最好关闭它。"
 
-#~ msgid "The last saved panel position"
-#~ msgstr "上个保存的侧边栏位置"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr "Cookie 权限管理器中发生了错误"
 
-#~ msgid "Last panel page"
-#~ msgstr "上个侧边栏页面"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr "无法为域名“%s”确定要设置的全局 cookie 策略。"
 
-#~ msgid "The last saved panel page"
-#~ msgstr "上个保存的侧边栏页面"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr "直到会话结束"
 
-#~ msgid "Last Web search"
-#~ msgstr "上个网络搜索"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr "网站“%s”想要保存 %d 条 cookie。"
 
-#~ msgid "The last saved Web search"
-#~ msgstr "上个保存的网络搜索"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr "网站“%s”想要存储一条 cookie。"
 
-#~ msgid "Show Menubar"
-#~ msgstr "显示菜单栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr "多个网站想要存储共 %d 条 cookies。"
 
-#~ msgid "Whether to show the menubar"
-#~ msgstr "是否显示菜单栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr "接受(_A)"
 
-#~ msgid "Show Navigationbar"
-#~ msgstr "显示导航栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr "仅这次允许(_S)"
 
-#~ msgid "Whether to show the navigationbar"
-#~ msgstr "是否显示导航栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr "拒绝(_N)"
 
-#~ msgid "Show Bookmarkbar"
-#~ msgstr "显示书签栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr "仅本次拒绝"
 
-#~ msgid "Whether to show the bookmarkbar"
-#~ msgstr "是否显示书签栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr "路径"
 
-#~ msgid "Show Panel"
-#~ msgstr "显示侧边栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr "值"
 
-#~ msgid "Whether to show the panel"
-#~ msgstr "是否显示侧边栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr "过期日期"
 
-#~ msgid "Show Statusbar"
-#~ msgstr "显示状态栏"
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr "域名所用的策略没有单独设定。这只是进一步限制 Midori 设置中的的全局Cookie策略。"
 
-#~ msgid "Whether to show the statusbar"
-#~ msgstr "是否显示状态栏"
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr "Cookie 安全管理器"
 
-#~ msgid "Toolbar Items"
-#~ msgstr "工具栏项目"
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr "管理每个网站的 cookie 权限"
 
-#~ msgid "The items to show on the toolbar"
-#~ msgstr "在工具栏中要显示的项目"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "无法获取应用程序图标 - %s: %s"
 
-#~ msgid "Compact Sidepanel"
-#~ msgstr "紧凑侧边栏"
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
 
-#~ msgid "Whether to make the sidepanel compact"
-#~ msgstr "是否紧凑显示侧边栏"
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "创建新启动器失败 (%s): %s"
 
-#~ msgid "Align sidepanel on the right"
-#~ msgstr "侧边栏放在右边"
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "启动器已建立"
 
-#~ msgid "Whether to align the sidepanel on the right"
-#~ msgstr "是否将侧边栏放在右边"
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "您可以在您的启动器或菜单中运行 <b>%s</b>"
 
-#~ msgid "Open panels in separate windows"
-#~ msgstr "在单独窗口中打开侧边栏"
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "建立启动器时出错"
 
-#~ msgid "Whether to always open panels in separate windows"
-#~ msgstr "是否总是在单独窗口中打开侧边栏"
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "应用程序"
 
-#~ msgid "What to do when Midori starts"
-#~ msgstr "Midori 启动时做的事"
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "新建配置(_P)"
 
-#~ msgid "The homepage"
-#~ msgstr "主页"
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "建立一个独立的新配置文件和启动器"
 
-#~ msgid "Show crash dialog"
-#~ msgstr "显示崩溃对话框"
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "新应用(_A)"
 
-#~ msgid "The folder downloaded files are saved to"
-#~ msgstr "已下载文件所保存的文件夹"
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "为特定站点新建一个应用"
 
-#~ msgid "An external text editor"
-#~ msgstr "外部文本编辑器"
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "启动出错"
 
-#~ msgid "An external news aggregator"
-#~ msgstr "外部新闻聚合器"
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr "创建启动器(_L)"
 
-#~ msgid "Location entry Search"
-#~ msgstr "位置栏搜索"
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr "Web 应用管理器"
 
-#~ msgid "The search to perform inside the location entry"
-#~ msgstr "在位置栏内执行的搜索"
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr "管理作为应用程序安装的网站"
 
-#~ msgid "The preferred character encoding"
-#~ msgstr "首选的字符编码"
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr "传输"
 
-#~ msgid "Always show the tabbar"
-#~ msgstr "总是显示标签栏"
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr "全部清除"
 
-#~ msgid "Whether tabs have close buttons"
-#~ msgstr "标签上是否有关闭按钮"
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "打开下载项失败:%s"
 
-#~ msgid "Where to open new pages"
-#~ msgstr "在哪里打开新页面"
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr "打开目的地文件夹(_F)"
 
-#~ msgid "Whether to open new tabs in the background"
-#~ msgstr "是否在后台打开新标签"
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr "复制链接位置(_A)"
 
-#~ msgid "Open popups in tabs"
-#~ msgstr "在标签中打开弹出窗口"
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "文件 ‘<b>%s</b>’ 已经下载。"
 
-#~ msgid "Whether to open popup windows in tabs"
-#~ msgstr "是否在标签中打开弹出窗口"
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "下载了“<b>%s</b>”和其他 %d 个文件。"
 
-#~ msgid "Load and display images automatically"
-#~ msgstr "自动载入并显示图片"
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr "传输已完成"
 
-#~ msgid "Enable embedded scripting languages"
-#~ msgstr "启用已嵌入的脚本语言"
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr "有些文件正在下载"
 
-#~ msgid "Enable embedded Netscape plugin objects"
-#~ msgstr "启用已嵌入的 Netscape 插件对象"
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr "退出 Midori(_Q)"
 
-#~ msgid "Enable spell checking while typing"
-#~ msgstr "输入时启用拼写检查"
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "如果退出 Midori 则取消传输。"
 
-#~ msgid "Enable HTML5 database support"
-#~ msgstr "启用 HTML5 数据库支持"
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr "传输管理器"
 
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "是否启用 HTML5 数据库支持"
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr "查看已下载的文件"
 
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "是否启用 HTML5 本地存储支持"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "更新数据失败:%s"
 
-#~ msgid "Whether to enable offline web application cache"
-#~ msgstr "是否启用离线网络应用程序缓存"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "从数据库选择失败: %s"
 
-#~ msgid "Flash the browser window if a new tab was opened in the background"
-#~ msgstr "新标签在后台打开时浏览器窗口闪烁"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "导入此旧会话失败: %s"
 
-#~ msgid "Allow websites to use OpenGL rendering"
-#~ msgstr "允许站点使用 OpenGL 渲染"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Whether to zoom text and images"
-#~ msgstr "是否缩放文字和图片"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "标签页和会话管理。"
 
-#~ msgid "Find inline while typing"
-#~ msgstr "输入时在文中查找"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Whether to automatically find inline while typing"
-#~ msgstr "输入时是否在文中自动查找"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr "此扩展提供更新工作或重复事件的任务队列。"
 
-#~ msgid "The type of proxy server to use"
-#~ msgstr "所使用的代理服务器类型"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "添加新注释到数据库失败: %s\n"
 
-#~ msgid "HTTP Proxy Server"
-#~ msgstr "HTTP 代理服务器"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "从数据库中删除注释失败: %s\n"
 
-#~ msgid "The proxy server used for HTTP connections"
-#~ msgstr "HTTP 连接所使用的代理服务器"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "注释重命名失败: %s\n"
 
-#~ msgid "The proxy server port used for HTTP connections"
-#~ msgstr "HTTP 连接所使用的代理服务器端口"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "更新注释失败: %s\n"
 
-#~ msgid "Identification string"
-#~ msgstr "识别字符串"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "注释"
 
-#~ msgid "The application identification string"
-#~ msgstr "应用程序识别字符串"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "新建注释"
 
-#~ msgid "Clear private data"
-#~ msgstr "清除隐私数据"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "创建一个新的空白笔记,与已打开的页面无关"
 
-#~ msgid "The private data selected for deletion"
-#~ msgstr "选中的要删除的隐私数据"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "新建注释"
 
-#~ msgid "Clear data"
-#~ msgstr "清除数据"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "从数据库中选择注释失败: %s\n"
 
-#~ msgid "The data selected for deletion"
-#~ msgstr "选中的要删除的数据"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "重命名注释"
 
-#~ msgid "Close ot_her Tabs"
-#~ msgstr "关闭其它标签(_H)"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "将注释拷贝到剪贴板"
 
-#~ msgid "_Icon:"
-#~ msgstr "图标(_I):"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "删除注释"
 
-#~ msgid "Highlight Matches"
-#~ msgstr "突出显示匹配者"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "将选中内容拷贝为注释"
 
-#~ msgid "Filter:"
-#~ msgstr "过滤器:"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "将网站的文本剪辑保存为注释"
 
-#~ msgid ""
-#~ "Enter a filter string to show only cookies whose name or domain field "
-#~ "match the entered filter"
-#~ msgstr "输入过滤器字符串以便只显示与输入的过滤器名称或域区域匹配的隐私信息"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "广告屏蔽器"
 
-#~ msgid "_Customize…"
-#~ msgstr "自定义(_C)…"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "按过滤器列表屏蔽广告"
 
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "指定的配置文件夹无效。"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "配置广告过滤器"
 
-#~ msgid "Cookies"
-#~ msgstr "隐私信息"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "屏蔽图片(_O)"
 
-#~ msgid "'Flash' Cookies"
-#~ msgstr "‘动画’隐私信息"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "屏蔽链接(_O)"
 
-#~ msgid "HTML5 _Databases"
-#~ msgstr "HTML5 数据库(_D)"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "编辑规则"
 
-#~ msgid "Offline Application Cache"
-#~ msgstr "离线应用程序缓存"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "规则(_R):"
diff --git a/po/zh_HK.po b/po/zh_HK.po
new file mode 100644 (file)
index 0000000..391ea4d
--- /dev/null
@@ -0,0 +1,3426 @@
+# Chinese (Hong Kong) translation for midori
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the midori package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2015-04-04 12:00+0000\n"
+"Last-Translator: WebKit Team <Unknown>\n"
+"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\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"
+"X-Launchpad-Export-Date: 2015-04-05 05:09+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
+
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
+msgid "Midori"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:4
+msgid "Browse the Web"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:5
+msgid "Internet;WWW;Explorer"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
+msgid "New Tab"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
+msgid "New Window"
+msgstr ""
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
+msgid "Private Browsing"
+msgstr ""
+
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr ""
+
+#: ../midori/main.c:52
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:79
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:81
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:83
+msgid "Private browsing, no changes are saved"
+msgstr ""
+
+#: ../midori/main.c:86
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+
+#: ../midori/main.c:89
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:91
+msgid "Show a diagnostic dialog"
+msgstr ""
+
+#: ../midori/main.c:93
+msgid "Run within gdb and save a backtrace on crash"
+msgstr ""
+
+#: ../midori/main.c:95
+msgid "Run the specified filename as javascript"
+msgstr ""
+
+#: ../midori/main.c:97
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:99
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:101
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+
+#: ../midori/main.c:103
+msgid "Display program version"
+msgstr ""
+
+#: ../midori/main.c:105
+msgid "Addresses"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:107
+msgid "PATTERN"
+msgstr ""
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:111
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:111
+msgid "SECONDS"
+msgstr ""
+
+#: ../midori/main.c:136
+msgid "Error: \"gdb\" can't be found\n"
+msgstr ""
+
+#: ../midori/main.c:162
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../midori/main.c:164
+msgid "Check for new versions at:"
+msgstr ""
+
+#: ../midori/main.c:358
+msgid "An unknown error occured"
+msgstr ""
+
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
+msgid "_Bookmarks"
+msgstr ""
+
+#: ../midori/midori-app.c:1154
+msgid "Add Boo_kmark"
+msgstr ""
+
+#: ../midori/midori-app.c:1155
+msgid "_Extensions"
+msgstr ""
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
+msgid "_History"
+msgstr ""
+
+#: ../midori/midori-app.c:1157
+msgid "_Userscripts"
+msgstr ""
+
+#: ../midori/midori-app.c:1158
+msgid "User_styles"
+msgstr ""
+
+#: ../midori/midori-app.c:1159
+msgid "New _Tab"
+msgstr ""
+
+#: ../midori/midori-app.c:1160
+msgid "_Transfers"
+msgstr ""
+
+#: ../midori/midori-app.c:1161
+msgid "Netscape p_lugins"
+msgstr ""
+
+#: ../midori/midori-app.c:1162
+msgid "_Closed Tabs"
+msgstr ""
+
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
+msgid "New _Window"
+msgstr ""
+
+#: ../midori/midori-app.c:1164
+msgid "New _Folder"
+msgstr ""
+
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
+msgid "[Addresses]"
+msgstr ""
+
+#: ../midori/midori-array.c:549
+msgid "File not found."
+msgstr ""
+
+#: ../midori/midori-array.c:574 ../midori/midori-array.c:613
+#: ../midori/midori-array.c:637 ../midori/midori-array.c:647
+msgid "Malformed document."
+msgstr ""
+
+#: ../midori/midori-array.c:656
+msgid "Unrecognized bookmark format."
+msgstr ""
+
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
+msgid "Go forward to the next page"
+msgstr ""
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
+msgid "Go to the next sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:326
+msgid "Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
+msgid "Reload the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
+msgid "Stop loading the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:514
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr ""
+
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr ""
+
+#: ../midori/midori-browser.c:723
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr ""
+
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr ""
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr ""
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
+msgid "Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr ""
+
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr ""
+
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
+msgid "Save file as"
+msgstr ""
+
+#: ../midori/midori-browser.c:1311
+msgid "Save associated _resources"
+msgstr ""
+
+#: ../midori/midori-browser.c:1608
+msgid "A new window has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1611
+msgid "A new tab has been opened"
+msgstr ""
+
+#: ../midori/midori-browser.c:1629
+msgid "Error opening the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1630
+msgid "Can not open selected image in a default viewer."
+msgstr ""
+
+#: ../midori/midori-browser.c:1636
+msgid "Error downloading the image!"
+msgstr ""
+
+#: ../midori/midori-browser.c:1637
+msgid "Can not download selected image."
+msgstr ""
+
+#: ../midori/midori-browser.c:1714
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr ""
+
+#: ../midori/midori-browser.c:2606
+msgid "Open file"
+msgstr ""
+
+#: ../midori/midori-browser.c:2692
+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:2698 ../extensions/feed-panel/main.c:350
+msgid "New feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
+msgid "Add a new bookmark"
+msgstr ""
+
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
+msgid "Empty"
+msgstr ""
+
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
+msgid "Toggle text cursor navigation"
+msgstr ""
+
+#: ../midori/midori-browser.c:3549
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3552
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
+msgid "Open all in _Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
+msgid "Open in New _Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:4352
+msgid "Arora"
+msgstr ""
+
+#: ../midori/midori-browser.c:4353
+msgid "Kazehakase"
+msgstr ""
+
+#: ../midori/midori-browser.c:4354
+msgid "Opera"
+msgstr ""
+
+#: ../midori/midori-browser.c:4355
+msgid "Konqueror"
+msgstr ""
+
+#: ../midori/midori-browser.c:4356
+msgid "Epiphany"
+msgstr ""
+
+#: ../midori/midori-browser.c:4357
+#, c-format
+msgid "Firefox (%s)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4358
+msgid "Midori 0.2.6"
+msgstr ""
+
+#: ../midori/midori-browser.c:4376
+msgid "Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:4379
+msgid "_Import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4390
+msgid "_Application:"
+msgstr ""
+
+#: ../midori/midori-browser.c:4455
+msgid "Import from XBEL or HTML file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4481
+msgid "Import from a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:4493
+msgid "Failed to import bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4523
+msgid "XBEL Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4528
+msgid "Netscape Bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4546
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4558
+msgid "Failed to export bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:4746
+msgid "A lightweight web browser."
+msgstr ""
+
+#: ../midori/midori-browser.c:4747
+msgid "See about:version for version info."
+msgstr ""
+
+#: ../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 ""
+
+#: ../midori/midori-browser.c:4780
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  WebKit Team https://launchpad.net/~webkit-team\n"
+"  tomttou https://launchpad.net/~tomttou"
+
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5067
+msgid "_File"
+msgstr ""
+
+#: ../midori/midori-browser.c:5070
+msgid "Open a new window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5073
+msgid "Open a new tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5075
+msgid "New P_rivate Browsing Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5079
+msgid "Open a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5081
+msgid "_Save Page As…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5082
+msgid "Save to a file"
+msgstr ""
+
+#: ../midori/midori-browser.c:5084
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:5087
+msgid "Subscribe to News _feed"
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
+msgid "_Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5094
+msgid "Close the current tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5096
+msgid "C_lose Window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5100
+msgid "Print the current page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5102
+msgid "Close a_ll Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:5105
+msgid "_Edit"
+msgstr ""
+
+#: ../midori/midori-browser.c:5128
+msgid "_Find…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5129
+msgid "Find a word or phrase in the page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5131
+msgid "Find _Next"
+msgstr ""
+
+#: ../midori/midori-browser.c:5134
+msgid "Find _Previous"
+msgstr ""
+
+#: ../midori/midori-browser.c:5138
+msgid "Configure the application preferences"
+msgstr ""
+
+#: ../midori/midori-browser.c:5140
+msgid "_View"
+msgstr ""
+
+#: ../midori/midori-browser.c:5141
+msgid "_Toolbars"
+msgstr ""
+
+#: ../midori/midori-browser.c:5156
+msgid "Increase the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5159
+msgid "Decrease the zoom level"
+msgstr ""
+
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
+msgid "_Encoding"
+msgstr ""
+
+#: ../midori/midori-browser.c:5165
+msgid "View So_urce"
+msgstr ""
+
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr ""
+
+#: ../midori/midori-browser.c:5171
+msgid "Ca_ret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:5175
+msgid "Toggle fullscreen view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5177
+msgid "Scroll _Left"
+msgstr ""
+
+#: ../midori/midori-browser.c:5180
+msgid "Scroll _Down"
+msgstr ""
+
+#: ../midori/midori-browser.c:5183
+msgid "Scroll _Up"
+msgstr ""
+
+#: ../midori/midori-browser.c:5186
+msgid "Scroll _Right"
+msgstr ""
+
+#: ../midori/midori-browser.c:5189
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5192
+msgid "_Go"
+msgstr ""
+
+#: ../midori/midori-browser.c:5195
+msgid "Go back to the previous page"
+msgstr ""
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5202
+msgid "Go to the previous sub-page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr ""
+
+#: ../midori/midori-browser.c:5211
+msgid "_Homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5212
+msgid "Go to your homepage"
+msgstr ""
+
+#: ../midori/midori-browser.c:5214
+msgid "Empty Trash"
+msgstr ""
+
+#: ../midori/midori-browser.c:5217
+msgid "Undo _Close Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5224
+msgid "Add a new _folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5239
+msgid "_Inspect Page"
+msgstr ""
+
+#: ../midori/midori-browser.c:5243
+msgid "_Previous Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5246
+msgid "_Next Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5248
+msgid "Move Tab to _first position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5250
+msgid "Move Tab _Backward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5252
+msgid "_Move Tab Forward"
+msgstr ""
+
+#: ../midori/midori-browser.c:5254
+msgid "Move Tab to _last position"
+msgstr ""
+
+#: ../midori/midori-browser.c:5257
+msgid "Focus _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5260
+msgid "Focus _Next view"
+msgstr ""
+
+#: ../midori/midori-browser.c:5263
+msgid "Only show the Icon of the _Current Tab"
+msgstr ""
+
+#: ../midori/midori-browser.c:5269
+msgid "Close Ot_her Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5272
+msgid "Open last _session"
+msgstr ""
+
+#: ../midori/midori-browser.c:5275
+msgid "_Help"
+msgstr ""
+
+#: ../midori/midori-browser.c:5277
+msgid "_Frequent Questions"
+msgstr ""
+
+#: ../midori/midori-browser.c:5280
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
+msgid "_Tools"
+msgstr ""
+
+#: ../midori/midori-browser.c:5292
+msgid "_Menubar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5296
+msgid "_Navigationbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5300
+msgid "Side_panel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5301
+msgid "Sidepanel"
+msgstr ""
+
+#: ../midori/midori-browser.c:5304
+msgid "_Bookmarkbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5308
+msgid "_Statusbar"
+msgstr ""
+
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
+msgid "Chinese Traditional (BIG5)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5327
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
+msgid "Custom…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr ""
+
+#: ../midori/midori-browser.c:5827
+msgid "_Separator"
+msgstr ""
+
+#: ../midori/midori-browser.c:5834
+msgid "_Location…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5836
+msgid "Open a particular location"
+msgstr ""
+
+#: ../midori/midori-browser.c:5858
+msgid "_Web Search…"
+msgstr ""
+
+#: ../midori/midori-browser.c:5860
+msgid "Run a web search"
+msgstr ""
+
+#: ../midori/midori-browser.c:5887
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:5904
+msgid "Show the saved bookmarks"
+msgstr ""
+
+#: ../midori/midori-browser.c:5937
+msgid "_Tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5939
+msgid "Show a list of all open tabs"
+msgstr ""
+
+#: ../midori/midori-browser.c:5953
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:5955
+msgid "Menu"
+msgstr ""
+
+#: ../midori/midori-extension.c:341
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1325
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1356
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1358
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1360
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1362
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1364
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1366
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1368
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1419
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1432
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1465
+msgid "Security details"
+msgstr ""
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1551
+msgid "Paste and p_roceed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1803
+msgid "Not verified"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1809
+msgid "Verified and encrypted connection"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1814
+msgid "Open, unencrypted connection"
+msgstr ""
+
+#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316
+#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327
+msgid "Close panel"
+msgstr ""
+
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
+msgid "Show Speed Dial"
+msgstr ""
+
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
+msgid "Show Homepage"
+msgstr ""
+
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
+msgid "Show last open tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
+msgid "Show last tabs without loading"
+msgstr ""
+
+#: ../midori/midori-websettings.c:131
+msgid "Show Blank Page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:133
+msgid "Show default Search Engine"
+msgstr ""
+
+#: ../midori/midori-websettings.c:135
+msgid "Show custom page"
+msgstr ""
+
+#: ../midori/midori-websettings.c:152
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:172
+msgid "New tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:173
+msgid "New window"
+msgstr ""
+
+#: ../midori/midori-websettings.c:174
+msgid "Current tab"
+msgstr ""
+
+#: ../midori/midori-websettings.c:189
+msgid "Default"
+msgstr ""
+
+#: ../midori/midori-websettings.c:190
+msgid "Icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:191
+msgid "Small icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:192
+msgid "Text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:193
+msgid "Icons and text"
+msgstr ""
+
+#: ../midori/midori-websettings.c:194
+msgid "Text beside icons"
+msgstr ""
+
+#: ../midori/midori-websettings.c:209
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:210
+msgid "HTTP proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:211
+msgid "No proxy server"
+msgstr ""
+
+#: ../midori/midori-websettings.c:228
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:229
+msgid "Safari"
+msgstr ""
+
+#: ../midori/midori-websettings.c:230
+msgid "iPhone"
+msgstr ""
+
+#: ../midori/midori-websettings.c:231
+msgid "Firefox"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
+msgid "Internet Explorer"
+msgstr ""
+
+#: ../midori/midori-websettings.c:307
+msgid "The style of the toolbar"
+msgstr ""
+
+#: ../midori/midori-websettings.c:491
+msgid "Always use my font choices"
+msgstr ""
+
+#: ../midori/midori-websettings.c:492
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr ""
+
+#: ../midori/midori-tab.vala:133
+#, c-format
+msgid "Failed to inject stylesheet: %s"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr ""
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:736
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1025
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Deny"
+msgstr ""
+
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
+msgid "_Allow"
+msgstr ""
+
+#: ../midori/midori-view.c:1056
+#, c-format
+msgid "%s wants to know your location."
+msgstr ""
+
+#: ../midori/midori-view.c:1210
+#, c-format
+msgid "'%s' can't be found"
+msgstr ""
+
+#: ../midori/midori-view.c:1211
+#, c-format
+msgid "The page '%s' couldn't be loaded:"
+msgstr ""
+
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr ""
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr ""
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr ""
+
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr ""
+
+#: ../midori/midori-view.c:1346
+#, c-format
+msgid "Oops - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:1347
+#, c-format
+msgid "Something went wrong with '%s'."
+msgstr ""
+
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr ""
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
+#, c-format
+msgid "Send a message to %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2304
+msgid "Add _search engine..."
+msgstr ""
+
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr ""
+
+#: ../midori/midori-view.c:2324
+msgid "Open Link in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Foreground Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2330
+msgid "Open Link in _Background Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2332
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2336
+msgid "Copy Link de_stination"
+msgstr ""
+
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
+msgid "Save _As…"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: ../midori/midori-view.c:2354
+msgid "Open _Image in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2357
+msgid "Copy Im_age"
+msgstr ""
+
+#: ../midori/midori-view.c:2359
+msgid "Save I_mage"
+msgstr ""
+
+#: ../midori/midori-view.c:2361
+msgid "Open in Image _Viewer"
+msgstr ""
+
+#: ../midori/midori-view.c:2367
+msgid "Copy Video _Address"
+msgstr ""
+
+#: ../midori/midori-view.c:2369
+msgid "Download _Video"
+msgstr ""
+
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2416
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:2442
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:2459
+msgid "Open _Frame in New Tab"
+msgstr ""
+
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr ""
+
+#: ../midori/midori-view.c:2715
+#, c-format
+msgid "Open or download file from %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
+#, c-format
+msgid "File Name: %s"
+msgstr ""
+
+#: ../midori/midori-view.c:2738
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:2740
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#: ../midori/midori-view.c:2778
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
+#, c-format
+msgid "Open %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3313
+#, c-format
+msgid "Inspect page - %s"
+msgstr ""
+
+#: ../midori/midori-view.c:3898
+msgid "Midori doesn't store any personal data:"
+msgstr ""
+
+#: ../midori/midori-view.c:3899
+msgid "No history or web cookies are being saved."
+msgstr ""
+
+#: ../midori/midori-view.c:3900
+msgid "Extensions are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3901
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3902
+msgid "Midori prevents websites from tracking the user:"
+msgstr ""
+
+#: ../midori/midori-view.c:3903
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:3904
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:3905
+msgid "The language and timezone are not revealed to websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3906
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr ""
+
+#: ../midori/midori-view.c:3949
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr ""
+
+#: ../midori/midori-view.c:4000
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr ""
+
+#: ../midori/midori-view.c:4002
+msgid "Load Page"
+msgstr ""
+
+#: ../midori/midori-view.c:4167
+msgid "Blank page"
+msgstr ""
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:4709
+msgid "previous"
+msgstr ""
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:4728
+msgid "next"
+msgstr ""
+
+#: ../midori/midori-view.c:4742
+msgid "Print background images"
+msgstr ""
+
+#: ../midori/midori-view.c:4743
+msgid "Whether background images should be printed"
+msgstr ""
+
+#: ../midori/midori-view.c:4781
+msgid "Features"
+msgstr ""
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:59
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../midori/midori-download.vala:75
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:76
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../midori/midori-download.vala:77
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/midori-download.vala:92
+#, c-format
+msgid " - %s remaining"
+msgstr ""
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:103
+msgid "?B"
+msgstr ""
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:105
+#, c-format
+msgid " (%s/s)"
+msgstr ""
+
+#: ../midori/midori-download.vala:220
+msgid "The downloaded file is erroneous."
+msgstr ""
+
+#: ../midori/midori-download.vala:221
+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:366
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr ""
+
+#: ../midori/midori-download.vala:368
+msgid "You don't have permission to write in this location."
+msgstr ""
+
+#: ../midori/midori-download.vala:371
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr ""
+
+#: ../midori/midori-download.vala:373
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:188
+msgid "Speed Dial"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:190
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:191
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-speeddial.vala:192
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-preferences.c:305
+msgid "Startup"
+msgstr ""
+
+#: ../midori/midori-preferences.c:307
+msgid "When Midori starts:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:312
+msgid "Homepage:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:320
+msgid "Use _current page"
+msgstr ""
+
+#: ../midori/midori-preferences.c:324
+msgid "Use current page as homepage"
+msgstr ""
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:333
+msgid "Fonts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:335
+msgid "Proportional Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:339
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:342
+msgid "The default font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:344
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:348
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:351
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:353
+msgid "Minimum Font Size"
+msgstr ""
+
+#: ../midori/midori-preferences.c:357
+msgid "The minimum font size used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:361
+msgid "Preferred Encoding"
+msgstr ""
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:368
+msgid "Behavior"
+msgstr ""
+
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:374
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr ""
+
+#: ../midori/midori-preferences.c:391
+msgid "Enable WebGL support"
+msgstr ""
+
+#: ../midori/midori-preferences.c:408
+msgid "Zoom Text and Images"
+msgstr ""
+
+#: ../midori/midori-preferences.c:411
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:412
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr ""
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr ""
+
+#: ../midori/midori-preferences.c:422
+msgid "Preferred languages"
+msgstr ""
+
+#: ../midori/midori-preferences.c:426
+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-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr ""
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr ""
+
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:470
+msgid "Toolbar Style:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:474
+msgid "Open new pages in:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:478
+msgid "New tab behavior:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:483
+msgid "Close Buttons on Tabs"
+msgstr ""
+
+#: ../midori/midori-preferences.c:486
+msgid "Open Tabs next to Current"
+msgstr ""
+
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+
+#: ../midori/midori-preferences.c:490
+msgid "Open tabs in the background"
+msgstr ""
+
+#: ../midori/midori-preferences.c:494
+msgid "Text Editor"
+msgstr ""
+
+#: ../midori/midori-preferences.c:499
+msgid "News Aggregator"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:506
+msgid "Network"
+msgstr ""
+
+#: ../midori/midori-preferences.c:508
+msgid "Proxy server"
+msgstr ""
+
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr ""
+
+#: ../midori/midori-preferences.c:521
+msgid "Port"
+msgstr ""
+
+#: ../midori/midori-preferences.c:533
+msgid "Supported proxy types:"
+msgstr ""
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
+msgid "Web Cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
+msgid "The maximum size of cached pages on disk"
+msgstr ""
+
+#: ../midori/midori-preferences.c:558
+msgid "MB"
+msgstr ""
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-preferences.c:564
+msgid "Identify as"
+msgstr ""
+
+#: ../midori/midori-preferences.c:582
+msgid "Privacy"
+msgstr ""
+
+#: ../midori/midori-preferences.c:584
+msgid "Delete old Cookies after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+msgid "The maximum number of days to save cookies for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:593
+msgid "Only accept Cookies from sites you visit"
+msgstr ""
+
+#: ../midori/midori-preferences.c:594
+msgid "Block cookies sent by third-party websites"
+msgstr ""
+
+#: ../midori/midori-preferences.c:599
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/midori-preferences.c:606
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: ../midori/midori-preferences.c:609
+msgid "Enable HTML5 local storage support"
+msgstr ""
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-preferences.c:613
+msgid "Strip referrer details sent to websites"
+msgstr ""
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-preferences.c:615
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+
+#: ../midori/midori-preferences.c:618
+msgid "Delete pages from history after:"
+msgstr ""
+
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
+msgid "The maximum number of days to save the history for"
+msgstr ""
+
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Add search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1047
+msgid "Edit search engine"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1075
+msgid "_Name:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1090
+msgid "_Description:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
+msgid "_Address:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1118
+msgid "_Token:"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1408
+msgid "Manage Search Engines"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1508
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1619
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr ""
+
+#: ../midori/midori-searchaction.c:1674
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:28
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
+#, c-format
+msgid "Failed to select from history: %s"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:20
+#: ../midori/midori-searchcompletion.vala:57
+msgid "Search with…"
+msgstr ""
+
+#: ../midori/midori-searchcompletion.vala:47
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/sokoke.c:219
+msgid "Open with"
+msgstr ""
+
+#: ../midori/sokoke.c:227
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr ""
+
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
+msgid "Could not run external program."
+msgstr ""
+
+#: ../midori/sokoke.c:554
+msgid "Invalid URI"
+msgstr ""
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:233
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:251
+msgid "Previous"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:257
+msgid "Next"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:261
+msgid "Match Case"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:270
+msgid "Close Findbar"
+msgstr ""
+
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
+#, c-format
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
+#, c-format
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr ""
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr ""
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr ""
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr ""
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr ""
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:770
+msgid "Edit the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:778
+msgid "Delete the selected bookmark"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:794
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
+msgid "<i>Separator</i>"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1353
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr ""
+
+#: ../panels/midori-history.c:133
+msgid "Today"
+msgstr ""
+
+#: ../panels/midori-history.c:135
+msgid "Yesterday"
+msgstr ""
+
+#: ../panels/midori-history.c:137
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../panels/midori-history.c:140
+msgid "A week ago"
+msgstr ""
+
+#: ../panels/midori-history.c:185
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr ""
+
+#: ../panels/midori-history.c:312
+msgid "Are you sure you want to remove all history items?"
+msgstr ""
+
+#: ../panels/midori-history.c:358
+msgid "Bookmark the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:367
+msgid "Delete the selected history item"
+msgstr ""
+
+#: ../panels/midori-history.c:375
+msgid "Clear the entire history"
+msgstr ""
+
+#. Create the filter entry
+#: ../panels/midori-history.c:926
+msgid "Search History"
+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-utils.c:386
+msgid "None"
+msgstr ""
+
+#: ../katze/katze-utils.c:529
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr ""
+
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr ""
+
+#: ../katze/katze-utils.c:581
+msgid "Choose folder"
+msgstr ""
+
+#: ../katze/katze-utils.c:746
+msgid "1 hour"
+msgstr ""
+
+#: ../katze/katze-utils.c:747
+msgid "1 day"
+msgstr ""
+
+#: ../katze/katze-utils.c:748
+msgid "1 week"
+msgstr ""
+
+#: ../katze/katze-utils.c:749
+msgid "1 month"
+msgstr ""
+
+#: ../katze/katze-utils.c:750
+msgid "1 year"
+msgstr ""
+
+#: ../katze/katze-preferences.c:65
+#: ../extensions/external-download-manager.vala:224
+#: ../extensions/history-list.vala:289
+#, c-format
+msgid "Preferences for %s"
+msgstr ""
+
+#: ../katze/midori-uri.vala:191
+msgid "MD5-Checksum:"
+msgstr ""
+
+#: ../katze/midori-uri.vala:198
+msgid "SHA1-Checksum:"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
+msgid ""
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr ""
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+
+#: ../extensions/addons.c:229
+msgid "_Install user style"
+msgstr ""
+
+#: ../extensions/addons.c:237
+msgid "Don't install"
+msgstr ""
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
+msgid "Userscripts"
+msgstr ""
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
+msgid "Userstyles"
+msgstr ""
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:115
+msgid "Error"
+msgstr ""
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr ""
+
+#: ../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 <b>%s</b> will be permanently deleted."
+msgstr ""
+
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
+msgid "Open in Text Editor"
+msgstr ""
+
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
+msgid "Open Target Folder"
+msgstr ""
+
+#: ../extensions/addons.c:630
+msgid "Add new addon"
+msgstr ""
+
+#: ../extensions/addons.c:656
+msgid "Remove selected addon"
+msgstr ""
+
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
+msgid "User addons"
+msgstr ""
+
+#: ../extensions/addons.c:1811
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr ""
+
+#: ../extensions/addons.c:1898
+msgid "Support for userscripts and userstyles"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:257
+msgid "Colorful Tabs"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:258
+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:99
+msgid "Delete All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
+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:116
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#. i18n: is this cookie secure (SSL)? yes/ no
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
+msgid "No"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
+#, c-format
+msgid ""
+"<b>Domain</b>: %s\n"
+"<b>Cookies</b>: %d"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
+msgid "Name"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
+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:39
+msgid "Copy Tab _Addresses"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy Addresses of Tabs"
+msgstr ""
+
+#: ../extensions/copy-tabs.c:97
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:49
+msgid "Delayed load"
+msgstr ""
+
+#: ../extensions/delayed-load.vala:50
+msgid "Delay page load until you actually use the tab."
+msgstr ""
+
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr ""
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr ""
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:124
+#, c-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:175
+msgid "External Download Manager - Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:176
+msgid "Download files with Aria2"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:202
+msgid "External Download Manager - SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:203
+msgid "Download files with SteadyFlow"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:249
+msgid "Command:"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:304
+#, c-format
+msgid "Download files with \"%s\" or a custom command"
+msgstr ""
+
+#: ../extensions/external-download-manager.vala:320
+msgid "External Download Manager - CommandLine"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:208
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:314
+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:367
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:620
+msgid "Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:678
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:757
+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:237
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:267
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:50
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:55
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:152
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:252
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:117
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:193
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:500
+msgid "Feed Panel"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:501
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:38
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:100
+msgid "Form history"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:117
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:416
+msgid "Toggle form history state"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:417
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:598
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:655
+msgid "Form history filler"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory.c:656
+msgid "Stores history of entered form data"
+msgstr ""
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr ""
+
+#: ../extensions/history-list.vala:251
+msgid "There are no unvisited tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:289
+msgid "History-List"
+msgstr ""
+
+#: ../extensions/history-list.vala:329
+msgid "Tab closing behavior"
+msgstr ""
+
+#: ../extensions/history-list.vala:337
+msgid "Do nothing"
+msgstr ""
+
+#: ../extensions/history-list.vala:343
+msgid "Switch to last viewed tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:349
+msgid "Switch to newest tab"
+msgstr ""
+
+#: ../extensions/history-list.vala:363
+msgid "Flash window on background tabs"
+msgstr ""
+
+#: ../extensions/history-list.vala:498
+msgid "Next new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:499
+msgid "Next new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:508
+msgid "Previous new Tab (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:509
+msgid "Previous new tab from history"
+msgstr ""
+
+#: ../extensions/history-list.vala:518
+msgid "Display tab in background (History List)"
+msgstr ""
+
+#: ../extensions/history-list.vala:519
+msgid "Display the current selected tab in background"
+msgstr ""
+
+#: ../extensions/history-list.vala:648
+msgid "History List"
+msgstr ""
+
+#: ../extensions/history-list.vala:649
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr ""
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr ""
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr ""
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr ""
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr ""
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr ""
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:513
+msgid "Mouse Gestures"
+msgstr ""
+
+#: ../extensions/mouse-gestures.c:514
+msgid "Control Midori by moving the mouse"
+msgstr ""
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr ""
+
+#: ../extensions/shortcuts.c:168
+msgid "Customize Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:275
+msgid "Customize Sh_ortcuts…"
+msgstr ""
+
+#: ../extensions/shortcuts.c:312
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:313
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/status-clock.c:168
+msgid "Statusbar Clock"
+msgstr ""
+
+#: ../extensions/status-clock.c:169
+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 ""
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr ""
+
+#: ../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:588 ../extensions/tab-panel.c:677
+msgid "Tab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:660
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../extensions/tab-panel.c:678
+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:401
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:417
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:433
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:454
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:611
+msgid "_Customize Toolbar…"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:640
+msgid "Toolbar Editor"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:641
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#. FIXME: granite: should return GtkWidget* like GTK+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
+msgid "Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
+msgid "_Clear private data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:162
+msgid "Clear the following data:"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:172
+msgid "Last open _tabs"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:198
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/midori-privatedata.c:321
+msgid "Saved logins and _passwords"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:323
+msgid "Cookies and Website data"
+msgstr ""
+
+#: ../midori/midori-privatedata.c:328
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:18
+msgid "Open tabs"
+msgstr ""
+
+#: ../midori/midori-viewcompletion.vala:80
+msgid "More open tabs…"
+msgstr ""
+
+#: ../midori/midori-history.c:27
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr ""
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/midori-history.c:73
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:519
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:574
+#, c-format
+msgid "Failed to update bookmark: %s\n"
+msgstr ""
+
+#: ../midori/midori-bookmarks-db.c:610
+#, c-format
+msgid "Failed to remove bookmark item: %s\n"
+msgstr ""
+
+#: ../midori/midori-session.c:217
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/midori-session.c:390
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr ""
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/midori-frontend.c:137
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr ""
+
+#: ../midori/midori-frontend.c:335
+#, c-format
+msgid ""
+"Midori crashed the last time it was opened. You can report the problem at %s."
+msgstr ""
+
+#: ../midori/midori-frontend.c:344
+msgid "Modify _preferences"
+msgstr ""
+
+#: ../midori/midori-frontend.c:348
+msgid "Disable all _extensions"
+msgstr ""
+
+#: ../midori/midori-frontend.c:357
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+
+#: ../midori/midori-frontend.c:362
+msgid "Discard old tabs"
+msgstr ""
+
+#: ../midori/midori-frontend.c:370
+msgid "Show last crash _log"
+msgstr ""
+
+#: ../midori/midori-frontend.c:383
+msgid "Run in _debugger"
+msgstr ""
+
+#: ../midori/midori-frontend.c:461
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:494
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:525
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:533
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr ""
+
+#: ../midori/midori-frontend.c:544
+msgid "The following errors occured:"
+msgstr ""
+
+#: ../midori/midori-frontend.c:549
+msgid "_Ignore"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:151
+#, c-format
+msgid "Could not open database of extenstion: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
+msgid "Do you really want to delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
+msgid "Delete all cookie permissions?"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
+msgid ""
+"This action will delete all cookie permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
+msgid "Cookie permission manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
+msgid "Instance of current cookie permission manager"
+msgstr ""
+
+#. Set up dialog
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
+msgid "Configure cookie permission"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
+#, c-format
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>.You can also "
+"add a policy for a domain manually by entering the domain below, choosing "
+"the policy and clicking on <i>Add</i>."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:91
+msgid ""
+"A fatal error occurred which prevents the cookie permission manager "
+"extension to continue. You should disable it."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:95
+msgid "Error in cookie permission manager extension"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
+#, c-format
+msgid "Could not determine global cookie policy to set for domain: %s"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
+msgid "Till session end"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
+#, c-format
+msgid "The website %s wants to store %d cookies."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
+#, c-format
+msgid "The website %s wants to store a cookie."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
+#, c-format
+msgid "Multiple websites want to store %d cookies in total."
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
+msgid "_Accept"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+msgid "Accept for this _session"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+msgid "De_ny"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+msgid "Deny _this time"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
+msgid "Path"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
+msgid "Value"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
+msgid "Expire date"
+msgstr ""
+
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
+msgid ""
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:62
+msgid "Cookie Security Manager"
+msgstr ""
+
+#: ../extensions/cookie-permissions/main.c:63
+msgid "Manage cookie permission per site"
+msgstr ""
+
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr ""
+
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr ""
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr ""
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr ""
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr ""
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr ""
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr ""
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr ""
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr ""
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr ""
+
+#: ../extensions/apps.vala:450
+msgid "Create _Launcher"
+msgstr ""
+
+#: ../extensions/apps.vala:500
+msgid "Web App Manager"
+msgstr ""
+
+#: ../extensions/apps.vala:501
+msgid "Manage websites installed as applications"
+msgstr ""
+
+#: ../extensions/transfers.vala:98
+msgid "Transfers"
+msgstr ""
+
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
+msgid "Clear All"
+msgstr ""
+
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr ""
+
+#: ../extensions/transfers.vala:214
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../extensions/transfers.vala:225
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../extensions/transfers.vala:449
+#, c-format
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr ""
+
+#: ../extensions/transfers.vala:452
+msgid "Transfer completed"
+msgstr ""
+
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
+msgid "Some files are being downloaded"
+msgstr ""
+
+#: ../extensions/transfers.vala:510
+msgid "_Quit Midori"
+msgstr ""
+
+#: ../extensions/transfers.vala:512
+msgid "The transfers will be cancelled if Midori quits."
+msgstr ""
+
+#: ../extensions/transfers.vala:561
+msgid "Transfer Manager"
+msgstr ""
+
+#: ../extensions/transfers.vala:562
+msgid "View downloaded files"
+msgstr ""
+
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr ""
+
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr ""
+
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr ""
+
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr ""
+
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr ""
+
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr ""
+
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr ""
+
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr ""
+
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr ""
+
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr ""
+
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr ""
+
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr ""
+
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr ""
+
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr ""
+
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr ""
+
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr ""
index 122c311149bb55ea4e46032dc2b15027c364f93c..880fb71037da9341fc7a57780058d06706ed5cc8 100644 (file)
@@ -8,210 +8,211 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-12 07:09+0000\n"
-"PO-Revision-Date: 2013-05-12 16:38+0800\n"
+"POT-Creation-Date: 2014-02-21 10:52-0600\n"
+"PO-Revision-Date: 2014-03-17 05:54+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\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"
-"X-Generator: Poedit 1.5.5\n"
+"X-Launchpad-Export-Date: 2014-11-26 06:06+0000\n"
+"X-Generator: Launchpad (build 17252)\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:162
-#: ../midori/midori-websettings.c:228
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:142
+#: ../midori/midori-websettings.c:227
 msgid "Midori"
 msgstr "Midori"
 
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:2
+msgid "Web Browser"
+msgstr "網頁瀏覽器"
+
+#: ../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 "New Private Browsing Window"
-msgstr "新增私人瀏覽視窗"
+msgid "Internet;WWW;Explorer"
+msgstr "Internet;WWW;Explorer;網際網路;瀏覽器"
 
-#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1401
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1611
 msgid "New Tab"
-msgstr "新分頁"
+msgstr "æ\96°å¢\9eå\88\86é \81"
 
-#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1398
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1608
 msgid "New Window"
 msgstr "新增視窗"
 
 #: ../data/midori.desktop.in.h:8
-msgid "Web Browser"
-msgstr "網頁瀏覽器"
+msgid "New Private Browsing Window"
+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:4410
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:3897
 msgid "Private Browsing"
 msgstr "私密瀏覽"
 
-#: ../midori/main.c:72
+#: ../data/midori-private.desktop.in.h:3
+msgid "Open a new private browsing window"
+msgstr "開啟新的私密瀏覽視窗"
+
+#: ../midori/main.c:52
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "快照已儲存至:%s\n"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "Run ADDRESS as a web application"
 msgstr "將 ADDRESS 作為網頁應用程式執行"
 
-#: ../midori/main.c:99
+#: ../midori/main.c:79
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "Use FOLDER as configuration folder"
 msgstr "使用 FOLDER 作為組態資料夾"
 
-#: ../midori/main.c:101
+#: ../midori/main.c:81
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:103
+#: ../midori/main.c:83
 msgid "Private browsing, no changes are saved"
 msgstr "私密瀏覽,不會儲存任何更動"
 
-#: ../midori/main.c:106
+#: ../midori/main.c:86
 msgid "Portable mode, all runtime files are stored in one place"
 msgstr "可攜模式,所有的執行時期檔案會儲存在同個位置"
 
-#: ../midori/main.c:109
+#: ../midori/main.c:89
 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
 msgstr "純 GTK+ 視窗加 WebKit,和 GtkLauncher 同類"
 
-#: ../midori/main.c:111
+#: ../midori/main.c:91
 msgid "Show a diagnostic dialog"
 msgstr "顯示診斷對話窗"
 
-#: ../midori/main.c:113
+#: ../midori/main.c:93
 msgid "Run within gdb and save a backtrace on crash"
 msgstr "以 gdb 執行並在當掉時儲存追蹤資訊"
 
-#: ../midori/main.c:115
+#: ../midori/main.c:95
 msgid "Run the specified filename as javascript"
 msgstr "將指定檔名當做 javascript 來執行"
 
-#: ../midori/main.c:117
+#: ../midori/main.c:97
 msgid "Take a snapshot of the specified URI"
 msgstr "拍攝指定 URI 的快照"
 
-#: ../midori/main.c:119
+#: ../midori/main.c:99
 msgid "Execute the specified command"
 msgstr "執行指定的指令"
 
-#: ../midori/main.c:121
+#: ../midori/main.c:101
 msgid "List available commands to execute with -e/ --execute"
 msgstr "列出可透過 -e/ --execute 執行的指令"
 
-#: ../midori/main.c:123
+#: ../midori/main.c:103
 msgid "Display program version"
 msgstr "顯示程式版本"
 
-#: ../midori/main.c:125
+#: ../midori/main.c:105
 msgid "Addresses"
 msgstr "位址"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "根據常規表示式 PATTERN 封鎖 URI"
 
-#: ../midori/main.c:127
+#: ../midori/main.c:107
 msgid "PATTERN"
 msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "在 SECONDS 秒不活動後重設 Midori"
 
-#: ../midori/main.c:131
+#: ../midori/main.c:111
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:156
+#: ../midori/main.c:136
 msgid "Error: \"gdb\" can't be found\n"
 msgstr "錯誤:找不到「gdb」\n"
 
-#: ../midori/main.c:182
+#: ../midori/main.c:162
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "請回報意見、建議和錯誤給:"
 
-#: ../midori/main.c:184
+#: ../midori/main.c:164
 msgid "Check for new versions at:"
 msgstr "檢查看看新版本於:"
 
-#: ../midori/main.c:382
+#: ../midori/main.c:358
 msgid "An unknown error occured"
 msgstr "遭遇未知錯誤"
 
-#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6119
+#: ../midori/midori-app.c:1153 ../midori/midori-browser.c:5902
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: ../midori/midori-app.c:1361
+#: ../midori/midori-app.c:1154
 msgid "Add Boo_kmark"
 msgstr "加入書籤(_K)"
 
-#: ../midori/midori-app.c:1362
+#: ../midori/midori-app.c:1155
 msgid "_Extensions"
-msgstr "æ\93´å\85\85å\8a\9fè\83½(_E)"
+msgstr "æ\93´å\85\85å¥\97件(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177
+#: ../midori/midori-app.c:1156 ../midori/midori-privatedata.c:178
 msgid "_History"
 msgstr "歷史(_H)"
 
-#: ../midori/midori-app.c:1364
+#: ../midori/midori-app.c:1157
 msgid "_Userscripts"
-msgstr "使用者令稿(_U)"
+msgstr "使用者令稿(_U)"
 
-#: ../midori/midori-app.c:1365
+#: ../midori/midori-app.c:1158
 msgid "User_styles"
 msgstr "使用者樣式(_S)"
 
-#: ../midori/midori-app.c:1366
+#: ../midori/midori-app.c:1159
 msgid "New _Tab"
 msgstr "新分頁(_T)"
 
-#: ../midori/midori-app.c:1367
+#: ../midori/midori-app.c:1160
 msgid "_Transfers"
 msgstr "傳輸(_T)"
 
-#: ../midori/midori-app.c:1368
+#: ../midori/midori-app.c:1161
 msgid "Netscape p_lugins"
-msgstr "Netscape 外掛程式(_L)"
+msgstr "Netscape 插件(_L)"
 
-#: ../midori/midori-app.c:1369
+#: ../midori/midori-app.c:1162
 msgid "_Closed Tabs"
 msgstr "關閉的分頁(_C)"
 
-#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5263
+#: ../midori/midori-app.c:1163 ../midori/midori-browser.c:5069
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../midori/midori-app.c:1371
+#: ../midori/midori-app.c:1164
 msgid "New _Folder"
 msgstr "新資料夾(_F)"
 
-#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429
-#: ../midori/midori-app.c:1432
+#: ../midori/midori-app.c:1213 ../midori/midori-app.c:1216
+#: ../midori/midori-app.c:1219
 msgid "[Addresses]"
 msgstr "[位址]"
 
@@ -228,134 +229,146 @@ msgstr "異常文件。"
 msgid "Unrecognized bookmark format."
 msgstr "無法辨識的書籤格式。"
 
-#: ../midori/midori-browser.c:324 ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:309 ../midori/midori-browser.c:5198
 msgid "Go forward to the next page"
 msgstr "前往下一頁"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5403
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:316 ../midori/midori-browser.c:5206
 msgid "Go to the next sub-page"
 msgstr "前往下一子頁"
 
-#: ../midori/midori-browser.c:341
+#: ../midori/midori-browser.c:326
 msgid "Web Search…"
 msgstr "網頁搜尋…"
 
-#: ../midori/midori-browser.c:445 ../midori/midori-browser.c:5344
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:430 ../midori/midori-browser.c:1961
+#: ../midori/midori-browser.c:5144 ../midori/midori-browser.c:5153
 msgid "Reload the current page"
 msgstr "重新載入目前頁面"
 
-#: ../midori/midori-browser.c:453 ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:438 ../midori/midori-browser.c:5150
 msgid "Stop loading the current page"
 msgstr "停止載入目前頁面"
 
-#: ../midori/midori-browser.c:523
+#: ../midori/midori-browser.c:514
 #, c-format
 msgid "Failed to update title: %s\n"
 msgstr "更新標題失敗:%s\n"
 
-#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:618
-#: ../midori/midori-browser.c:621 ../midori/midori-websettings.c:1465
+#: ../midori/midori-browser.c:554 ../midori/midori-browser.c:610
+#: ../midori/midori-browser.c:613 ../midori/midori-websettings.c:1461
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "「%s」值對於 %s 無效"
 
-#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:641
-#: ../midori/midori-browser.c:6928
+#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:633
+#: ../midori/midori-browser.c:6647
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "未預期的設定「%s」"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-browser.c:651
+#: ../midori/midori-browser.c:570 ../midori/midori-browser.c:643
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "未預期的動作「%s」。"
 
-#: ../midori/midori-browser.c:731
+#: ../midori/midori-browser.c:723
 #, c-format
 msgid "%s (Private Browsing)"
 msgstr "%s (私密瀏覽)"
 
-#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883
-#: ../panels/midori-bookmarks.c:114
+#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:3946
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "無法插入新歷史項目:%s\n"
+
+#: ../midori/midori-browser.c:898
+msgid "Select [text]"
+msgstr "選取 [文字]"
+
+#: ../midori/midori-browser.c:927 ../panels/midori-bookmarks.c:148
+#: ../midori/midori-bookmarks-db.c:153
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../midori/midori-browser.c:937
-msgid "New folder"
-msgstr "新資料夾"
+#: ../midori/midori-browser.c:1095
+msgid "New Folder"
+msgstr "新資料夾"
 
-#: ../midori/midori-browser.c:937
-msgid "Edit folder"
+#: ../midori/midori-browser.c:1095
+msgid "Edit Folder"
 msgstr "編輯資料夾"
 
-#: ../midori/midori-browser.c:939
-msgid "New bookmark"
-msgstr "新書籤"
+#: ../midori/midori-browser.c:1097
+msgid "New Bookmark"
+msgstr "新書籤"
 
-#: ../midori/midori-browser.c:939
-msgid "Edit bookmark"
+#: ../midori/midori-browser.c:1097
+msgid "Edit Bookmark"
 msgstr "編輯書籤"
 
-#: ../midori/midori-browser.c:973
-msgid "Type a name for this bookmark and choose where to keep it."
-msgstr "è«\8bç\82ºæ­¤æ\9b¸ç±¤è¼¸å\85¥å\80\8bå\90\8d稱ï¼\8c並é\81¸æ\93\87æ\82¨æ\83³å°\87å®\83ä¿\9då­\98å\9c¨å\93ªå\80\8bå\9c°æ\96¹。"
+#: ../midori/midori-browser.c:1119
+msgid "Type a name for this bookmark, and choose where to keep it."
+msgstr "è«\8bç\82ºæ­¤æ\9b¸ç±¤è¼¸å\85¥å\90\8d稱ï¼\8c並é\81¸æ\93\87ä¿\9då­\98æ\9b¸ç±¤ç\9a\84ä½\8dç½®。"
 
-#: ../midori/midori-browser.c:1029
-msgid "Add to _Speed Dial"
-msgstr "加入至快速播號(_S)"
+#: ../midori/midori-browser.c:1121
+msgid "Type a name for this folder, and choose where to keep it."
+msgstr "請為此資料夾輸入名稱,並選擇保存資料夾的位置。"
 
-#: ../midori/midori-browser.c:1037
-msgid "Show in the tool_bar"
-msgstr "顯示於工具列內(_B)"
+#: ../midori/midori-browser.c:1175
+msgid "Show in Bookmarks _Bar"
+msgstr "顯示於書籤列中(_B)"
 
-#: ../midori/midori-browser.c:1045
-msgid "Run as _web application"
-msgstr "以網頁應用程式執行(_W)"
+#: ../midori/midori-browser.c:1185
+msgid "Add to _Speed Dial"
+msgstr "加入至快速播號(_S)"
 
-#: ../midori/midori-browser.c:1158 ../midori/midori-browser.c:4506
+#: ../midori/midori-browser.c:1301 ../midori/midori-browser.c:4518
 msgid "Save file as"
 msgstr "檔案另存為"
 
-#: ../midori/midori-browser.c:1168
+#: ../midori/midori-browser.c:1311
 msgid "Save associated _resources"
 msgstr "儲存相關資源(_R)"
 
-#: ../midori/midori-browser.c:1398
+#: ../midori/midori-browser.c:1608
 msgid "A new window has been opened"
 msgstr "新視窗已經開啟"
 
-#: ../midori/midori-browser.c:1401
+#: ../midori/midori-browser.c:1611
 msgid "A new tab has been opened"
 msgstr "新分頁已經開啟"
 
-#: ../midori/midori-browser.c:1419
+#: ../midori/midori-browser.c:1629
 msgid "Error opening the image!"
 msgstr "開啟影像時發生錯誤!"
 
-#: ../midori/midori-browser.c:1420
+#: ../midori/midori-browser.c:1630
 msgid "Can not open selected image in a default viewer."
 msgstr "無法在預設檢視器中開啟所選的影像。"
 
-#: ../midori/midori-browser.c:1426
+#: ../midori/midori-browser.c:1636
 msgid "Error downloading the image!"
 msgstr "下載影像流時發生錯誤!"
 
-#: ../midori/midori-browser.c:1427
+#: ../midori/midori-browser.c:1637
 msgid "Can not download selected image."
 msgstr "無法下載所選的影像。"
 
-#: ../midori/midori-browser.c:1504
+#: ../midori/midori-browser.c:1714
 msgid "Save file"
 msgstr "儲存檔案"
 
-#: ../midori/midori-browser.c:2473
+#: ../midori/midori-browser.c:1957 ../midori/midori-browser.c:5146
+msgid "Reload page without caching"
+msgstr "重新載入頁面而不使用快取功能"
+
+#: ../midori/midori-browser.c:2606
 msgid "Open file"
 msgstr "開啟檔案"
 
-#: ../midori/midori-browser.c:2559
+#: ../midori/midori-browser.c:2692
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -363,591 +376,588 @@ msgid ""
 "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:2565 ../extensions/feed-panel/main.c:349
+#: ../midori/midori-browser.c:2698 ../extensions/feed-panel/main.c:350
 msgid "New feed"
 msgstr "新饋流"
 
-#: ../midori/midori-browser.c:2596 ../midori/midori-browser.c:5419
-#: ../panels/midori-bookmarks.c:527
+#: ../midori/midori-browser.c:2729 ../midori/midori-browser.c:5222
+#: ../panels/midori-bookmarks.c:762
 msgid "Add a new bookmark"
 msgstr "加入新的書籤"
 
-#. FIXME: Blacklist/ custom contract doesn't work
-#. gchar* blacklisted_contracts[] = { "print", NULL };
-#. FIXME: granite: should return GtkWidget* like GTK+
-#: ../midori/midori-browser.c:2645 ../midori/midori-browser.c:5295
-msgid "Share this page"
-msgstr "分享此頁面"
-
-#: ../midori/midori-browser.c:3121 ../midori/midori-searchaction.c:450
+#: ../midori/midori-browser.c:3197 ../midori/midori-searchaction.c:448
 msgid "Empty"
 msgstr "清空"
 
-#: ../midori/midori-browser.c:3497 ../midori/midori-browser.c:3498
+#: ../midori/midori-browser.c:3546 ../midori/midori-browser.c:3547
 msgid "Toggle text cursor navigation"
 msgstr "切換文字游標導覽"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3549
 msgid ""
 "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
 "all websites."
 msgstr "請按下 F7 來切換鍵盤瀏覽功能。啟用時,所有的網站都會出現文字游標。"
 
-#: ../midori/midori-browser.c:3503
+#: ../midori/midori-browser.c:3552
 msgid "_Enable Caret Browsing"
 msgstr "啟用鍵盤瀏覽(_E)"
 
-#: ../midori/midori-browser.c:3924 ../midori/midori-browser.c:5866
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "無法插入新歷史項目:%s\n"
-
-#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:835
-#: ../panels/midori-history.c:792
+#: ../midori/midori-browser.c:4231 ../panels/midori-bookmarks.c:1080
+#: ../panels/midori-history.c:738
 msgid "Open all in _Tabs"
 msgstr "以分頁開啟全部(_T)"
 
-#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:841
-#: ../panels/midori-history.c:798 ../extensions/feed-panel/feed-panel.c:511
-msgid "Open in New _Tab"
-msgstr "在新分頁中開啟(_T)"
-
-#: ../midori/midori-browser.c:4248 ../midori/midori-view.c:2930
-#: ../midori/midori-view.c:4886 ../panels/midori-bookmarks.c:843
-#: ../panels/midori-history.c:800 ../extensions/feed-panel/feed-panel.c:513
+#: ../midori/midori-browser.c:4252 ../midori/midori-notebook.vala:348
+#: ../midori/midori-view.c:2463 ../panels/midori-bookmarks.c:1090
+#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:504
 msgid "Open in New _Window"
 msgstr "在新視窗中開啟(_W)"
 
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:4352
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:4353
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4339
+#: ../midori/midori-browser.c:4354
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4340
+#: ../midori/midori-browser.c:4355
 msgid "Konqueror"
 msgstr "征服家"
 
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:4356
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4357
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox (%s)"
 
-#: ../midori/midori-browser.c:4343
+#: ../midori/midori-browser.c:4358
 msgid "Midori 0.2.6"
 msgstr "Midori 0.2.6"
 
-#: ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:4376
 msgid "Import bookmarks…"
 msgstr "匯入書籤…"
 
-#: ../midori/midori-browser.c:4364 ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:4379
 msgid "_Import bookmarks"
 msgstr "匯入書籤(_I)"
 
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:4390
 msgid "_Application:"
 msgstr "應用程式(_A):"
 
-#: ../midori/midori-browser.c:4440
+#: ../midori/midori-browser.c:4455
 msgid "Import from XBEL or HTML file"
 msgstr "從 XBEL 或 HTML 檔案匯入"
 
-#: ../midori/midori-browser.c:4468
+#: ../midori/midori-browser.c:4481
 msgid "Import from a file"
 msgstr "從檔案匯入"
 
-#: ../midori/midori-browser.c:4480
+#: ../midori/midori-browser.c:4493
 msgid "Failed to import bookmarks"
 msgstr "匯入書籤失敗"
 
-#: ../midori/midori-browser.c:4511
+#: ../midori/midori-browser.c:4523
 msgid "XBEL Bookmarks"
 msgstr "XBEL 書籤"
 
-#: ../midori/midori-browser.c:4516
+#: ../midori/midori-browser.c:4528
 msgid "Netscape Bookmarks"
 msgstr "Netscape 書籤"
 
-#: ../midori/midori-browser.c:4530
+#: ../midori/midori-browser.c:4546
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Midori 僅能匯出為 XBEL (*.xbel) 與 Netscape (*.html)"
 
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:4558
 msgid "Failed to export bookmarks"
 msgstr "無法匯出書籤"
 
-#: ../midori/midori-browser.c:4761
+#: ../midori/midori-browser.c:4746
 msgid "A lightweight web browser."
 msgstr "輕量網頁瀏覽器。"
 
-#: ../midori/midori-browser.c:4762
+#: ../midori/midori-browser.c:4747
 msgid "See about:version for version info."
 msgstr "查看 about:version 來取得版本資訊。"
 
-#: ../midori/midori-browser.c:4764
+#: ../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 ""
-"這個函式庫為自由軟體;基於 Free Software Foundation 所發布的 GNU Lesser "
-"General Public License 授權條款,不管是該條款的 2.1 版,或是 (您可自由選擇) "
-"任意後續版本;您可以將它再次散布出去,與/或修改它。"
+"這個函式庫為自由軟體;基於 Free Software Foundation 所發布的 GNU Lesser General Public "
+"License 授權條款,不管是該條款的 2.1 版,或是 (您可自由選擇) 任意後續版本;您可以將它再次散布出去,與/或修改它。"
 
-#: ../midori/midori-browser.c:4799
+#: ../midori/midori-browser.c:4780
 msgid "translator-credits"
 msgstr ""
 "趙惟倫 <william.chao@ossii.com.tw>, 2009.\n"
-"曾政嘉 <pswo10680@gmailcom>, 2010."
+"曾政嘉 <pswo10680@gmailcom>, 2010.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Cheng-Chia Tseng https://launchpad.net/~zerng07\n"
+"  leo  https://launchpad.net/~shing80333"
 
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5032 ../midori/midori-browser.c:5266
+msgid "_Duplicate Current Tab"
+msgstr "製作目前分頁的複本(_D)"
+
+#: ../midori/midori-browser.c:5067
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5070
 msgid "Open a new window"
 msgstr "開啟新視窗"
 
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5073
 msgid "Open a new tab"
 msgstr "開啟新分頁"
 
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5075
 msgid "New P_rivate Browsing Window"
 msgstr "新增私人瀏覽視窗(_R)"
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5079
 msgid "Open a file"
 msgstr "開啟檔案"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5081
 msgid "_Save Page As…"
 msgstr "另存網頁為(_S)…"
 
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5082
 msgid "Save to a file"
 msgstr "儲存到檔案"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5084
 msgid "Add to Speed _dial"
 msgstr "加入快速播號(_D)"
 
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5087
 msgid "Subscribe to News _feed"
 msgstr "訂閱新聞饋流(_F)"
 
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5093
 msgid "_Close Tab"
 msgstr "關閉分頁(_C)"
 
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5094
 msgid "Close the current tab"
 msgstr "關閉目前分頁"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5096
 msgid "C_lose Window"
 msgstr "關閉視窗(_L)"
 
-#: ../midori/midori-browser.c:5294
-msgid "_Share"
-msgstr "分享(_S)"
-
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5100
 msgid "Print the current page"
 msgstr "列印目前頁面"
 
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5102
 msgid "Close a_ll Windows"
 msgstr "關閉所有視窗(_L)"
 
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5105
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5128
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5129
 msgid "Find a word or phrase in the page"
 msgstr "在頁面中尋找字詞或片語"
 
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5131
 msgid "Find _Next"
 msgstr "找下一個(_N)"
 
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5134
 msgid "Find _Previous"
 msgstr "找上一個(_P)"
 
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5138
 msgid "Configure the application preferences"
 msgstr "組配應用程式偏好設定"
 
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5140
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5141
 msgid "_Toolbars"
 msgstr "工具列(_T)"
 
-#: ../midori/midori-browser.c:5346
-msgid "Reload page without caching"
-msgstr "重新載入頁面而不使用快取功能"
-
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5156
 msgid "Increase the zoom level"
 msgstr "增加縮放等級"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5159
 msgid "Decrease the zoom level"
 msgstr "減少縮放等級"
 
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5163 ../midori/midori-view.c:2468
 msgid "_Encoding"
 msgstr "編碼(_E)"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5165
 msgid "View So_urce"
 msgstr "檢視源碼(_U)"
 
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5168
+msgid "View _DOM Source"
+msgstr "檢視 _DOM 源碼"
+
+#: ../midori/midori-browser.c:5171
 msgid "Ca_ret Browsing"
 msgstr "鍵盤瀏覽(_R)"
 
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5175
 msgid "Toggle fullscreen view"
 msgstr "切換全螢幕檢視"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5177
 msgid "Scroll _Left"
 msgstr "向左捲(_L)"
 
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5180
 msgid "Scroll _Down"
 msgstr "向下捲(_D)"
 
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5183
 msgid "Scroll _Up"
 msgstr "向上捲(_U)"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5186
 msgid "Scroll _Right"
 msgstr "向右捲(_R)"
 
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5189
 msgid "_Readable"
 msgstr "可讀(_E)"
 
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5192
 msgid "_Go"
 msgstr "前往(_G)"
 
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5195
 msgid "Go back to the previous page"
 msgstr "回到上一頁"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5202
 msgid "Go to the previous sub-page"
 msgstr "回到上一子頁"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5208
+msgid "Next or Forward"
+msgstr "下一項或前進"
+
+#: ../midori/midori-browser.c:5209
+msgid "Go to the next sub-page or next page in history"
+msgstr "前往下一個子頁或是歷史中的下一頁"
+
+#: ../midori/midori-browser.c:5211
 msgid "_Homepage"
 msgstr "首頁(_H)"
 
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5212
 msgid "Go to your homepage"
 msgstr "前往您的首頁"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5214
 msgid "Empty Trash"
 msgstr "清空回收筒"
 
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5217
 msgid "Undo _Close Tab"
 msgstr "復原關閉分頁(_C)"
 
-#: ../midori/midori-browser.c:5421
+#: ../midori/midori-browser.c:5224
 msgid "Add a new _folder"
 msgstr "加入新的資料夾(_F)"
 
-#: ../midori/midori-browser.c:5427
-msgid "_Export bookmarks"
-msgstr "å\8c¯å\87ºæ\9b¸ç±¤(_E)"
+#: ../midori/midori-browser.c:5227
+msgid "_Import bookmarks…"
+msgstr "å\8c¯å\85¥æ\9b¸ç±¤(_I)â\80¦"
 
-#: ../midori/midori-browser.c:5430 ../midori/midori-searchaction.c:459
-msgid "_Manage Search Engines"
-msgstr "管理搜尋引擎(_M)"
+#: ../midori/midori-browser.c:5230
+msgid "_Export bookmarks…"
+msgstr "匯出書籤(_E)..."
 
-#: ../midori/midori-browser.c:5433
-msgid "_Clear Private Data"
-msgstr "清除隱私資料(_C)"
+#: ../midori/midori-browser.c:5233
+msgid "_Manage Search Engines…"
+msgstr "管理搜尋引擎(_M)..."
+
+#: ../midori/midori-browser.c:5236
+msgid "_Clear Private Data…"
+msgstr "清除隱私資料(_C)…"
 
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5239
 msgid "_Inspect Page"
 msgstr "審閱頁面(_I)"
 
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5243
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5246
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5248
 msgid "Move Tab to _first position"
 msgstr "將分頁移動至第一個位置(_F)"
 
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5250
 msgid "Move Tab _Backward"
 msgstr "將分頁往後移(_B)"
 
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5252
 msgid "_Move Tab Forward"
 msgstr "將分頁往前移(_M)"
 
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5254
 msgid "Move Tab to _last position"
 msgstr "將分頁移動至最後一個位置(_L)"
 
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5257
 msgid "Focus _Current Tab"
 msgstr "專注於目前分頁(_C)"
 
-#: ../midori/midori-browser.c:5457
+#: ../midori/midori-browser.c:5260
 msgid "Focus _Next view"
 msgstr "聚焦下個檢視點(_N)"
 
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5263
 msgid "Only show the Icon of the _Current Tab"
 msgstr "只顯示目前分頁的圖示(_C)"
 
-#: ../midori/midori-browser.c:5463
-msgid "_Duplicate Current Tab"
-msgstr "製作目前分頁的複本(_D)"
-
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5269
 msgid "Close Ot_her Tabs"
 msgstr "關閉其它分頁(_H)"
 
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5272
 msgid "Open last _session"
 msgstr "開啟上次工作階段(_S)"
 
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5275
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5277
 msgid "_Frequent Questions"
 msgstr "常見問題(_F)"
 
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5280
 msgid "_Report a Problem…"
 msgstr "回報問題(_R)…"
 
-#: ../midori/midori-browser.c:5482 ../midori/midori-browser.c:6138
+#: ../midori/midori-browser.c:5285 ../midori/midori-browser.c:5921
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5292
 msgid "_Menubar"
 msgstr "選單列(_M)"
 
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5296
 msgid "_Navigationbar"
 msgstr "導覽列(_N)"
 
-#: ../midori/midori-browser.c:5497
+#: ../midori/midori-browser.c:5300
 msgid "Side_panel"
 msgstr "側邊面板(_P)"
 
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5301
 msgid "Sidepanel"
 msgstr "側邊面板"
 
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5304
 msgid "_Bookmarkbar"
 msgstr "書籤列(_B)"
 
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5308
 msgid "_Statusbar"
 msgstr "狀態列(_S)"
 
-#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5317 ../midori/midori-websettings.c:226
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5320 ../midori/midori-websettings.c:150
 msgid "Chinese Traditional (BIG5)"
 msgstr "正體中文 (BIG5)"
 
-#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5323 ../midori/midori-websettings.c:151
 msgid "Chinese Simplified (GB18030)"
 msgstr "簡體中文 (GB18030)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5524
+#: ../midori/midori-browser.c:5327
 msgid "Japanese (SHIFT__JIS)"
 msgstr "日文 (SHIFT__JIS)"
 
-#: ../midori/midori-browser.c:5527 ../midori/midori-websettings.c:154
+#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:153
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: ../midori/midori-browser.c:5530 ../midori/midori-websettings.c:155
+#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:154
 msgid "Russian (KOI8-R)"
 msgstr "俄文 (KOI8-R)"
 
-#: ../midori/midori-browser.c:5533 ../midori/midori-websettings.c:156
+#: ../midori/midori-browser.c:5336 ../midori/midori-websettings.c:155
 msgid "Unicode (UTF-8)"
 msgstr "統一碼 (UTF-8)"
 
-#: ../midori/midori-browser.c:5536 ../midori/midori-websettings.c:157
+#: ../midori/midori-browser.c:5339 ../midori/midori-websettings.c:156
 msgid "Western (ISO-8859-1)"
 msgstr "西歐 (ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5539 ../midori/midori-websettings.c:158
-#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:420
+#: ../midori/midori-browser.c:5342 ../midori/midori-websettings.c:157
+#: ../midori/midori-websettings.c:233 ../katze/katze-utils.c:421
 msgid "Custom…"
 msgstr "自訂…"
 
-#: ../midori/midori-browser.c:6044
+#: ../midori/midori-browser.c:5651
+#, c-format
+msgid "Failed to initialize history: %s"
+msgstr "初始化歷史時失敗:%s"
+
+#: ../midori/midori-browser.c:5827
 msgid "_Separator"
 msgstr "分隔符號(_S)"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:5834
 msgid "_Location…"
 msgstr "位置(_L)…"
 
-#: ../midori/midori-browser.c:6053
+#: ../midori/midori-browser.c:5836
 msgid "Open a particular location"
 msgstr "開啟特定位置"
 
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:5858
 msgid "_Web Search…"
 msgstr "網頁搜尋(_W)…"
 
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5860
 msgid "Run a web search"
 msgstr "執行網頁搜尋"
 
-#: ../midori/midori-browser.c:6104
+#: ../midori/midori-browser.c:5887
 msgid "Reopen a previously closed tab or window"
 msgstr "重新開啟之前關閉的分頁或視窗"
 
-#: ../midori/midori-browser.c:6121
+#: ../midori/midori-browser.c:5904
 msgid "Show the saved bookmarks"
 msgstr "顯示已儲存書籤"
 
-#: ../midori/midori-browser.c:6154
+#: ../midori/midori-browser.c:5937
 msgid "_Tabs"
 msgstr "分頁(_T)"
 
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:5939
 msgid "Show a list of all open tabs"
 msgstr "顯示所有開啟分頁的清單"
 
-#: ../midori/midori-browser.c:6170
+#: ../midori/midori-browser.c:5953
 msgid "_Menu"
 msgstr "選單(_M)"
 
-#: ../midori/midori-browser.c:6172
+#: ../midori/midori-browser.c:5955
 msgid "Menu"
 msgstr "選單"
 
 #: ../midori/midori-extension.c:341
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr "ç\84¡æ³\95è¼\89å\85¥ã\80\8c%sã\80\8dæ\93´å\85\85å\8a\9fè\83½的組態:%s\n"
+msgstr "ç\84¡æ³\95è¼\89å\85¥ã\80\8c%sã\80\8dæ\93´å\85\85å¥\97件的組態:%s\n"
 
-#: ../midori/midori-extension.c:886 ../extensions/addons.c:1681
+#: ../midori/midori-extension.c:894 ../extensions/addons.c:1680
 #, c-format
 msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr "ç\84¡æ³\95å\84²å­\98ã\80\8c%sã\80\8dæ\93´å\85\85å\8a\9fè\83½的組態:%s\n"
+msgstr "ç\84¡æ³\95å\84²å­\98ã\80\8c%sã\80\8dæ\93´å\85\85å¥\97件的組態:%s\n"
 
-#: ../midori/midori-locationaction.c:1333
+#: ../midori/midori-locationaction.c:1325
 msgid "Export certificate"
 msgstr "匯出憑證"
 
-#: ../midori/midori-locationaction.c:1364
+#: ../midori/midori-locationaction.c:1356
 msgid "The signing certificate authority is not known."
 msgstr "簽署憑證的授權機構未知。"
 
-#: ../midori/midori-locationaction.c:1366
+#: ../midori/midori-locationaction.c:1358
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "憑證不符合其由來網站的預期身份。"
 
-#: ../midori/midori-locationaction.c:1368
+#: ../midori/midori-locationaction.c:1360
 msgid "The certificate's activation time is still in the future."
 msgstr "憑證的啟用時間仍在未來。"
 
-#: ../midori/midori-locationaction.c:1370
+#: ../midori/midori-locationaction.c:1362
 msgid "The certificate has expired"
 msgstr "憑證已過期"
 
-#: ../midori/midori-locationaction.c:1372
+#: ../midori/midori-locationaction.c:1364
 msgid ""
 "The certificate has been revoked according to the GTlsConnection's "
 "certificate revocation list."
 msgstr "憑證已根據 GTlsConnection 的憑證撤銷清單而被撤銷。"
 
-#: ../midori/midori-locationaction.c:1374
+#: ../midori/midori-locationaction.c:1366
 msgid "The certificate's algorithm is considered insecure."
 msgstr "憑證的演算法被認為是不安全的。"
 
-#: ../midori/midori-locationaction.c:1376
+#: ../midori/midori-locationaction.c:1368
 msgid "Some other error occurred validating the certificate."
 msgstr "驗證平證實遭遇一些其他錯誤。"
 
-#: ../midori/midori-locationaction.c:1427
+#: ../midori/midori-locationaction.c:1419
 msgid "_Export certificate"
 msgstr "匯出憑證(_E)"
 
-#: ../midori/midori-locationaction.c:1440
+#: ../midori/midori-locationaction.c:1432
 msgid "Self-signed"
 msgstr "自我簽署"
 
-#: ../midori/midori-locationaction.c:1471
+#: ../midori/midori-locationaction.c:1465
 msgid "Security details"
 msgstr "安全性細節"
 
 #. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1554
+#: ../midori/midori-locationaction.c:1551
 msgid "Paste and p_roceed"
 msgstr "貼上並處理(_R)"
 
-#: ../midori/midori-locationaction.c:1808
+#: ../midori/midori-locationaction.c:1803
 msgid "Not verified"
 msgstr "尚未驗證"
 
-#: ../midori/midori-locationaction.c:1814
+#: ../midori/midori-locationaction.c:1809
 msgid "Verified and encrypted connection"
 msgstr "通過驗證且經過加密的連線"
 
-#: ../midori/midori-locationaction.c:1819
+#: ../midori/midori-locationaction.c:1814
 msgid "Open, unencrypted connection"
 msgstr "開放、未加密的連線"
 
@@ -964,840 +974,853 @@ msgstr "關閉面板"
 msgid "Align sidepanel to the left"
 msgstr "側面板靠左對齊"
 
-#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135
+#: ../midori/midori-websettings.c:113 ../midori/midori-websettings.c:134
 msgid "Show Speed Dial"
 msgstr "顯示快速播號"
 
-#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133
+#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:132
 msgid "Show Homepage"
 msgstr "顯示首頁"
 
-#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:362
+#: ../midori/midori-websettings.c:115 ../midori/midori-frontend.c:364
 msgid "Show last open tabs"
 msgstr "顯示最近開啟的分頁"
 
-#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:361
+#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:363
 msgid "Show last tabs without loading"
 msgstr "顯示上次的分頁但不要載入"
 
-#: ../midori/midori-websettings.c:132
+#: ../midori/midori-websettings.c:131
 msgid "Show Blank Page"
 msgstr "顯示空白頁面"
 
-#: ../midori/midori-websettings.c:134
+#: ../midori/midori-websettings.c:133
 msgid "Show default Search Engine"
 msgstr "顯示預設搜尋引擎"
 
-#: ../midori/midori-websettings.c:136
+#: ../midori/midori-websettings.c:135
 msgid "Show custom page"
 msgstr "顯示自訂頁"
 
-#: ../midori/midori-websettings.c:153
+#: ../midori/midori-websettings.c:152
 msgid "Japanese (SHIFT_JIS)"
 msgstr "日文 (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:173
+#: ../midori/midori-websettings.c:172
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../midori/midori-websettings.c:174
+#: ../midori/midori-websettings.c:173
 msgid "New window"
 msgstr "新視窗"
 
-#: ../midori/midori-websettings.c:175
+#: ../midori/midori-websettings.c:174
 msgid "Current tab"
 msgstr "目前分頁"
 
-#: ../midori/midori-websettings.c:190
+#: ../midori/midori-websettings.c:189
 msgid "Default"
 msgstr "預設"
 
-#: ../midori/midori-websettings.c:191
+#: ../midori/midori-websettings.c:190
 msgid "Icons"
 msgstr "圖示"
 
-#: ../midori/midori-websettings.c:192
+#: ../midori/midori-websettings.c:191
 msgid "Small icons"
 msgstr "小圖示"
 
-#: ../midori/midori-websettings.c:193
+#: ../midori/midori-websettings.c:192
 msgid "Text"
 msgstr "文字"
 
-#: ../midori/midori-websettings.c:194
+#: ../midori/midori-websettings.c:193
 msgid "Icons and text"
 msgstr "圖示與文字"
 
-#: ../midori/midori-websettings.c:195
+#: ../midori/midori-websettings.c:194
 msgid "Text beside icons"
 msgstr "文字於圖示旁"
 
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:209
 msgid "Automatic (GNOME or environment)"
 msgstr "自動 (GNOME 或環境)"
 
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:210
 msgid "HTTP proxy server"
 msgstr "HTTP 代理伺服器"
 
-#: ../midori/midori-websettings.c:212
+#: ../midori/midori-websettings.c:211
 msgid "No proxy server"
 msgstr "無代理伺服器"
 
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:228
 msgid "Chrome"
 msgstr "Chrome"
 
-#: ../midori/midori-websettings.c:230
+#: ../midori/midori-websettings.c:229
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:231
+#: ../midori/midori-websettings.c:230
 msgid "iPhone"
 msgstr "iPhone"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:231
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:232
 msgid "Internet Explorer"
 msgstr "網路探險家"
 
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:307
 msgid "The style of the toolbar"
 msgstr "工具列的樣式"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:491
 msgid "Always use my font choices"
 msgstr "總是使用我的字型選擇"
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:492
 msgid "Override fonts picked by websites with user preferences"
 msgstr "用使用者的偏好設定凌駕網站挑選的字型"
 
-#: ../midori/midori-websettings.c:1410 ../midori/midori-websettings.c:1416
+#: ../midori/midori-websettings.c:1406 ../midori/midori-websettings.c:1412
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "無法載入組態:%s\n"
 
-#: ../midori/midori-websettings.c:1470 ../midori/midori-websettings.c:1581
+#: ../midori/midori-websettings.c:1466 ../midori/midori-websettings.c:1581
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "無效的組態值「%s」"
 
-#: ../midori/midori-tab.vala:122
+#: ../midori/midori-tab.vala:133
 #, c-format
 msgid "Failed to inject stylesheet: %s"
-msgstr "無法引入樣式表:%s"
+msgstr "無法注入樣式表:%s"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Label"
+msgstr "顯示分頁標籤(_L)"
+
+#: ../midori/midori-notebook.vala:353
+msgid "Show Tab _Icon Only"
+msgstr "只顯示分頁圖示(_I)"
+
+#: ../midori/midori-notebook.vala:358
+msgid "Close Tab to the R_ight"
+msgid_plural "Close Tabs to the R_ight"
+msgstr[0] "關閉右方分頁(_I)"
+
+#: ../midori/midori-notebook.vala:370
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "關閉其他分頁(_H)"
 
-#: ../midori/midori-view.c:861 ../midori/midori-view.c:984
+#: ../midori/midori-view.c:620 ../midori/midori-view.c:738
 msgid "Trust this website"
 msgstr "信任此網站"
 
-#: ../midori/midori-view.c:982
+#: ../midori/midori-view.c:736
 msgid "Security unknown"
 msgstr "安全性未知"
 
-#: ../midori/midori-view.c:1334
+#: ../midori/midori-view.c:1025
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s 想要儲存一門 HTML 資料庫。"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Deny"
 msgstr "拒絕(_D)"
 
-#: ../midori/midori-view.c:1338 ../midori/midori-view.c:1370
+#: ../midori/midori-view.c:1029 ../midori/midori-view.c:1060
 msgid "_Allow"
 msgstr "允許(_A)"
 
-#: ../midori/midori-view.c:1366
+#: ../midori/midori-view.c:1056
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s 想要知道您的所在位置。"
 
-#: ../midori/midori-view.c:1497
+#: ../midori/midori-view.c:1210
 #, c-format
-msgid "Error - %s"
-msgstr "錯誤 - %s"
+msgid "'%s' can't be found"
+msgstr "找不到「%s」"
 
-#: ../midori/midori-view.c:1498
+#: ../midori/midori-view.c:1211
 #, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "無法載入「%s」頁面"
+msgid "The page '%s' couldn't be loaded:"
+msgstr "無法載入「%s」頁面"
 
-#: ../midori/midori-view.c:1500 ../midori/midori-view.c:1644
-msgid "Try again"
-msgstr "重試"
+#: ../midori/midori-view.c:1215
+msgid "Check the address for typos"
+msgstr "請檢查位址是否有打字有誤"
+
+#: ../midori/midori-view.c:1216
+msgid ""
+"Make sure that an ethernet cable is plugged in or the wireless card is "
+"activated"
+msgstr "請確認乙太網路線是否插入,或是無線網卡是否有啟動"
+
+#: ../midori/midori-view.c:1217
+msgid "Verify that your network settings are correct"
+msgstr "請驗證您的網路設定是否正確"
 
-#: ../midori/midori-view.c:1641
+#: ../midori/midori-view.c:1221
+msgid "Try Again"
+msgstr "再試一次"
+
+#: ../midori/midori-view.c:1346
 #, c-format
 msgid "Oops - %s"
 msgstr "哇咧 - %s"
 
-#: ../midori/midori-view.c:1642
+#: ../midori/midori-view.c:1347
 #, c-format
 msgid "Something went wrong with '%s'."
 msgstr "「%s」有東西出錯了。"
 
-#: ../midori/midori-view.c:1789 ../midori/midori-view.c:2871
+#: ../midori/midori-view.c:1349
+msgid "Try again"
+msgstr "重試"
+
+#: ../midori/midori-view.c:1496 ../midori/midori-view.c:2397
 #, c-format
 msgid "Send a message to %s"
 msgstr "傳送訊息至 %s"
 
-#: ../midori/midori-view.c:2656
+#: ../midori/midori-view.c:2304
 msgid "Add _search engine..."
 msgstr "加入搜尋引擎(_S)..."
 
-#: ../midori/midori-view.c:2699 ../midori/midori-view.c:3003
-msgid "Inspect _Element"
-msgstr "審閱元素(_E)"
+#: ../midori/midori-view.c:2317
+msgid "Open _Link"
+msgstr "開啟連結(_L)"
 
-#: ../midori/midori-view.c:2751
+#: ../midori/midori-view.c:2324
 msgid "Open Link in New _Tab"
 msgstr "在新分頁中開啟鏈結(_T)"
 
-#: ../midori/midori-view.c:2755
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Foreground Tab"
 msgstr "在前景分頁中開啟鏈結(_F)"
 
-#: ../midori/midori-view.c:2756
+#: ../midori/midori-view.c:2330
 msgid "Open Link in _Background Tab"
 msgstr "在背景分頁中開啟鏈結(_B)"
 
-#: ../midori/midori-view.c:2759
+#: ../midori/midori-view.c:2332
 msgid "Open Link in New _Window"
 msgstr "在開新視窗中開啟鏈結(_W)"
 
-#: ../midori/midori-view.c:2762
-msgid "Open Link as Web A_pplication"
-msgstr "開啟鏈結為網頁應用程式(_P)"
-
-#: ../midori/midori-view.c:2767
+#: ../midori/midori-view.c:2336
 msgid "Copy Link de_stination"
 msgstr "複製鏈結目的地(_S)"
 
-#: ../midori/midori-view.c:2773
+#. GTK_STOCK_SAVE_AS is lacking the underline
+#: ../midori/midori-view.c:2342
 msgid "Save _As…"
 msgstr "另存為(_A)…"
 
-#: ../midori/midori-view.c:2783
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Window"
 msgstr "在新視窗中開啟影像(_W)"
 
-#: ../midori/midori-view.c:2784
+#: ../midori/midori-view.c:2354
 msgid "Open _Image in New Tab"
 msgstr "於新分頁中開啟影像(_I)"
 
-#: ../midori/midori-view.c:2788
+#: ../midori/midori-view.c:2357
 msgid "Copy Im_age"
 msgstr "複製影像(_A)"
 
-#: ../midori/midori-view.c:2791
+#: ../midori/midori-view.c:2359
 msgid "Save I_mage"
 msgstr "儲存影像(_M)"
 
-#: ../midori/midori-view.c:2794
+#: ../midori/midori-view.c:2361
 msgid "Open in Image _Viewer"
 msgstr "於影像檢視器中開啟(_V)"
 
-#: ../midori/midori-view.c:2801
+#: ../midori/midori-view.c:2367
 msgid "Copy Video _Address"
 msgstr "複製視訊位址(_A)"
 
-#: ../midori/midori-view.c:2804
-msgid "Save _Video"
-msgstr "儲存視訊(_V)"
-
-#: ../midori/midori-view.c:2804
+#: ../midori/midori-view.c:2369
 msgid "Download _Video"
 msgstr "下載視訊(_V)"
 
-#: ../midori/midori-view.c:2830
+#: ../midori/midori-view.c:2406
+msgid "Open Address in New _Tab"
+msgstr "在新分頁中開啟位址(_T)"
+
+#: ../midori/midori-view.c:2416
 msgid "Search _with"
 msgstr "以此搜尋(_S)"
 
-#: ../midori/midori-view.c:2859
+#: ../midori/midori-view.c:2442
 msgid "_Search the Web"
 msgstr "搜尋網頁(_S)"
 
-#: ../midori/midori-view.c:2879
-msgid "Open Address in New _Tab"
-msgstr "在新分頁中開啟位址(_T)"
-
-#: ../midori/midori-view.c:2926
+#: ../midori/midori-view.c:2459
 msgid "Open _Frame in New Tab"
 msgstr "於新分頁中開啟框架(_F)"
 
-#: ../midori/midori-view.c:3147
+#: ../midori/midori-view.c:2494
+msgid "Inspect _Element"
+msgstr "審閱元素(_E)"
+
+#: ../midori/midori-view.c:2715
 #, c-format
 msgid "Open or download file from %s"
 msgstr "從 %s 開啟或下載檔案"
 
-#: ../midori/midori-view.c:3161 ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:2729 ../midori/midori-view.c:2732
 #, c-format
 msgid "File Name: %s"
 msgstr "檔案名稱:%s"
 
-#: ../midori/midori-view.c:3170
+#: ../midori/midori-view.c:2738
 #, c-format
 msgid "File Type: '%s'"
 msgstr "檔案類型:'%s'"
 
-#: ../midori/midori-view.c:3172
+#: ../midori/midori-view.c:2740
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "檔案類型:%s ('%s')"
 
-#: ../midori/midori-view.c:3210
+#: ../midori/midori-view.c:2778
 #, c-format
 msgid "Size: %s"
 msgstr "大小:%s"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3223 ../midori/midori-view.c:3225
+#: ../midori/midori-view.c:2791 ../midori/midori-view.c:2793
 #, c-format
 msgid "Open %s"
 msgstr "開啟 %s"
 
-#: ../midori/midori-view.c:3771
+#: ../midori/midori-view.c:3313
 #, c-format
 msgid "Inspect page - %s"
 msgstr "審閱頁面 - %s"
 
-#: ../midori/midori-view.c:4335
-#, c-format
-msgid "No documentation installed"
-msgstr "沒有已安裝文件"
-
-#: ../midori/midori-view.c:4411
+#: ../midori/midori-view.c:3898
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori 不會儲存任何個人資料;"
 
-#: ../midori/midori-view.c:4412
+#: ../midori/midori-view.c:3899
 msgid "No history or web cookies are being saved."
 msgstr "沒有歷史或網頁訊餅將被儲存。"
 
-#: ../midori/midori-view.c:4413
+#: ../midori/midori-view.c:3900
 msgid "Extensions are disabled."
 msgstr "擴充套件已停用。"
 
-#: ../midori/midori-view.c:4414
+#: ../midori/midori-view.c:3901
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "HTML 5 儲存、本地端資料庫、應用程式快取等皆已停用。"
 
-#: ../midori/midori-view.c:4415
+#: ../midori/midori-view.c:3902
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori 防止下列網站追蹤使用者:"
 
-#: ../midori/midori-view.c:4416
+#: ../midori/midori-view.c:3903
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "Referrer URL 被截短成主機名稱。"
 
-#: ../midori/midori-view.c:4417
+#: ../midori/midori-view.c:3904
 msgid "DNS prefetching is disabled."
 msgstr "DNS 預擷取已停用。"
 
-#: ../midori/midori-view.c:4418
+#: ../midori/midori-view.c:3905
 msgid "The language and timezone are not revealed to websites."
 msgstr "語言與時區不顯露給這些網站。"
 
-#: ../midori/midori-view.c:4419
+#: ../midori/midori-view.c:3906
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "Flash 與其他 Netscape 插件無法被這些網站列出。"
 
-#: ../midori/midori-view.c:4460
+#: ../midori/midori-view.c:3949
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "中括號內的版本編號顯示執行時期使用的版本。"
 
-#: ../midori/midori-view.c:4509
-msgid "Page loading delayed"
-msgstr "頁面載入延遲"
+#: ../midori/midori-view.c:3999
+msgid "Page loading delayed:"
+msgstr "網頁載入延遲:"
 
-#: ../midori/midori-view.c:4510
+#: ../midori/midori-view.c:4000
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "載入延遲,可能是因為最近的當掉或啟動偏好設定之故。"
 
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:4002
 msgid "Load Page"
 msgstr "載入頁面"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4167
 msgid "Blank page"
 msgstr "空白頁面"
 
-#: ../midori/midori-view.c:4890
-msgid "_Duplicate Tab"
-msgstr "製作頁面複本(_E)"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Label"
-msgstr "顯示分頁標籤(_L)"
-
-#: ../midori/midori-view.c:4895
-msgid "Show Tab _Icon Only"
-msgstr "只顯示分頁圖示(_I)"
-
-#: ../midori/midori-view.c:4902
-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:5596
+#: ../midori/midori-view.c:4709
 msgid "previous"
 msgstr "上一頁"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5615
+#: ../midori/midori-view.c:4728
 msgid "next"
 msgstr "下一頁"
 
-#: ../midori/midori-view.c:5629
+#: ../midori/midori-view.c:4742
 msgid "Print background images"
 msgstr "列印背景圖像"
 
-#: ../midori/midori-view.c:5630
+#: ../midori/midori-view.c:4743
 msgid "Whether background images should be printed"
 msgstr "是否應該列印背景圖像"
 
-#: ../midori/midori-view.c:5660
+#: ../midori/midori-view.c:4781
 msgid "Features"
 msgstr "特色"
 
 #. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/midori-download.vala:63
+#: ../midori/midori-download.vala:59
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
-#: ../midori/midori-download.vala:79
+#: ../midori/midori-download.vala:75
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
-#: ../midori/midori-download.vala:80
+#: ../midori/midori-download.vala:76
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 
-#: ../midori/midori-download.vala:81
+#: ../midori/midori-download.vala:77
 #, 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:96
+#: ../midori/midori-download.vala:92
 #, c-format
 msgid " - %s remaining"
 msgstr " - 還要 %s"
 
 #. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/midori-download.vala:107
+#: ../midori/midori-download.vala:103
 msgid "?B"
 msgstr "?B"
 
 #. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/midori-download.vala:109
+#: ../midori/midori-download.vala:105
 #, c-format
 msgid " (%s/s)"
 msgstr " (%s/s)"
 
-#: ../midori/midori-download.vala:224
+#: ../midori/midori-download.vala:220
 msgid "The downloaded file is erroneous."
 msgstr "下載的檔案有錯誤。"
 
-#: ../midori/midori-download.vala:225
+#: ../midori/midori-download.vala:221
 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:345
+#: ../midori/midori-download.vala:366
 #, c-format
 msgid "The file \"%s\" can't be saved in this folder."
 msgstr "標題「%s」無法儲存於此資料夾。"
 
-#: ../midori/midori-download.vala:347
+#: ../midori/midori-download.vala:368
 msgid "You don't have permission to write in this location."
 msgstr "您尚未獲得寫入此位置的許可。"
 
-#: ../midori/midori-download.vala:350
+#: ../midori/midori-download.vala:371
 #, c-format
 msgid "There is not enough free space to download \"%s\"."
 msgstr "沒有足夠的空間可以讓您下載「%s」。"
 
-#: ../midori/midori-download.vala:352
+#: ../midori/midori-download.vala:373
 #, c-format
 msgid "The file needs %s but only %s are left."
 msgstr "該檔案需要 %s,但僅剩 %s。"
 
-#: ../midori/midori-speeddial.vala:180
+#: ../midori/midori-speeddial.vala:188
 msgid "Speed Dial"
 msgstr "快速播號"
 
-#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+#: ../midori/midori-speeddial.vala:189 ../midori/midori-speeddial.vala:269
 msgid "Click to add a shortcut"
 msgstr "按一下以加入捷徑"
 
-#: ../midori/midori-speeddial.vala:182
+#: ../midori/midori-speeddial.vala:190
 msgid "Enter shortcut address"
 msgstr "輸入捷徑位址"
 
-#: ../midori/midori-speeddial.vala:183
+#: ../midori/midori-speeddial.vala:191
 msgid "Enter shortcut title"
 msgstr "輸入捷徑標題"
 
-#: ../midori/midori-speeddial.vala:184
+#: ../midori/midori-speeddial.vala:192
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "確定要刪除這個捷徑?"
 
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:305
 msgid "Startup"
 msgstr "啟動"
 
-#: ../midori/midori-preferences.c:301
+#: ../midori/midori-preferences.c:307
 msgid "When Midori starts:"
 msgstr "當 Midori 啟動時:"
 
-#: ../midori/midori-preferences.c:306
+#: ../midori/midori-preferences.c:312
 msgid "Homepage:"
 msgstr "首頁:"
 
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:320
 msgid "Use _current page"
 msgstr "使用目前頁面(_C)"
 
-#: ../midori/midori-preferences.c:318
+#: ../midori/midori-preferences.c:324
 msgid "Use current page as homepage"
 msgstr "使用目前頁面作為首頁"
 
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:327
+#: ../midori/midori-preferences.c:333
 msgid "Fonts"
 msgstr "字型"
 
-#: ../midori/midori-preferences.c:329
+#: ../midori/midori-preferences.c:335
 msgid "Proportional Font Family"
 msgstr "比例字族"
 
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:339
 msgid "The default font family used to display text"
 msgstr "用來顯示文字的預設字族"
 
-#: ../midori/midori-preferences.c:336
+#: ../midori/midori-preferences.c:342
 msgid "The default font size used to display text"
 msgstr "用來顯示文字的預設字型大小"
 
-#: ../midori/midori-preferences.c:338
+#: ../midori/midori-preferences.c:344
 msgid "Fixed-width Font Family"
 msgstr "等寬字族"
 
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:348
 msgid "The font family used to display fixed-width text"
 msgstr "用來顯示等寬文字的字族"
 
-#: ../midori/midori-preferences.c:345
+#: ../midori/midori-preferences.c:351
 msgid "The font size used to display fixed-width text"
 msgstr "用來顯示等寬文字的字型大小"
 
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:353
 msgid "Minimum Font Size"
 msgstr "最小字型尺寸"
 
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:357
 msgid "The minimum font size used to display text"
 msgstr "用來顯示文字的最小字型尺寸"
 
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:361
 msgid "Preferred Encoding"
 msgstr "偏好的編碼"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:362
+#: ../midori/midori-preferences.c:368
 msgid "Behavior"
 msgstr "行為"
 
-#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155
+#: ../midori/midori-preferences.c:371 ../extensions/statusbar-features.c:155
 msgid "Load images automatically"
 msgstr "自動載入圖像"
 
-#: ../midori/midori-preferences.c:368
+#: ../midori/midori-preferences.c:374
 msgid "Enable Spell Checking"
 msgstr "啟用拼字檢查"
 
-#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165
+#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:165
 msgid "Enable scripts"
 msgstr "啟用命令稿"
 
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:391
 msgid "Enable WebGL support"
 msgstr "啟用 WebGL 支援"
 
-#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177
-msgid "Enable Netscape plugins"
-msgstr "啟用 Netscape 外掛程式"
-
 #: ../midori/midori-preferences.c:408
 msgid "Zoom Text and Images"
 msgstr "縮放文字和圖像"
 
 #: ../midori/midori-preferences.c:411
 msgid "Allow scripts to open popups"
-msgstr "允許令稿開啟彈出式視窗"
+msgstr "允許令稿開啟彈出式視窗"
 
 #: ../midori/midori-preferences.c:412
 msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "是否允許令稿自動開啟彈出視窗"
+msgstr "是否允許令稿自動開啟彈出視窗"
 
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:414
+msgid "Default Zoom Level"
+msgstr "預設遠近等級"
+
+#: ../midori/midori-preferences.c:418
+msgid "Initial factor to enlarge newly opened tabs by"
+msgstr "新開啟分頁的初始放大係數"
+
+#: ../midori/midori-preferences.c:422
 msgid "Preferred languages"
 msgstr "偏好的語言"
 
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:426
 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」"
+"用於繪製多語網頁時所偏好的語言清單,請用半形逗號 (,) 隔開語言。例:「de」,「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」"
 
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:428
 msgid "Save downloaded files to:"
 msgstr "儲存下載檔案至:"
 
 #. Page "Interface"
-#: ../midori/midori-preferences.c:429
+#: ../midori/midori-preferences.c:435
 msgid "Browsing"
 msgstr "瀏覽"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:438
+msgid "Theme:"
+msgstr "主題:"
+
+#: ../midori/midori-preferences.c:470
 msgid "Toolbar Style:"
 msgstr "工具列樣式:"
 
-#: ../midori/midori-preferences.c:435
+#: ../midori/midori-preferences.c:474
 msgid "Open new pages in:"
 msgstr "開啟新頁面於:"
 
-#: ../midori/midori-preferences.c:439
+#: ../midori/midori-preferences.c:478
 msgid "New tab behavior:"
 msgstr "新分頁行為:"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:483
 msgid "Close Buttons on Tabs"
 msgstr "關閉按鈕位於分頁上"
 
-#: ../midori/midori-preferences.c:448
-msgid "Always Show Tabbar"
-msgstr "固定顯示分頁列"
-
-#: ../midori/midori-preferences.c:452
+#: ../midori/midori-preferences.c:486
 msgid "Open Tabs next to Current"
 msgstr "於目前之下開啟分頁"
 
-#: ../midori/midori-preferences.c:453
-msgid "Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-preferences.c:487
+msgid ""
+"Whether to open new tabs next to the current tab or after the last one"
 msgstr "是否要開啟新分頁於目前分頁之下或最後一頁之後"
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:490
 msgid "Open tabs in the background"
 msgstr "在背景中開啟分頁"
 
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:494
 msgid "Text Editor"
 msgstr "文字編輯器"
 
-#: ../midori/midori-preferences.c:465
+#: ../midori/midori-preferences.c:499
 msgid "News Aggregator"
 msgstr "新聞匯流器"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:472
+#: ../midori/midori-preferences.c:506
 msgid "Network"
 msgstr "網路"
 
-#: ../midori/midori-preferences.c:474
+#: ../midori/midori-preferences.c:508
 msgid "Proxy server"
 msgstr "代理伺服器"
 
-#: ../midori/midori-preferences.c:479
-msgid "Hostname"
-msgstr "主機名稱"
+#: ../midori/midori-preferences.c:513
+msgid "URI"
+msgstr "URI"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:521
 msgid "Port"
 msgstr "連接埠"
 
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:533
 msgid "Supported proxy types:"
 msgstr "支援的代理類型:"
 
 #. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/midori-preferences.c:520 ../extensions/web-cache.c:461
-#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:330
+#: ../midori/midori-preferences.c:551 ../midori/midori-privatedata.c:326
 msgid "Web Cache"
 msgstr "網頁快取"
 
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:556
 msgid "The maximum size of cached pages on disk"
 msgstr "磁碟上快取網頁的大小上限"
 
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:558
 msgid "MB"
 msgstr "MB"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-preferences.c:533
+#: ../midori/midori-preferences.c:564
 msgid "Identify as"
 msgstr "識別為"
 
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:582
 msgid "Privacy"
 msgstr "隱私"
 
-#: ../midori/midori-preferences.c:550
+#: ../midori/midori-preferences.c:584
 msgid "Delete old Cookies after:"
 msgstr "刪除舊訊餅經過:"
 
-#: ../midori/midori-preferences.c:552 ../midori/midori-preferences.c:555
+#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
 msgid "The maximum number of days to save cookies for"
 msgstr "訊餅的最大儲存日數限制"
 
-#: ../midori/midori-preferences.c:559
+#: ../midori/midori-preferences.c:593
 msgid "Only accept Cookies from sites you visit"
 msgstr "只接受來自您造訪網站的訊餅"
 
-#: ../midori/midori-preferences.c:560
+#: ../midori/midori-preferences.c:594
 msgid "Block cookies sent by third-party websites"
 msgstr "阻擋第三方網站訊餅"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:599
 msgid ""
 "Cookies store login data, saved games, or user profiles for advertisement "
 "purposes."
 msgstr "訊餅用來儲藏登入資料、儲存的遊戲,或為廣告目的採集使用者個人資料。"
 
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:606
 msgid "Enable offline web application cache"
 msgstr "啟用離線網頁應用程式快取"
 
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:609
 msgid "Enable HTML5 local storage support"
 msgstr "啟用 HTML 本地端儲存支援"
 
 #. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:613
 msgid "Strip referrer details sent to websites"
 msgstr "截短傳送給網站的 referrer 細節"
 
 #. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-preferences.c:581
+#: ../midori/midori-preferences.c:615
 msgid "Whether the \"Referer\" header should be shortened to the hostname"
 msgstr "是否「Referer」標頭要被截短成主機名稱"
 
-#: ../midori/midori-preferences.c:584
+#: ../midori/midori-preferences.c:618
 msgid "Delete pages from history after:"
 msgstr "從歷史刪除頁面經過:"
 
-#: ../midori/midori-preferences.c:586 ../midori/midori-preferences.c:589
+#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:623
 msgid "The maximum number of days to save the history for"
 msgstr "造訪歷史的最大儲存日數限制"
 
-#: ../midori/midori-preferences.c:626 ../panels/midori-extensions.c:90
+#: ../midori/midori-preferences.c:659 ../panels/midori-extensions.c:90
 msgid "Extensions"
-msgstr "擴充功能"
+msgstr "擴充套件"
+
+#: ../midori/midori-searchaction.c:457
+msgid "_Manage Search Engines"
+msgstr "管理搜尋引擎(_M)"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Add search engine"
 msgstr "加入搜尋引擎"
 
-#: ../midori/midori-searchaction.c:1049
+#: ../midori/midori-searchaction.c:1047
 msgid "Edit search engine"
 msgstr "編輯搜尋引擎"
 
-#: ../midori/midori-searchaction.c:1077
+#: ../midori/midori-searchaction.c:1075
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../midori/midori-searchaction.c:1092
+#: ../midori/midori-searchaction.c:1090
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:361
+#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:362
 msgid "_Address:"
 msgstr "位址(_A):"
 
-#: ../midori/midori-searchaction.c:1124
+#: ../midori/midori-searchaction.c:1118
 msgid "_Token:"
 msgstr "符記(_T):"
 
-#: ../midori/midori-searchaction.c:1414
+#: ../midori/midori-searchaction.c:1408
 msgid "Manage Search Engines"
 msgstr "管理搜尋引擎"
 
-#: ../midori/midori-searchaction.c:1514
+#: ../midori/midori-searchaction.c:1508
 msgid "Use as _default"
 msgstr "作為預設使用(_D)"
 
-#: ../midori/midori-searchaction.c:1625
+#: ../midori/midori-searchaction.c:1619
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "無法載入搜尋引擎。%s\n"
 
-#: ../midori/midori-searchaction.c:1680
+#: ../midori/midori-searchaction.c:1674
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "無法儲存搜尋引擎。%s"
 
-#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111
-msgid "History"
-msgstr "歷史"
+#: ../midori/midori-historycompletion.vala:17
+msgid "Bookmarks and History"
+msgstr "æ\9b¸ç±¤è\88\87æ­·å\8f²"
 
-#: ../midori/midori-historycompletion.vala:54
+#: ../midori/midori-historydatabase.vala:28
 #, c-format
-msgid "Failed to initialize history: %s"
-msgstr "初始化歷史時失敗:%s"
+msgid "Search for %s"
+msgstr "搜尋 %s"
 
-#: ../midori/midori-historycompletion.vala:65
+#: ../midori/midori-historydatabase.vala:64
+#: ../midori/midori-historydatabase.vala:97
 #, c-format
 msgid "Failed to select from history: %s"
 msgstr "從歷史選取時失敗:%s"
 
-#. search_view
-#: ../midori/midori-historycompletion.vala:83
-#, c-format
-msgid "Search for %s"
-msgstr "搜尋 %s"
-
 #: ../midori/midori-searchcompletion.vala:20
-#: ../midori/midori-searchcompletion.vala:60
+#: ../midori/midori-searchcompletion.vala:57
 msgid "Search with…"
 msgstr "搜尋採用…"
 
-#: ../midori/midori-searchcompletion.vala:48
+#: ../midori/midori-searchcompletion.vala:47
 #, c-format
 msgid "Search with %s"
 msgstr "以 %s 搜尋"
 
-#: ../midori/sokoke.c:243
+#: ../midori/sokoke.c:219
 msgid "Open with"
 msgstr "以此開啟"
 
-#: ../midori/sokoke.c:251
+#: ../midori/sokoke.c:227
 #, c-format
 msgid "Choose an application or command to open \"%s\":"
 msgstr "選擇開啟「%s」用的應用程式或指令:"
 
-#: ../midori/sokoke.c:368 ../midori/sokoke.c:388
-#: ../midori/midori-frontend.c:305
+#: ../midori/sokoke.c:344 ../midori/sokoke.c:364
+#: ../midori/midori-frontend.c:307
 msgid "Could not run external program."
 msgstr "無法執行外部程式。"
 
-#: ../midori/sokoke.c:576
+#: ../midori/sokoke.c:554
 msgid "Invalid URI"
 msgstr "無效的 URI"
 
@@ -1822,78 +1845,133 @@ msgstr "符合大小寫"
 msgid "Close Findbar"
 msgstr "關閉尋找列"
 
-#: ../panels/midori-bookmarks.c:308
+#. i18n: [n] bookmark(s)
+#: ../panels/midori-bookmarks.c:634
 #, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "加入書籤項目失敗:%s\n"
+msgid "%d bookmark"
+msgid_plural "%d bookmarks"
+msgstr[0] "%d 張書籤"
 
-#: ../panels/midori-bookmarks.c:475
+#. i18n: [n] subfolder(s)
+#: ../panels/midori-bookmarks.c:644
 #, c-format
-msgid "Failed to update bookmark : %s\n"
-msgstr "無法更新書籤:%s\n"
+msgid "%d subfolder"
+msgid_plural "%d subfolders"
+msgstr[0] "%d 個子資料夾"
+
+#. i18n: Empty folder
+#: ../panels/midori-bookmarks.c:669
+#, c-format
+msgid "Empty folder"
+msgstr "空白資料夾"
+
+#. i18n: Folder containing [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:672
+#, c-format
+msgid "Folder containing %s and no bookmark"
+msgstr "資料夾包含 %s 但無書籤"
+
+#. i18n: Folder containing [[n] bookmark(s)]
+#: ../panels/midori-bookmarks.c:676
+#, c-format
+msgid "Folder containing %s"
+msgstr "資料夾包含 %s"
+
+#. i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:679
+#, c-format
+msgid "Folder containing %s and %s"
+msgstr "資料夾包含 %s 和 %s"
+
+#. i18n: Bookmark leading to: [bookmark uri]
+#: ../panels/midori-bookmarks.c:690
+#, c-format
+msgid "Bookmark leading to: %s"
+msgstr "書籤導引至:%s"
+
+#. i18n: [[n] folder(s)] and no bookmark
+#: ../panels/midori-bookmarks.c:704
+#, c-format
+msgid "%s and no bookmark"
+msgstr "%s 但無書籤"
+
+#. i18n: [[n] bookmark(s)] and [[n] folder(s)]
+#: ../panels/midori-bookmarks.c:710
+#, c-format
+msgid "%s and %s"
+msgstr "%s 和 %s"
 
-#: ../panels/midori-bookmarks.c:535
+#: ../panels/midori-bookmarks.c:770
 msgid "Edit the selected bookmark"
 msgstr "編輯所選書籤"
 
-#: ../panels/midori-bookmarks.c:543
+#: ../panels/midori-bookmarks.c:778
 msgid "Delete the selected bookmark"
 msgstr "刪除所選書籤"
 
-#: ../panels/midori-bookmarks.c:558
+#: ../panels/midori-bookmarks.c:794
 msgid "Add a new folder"
 msgstr "加入新的資料夾"
 
-#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:628
+#: ../panels/midori-bookmarks.c:925 ../panels/midori-history.c:575
 msgid "<i>Separator</i>"
 msgstr "<i>分隔符號</i>"
 
+#: ../panels/midori-bookmarks.c:1088 ../panels/midori-history.c:744
+#: ../extensions/feed-panel/feed-panel.c:502
+msgid "Open in New _Tab"
+msgstr "在新分頁中開啟(_T)"
+
 #. Create the filter entry
-#: ../panels/midori-bookmarks.c:1009
+#: ../panels/midori-bookmarks.c:1353
 msgid "Search Bookmarks"
 msgstr "搜尋書籤"
 
-#: ../panels/midori-history.c:158 ../panels/midori-history.c:191
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "歷史"
+
+#: ../panels/midori-history.c:133
 msgid "Today"
 msgstr "今天"
 
-#: ../panels/midori-history.c:160 ../panels/midori-history.c:193
+#: ../panels/midori-history.c:135
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../panels/midori-history.c:162 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:137
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../panels/midori-history.c:165 ../panels/midori-history.c:186
+#: ../panels/midori-history.c:140
 msgid "A week ago"
 msgstr "一週前"
 
-#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59
+#: ../panels/midori-history.c:185
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "移除歷史項目時失敗:%s\n"
 
-#: ../panels/midori-history.c:361
+#: ../panels/midori-history.c:312
 msgid "Are you sure you want to remove all history items?"
 msgstr "確定要移除所有歷史項目?"
 
-#: ../panels/midori-history.c:408
+#: ../panels/midori-history.c:358
 msgid "Bookmark the selected history item"
 msgstr "將所選歷史項目加入書籤"
 
-#: ../panels/midori-history.c:417
+#: ../panels/midori-history.c:367
 msgid "Delete the selected history item"
 msgstr "刪除所選歷史項目"
 
-#: ../panels/midori-history.c:425
+#: ../panels/midori-history.c:375
 msgid "Clear the entire history"
 msgstr "清空整個歷史"
 
 #. Create the filter entry
-#: ../panels/midori-history.c:980
+#: ../panels/midori-history.c:926
 msgid "Search History"
 msgstr "搜尋歷史"
 
@@ -1921,118 +1999,68 @@ msgstr "密碼"
 msgid "_Remember password"
 msgstr "記住密碼(_R)"
 
-#: ../katze/katze-throbber.c:947
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "無法載入名為「%s」的圖示"
-
-#: ../katze/katze-throbber.c:960
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "無法載入庫存圖示「%s」"
-
-#: ../katze/katze-throbber.c:1040
-msgid "Animation frames are broken"
-msgstr "動畫訊框損壞"
-
-#: ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:386
 msgid "None"
 msgstr "無"
 
-#: ../katze/katze-utils.c:528
+#: ../katze/katze-utils.c:529
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "屬性「%s」對於 %s 無效"
 
-#: ../katze/katze-utils.c:565 ../katze/katze-utils.c:594
+#: ../katze/katze-utils.c:566 ../katze/katze-utils.c:595
 #: ../extensions/addons.c:308
 msgid "Choose file"
 msgstr "選擇檔案"
 
-#: ../katze/katze-utils.c:580
+#: ../katze/katze-utils.c:581
 msgid "Choose folder"
 msgstr "選擇資料夾"
 
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:746
 msgid "1 hour"
 msgstr "一小時"
 
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:747
 msgid "1 day"
 msgstr "一天"
 
-#: ../katze/katze-utils.c:730
+#: ../katze/katze-utils.c:748
 msgid "1 week"
 msgstr "一週"
 
-#: ../katze/katze-utils.c:731
+#: ../katze/katze-utils.c:749
 msgid "1 month"
 msgstr "一個月"
 
-#: ../katze/katze-utils.c:732
+#: ../katze/katze-utils.c:750
 msgid "1 year"
 msgstr "一年"
 
-#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24
+#: ../katze/katze-preferences.c:65
 #: ../extensions/external-download-manager.vala:224
-#: ../extensions/history-list.vala:242
+#: ../extensions/history-list.vala:289
 #, c-format
 msgid "Preferences for %s"
 msgstr "偏好設定用於 %s"
 
-#: ../katze/midori-uri.vala:182
+#: ../katze/midori-uri.vala:191
 msgid "MD5-Checksum:"
 msgstr "MD5 檢驗計算碼:"
 
-#: ../katze/midori-uri.vala:189
+#: ../katze/midori-uri.vala:198
 msgid "SHA1-Checksum:"
 msgstr "SHA1 檢驗計算碼:"
 
-#: ../extensions/adblock.c:483
-msgid "Configure Advertisement filters"
-msgstr "設定廣告過濾條件"
-
-#: ../extensions/adblock.c:512
-#, c-format
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:222
 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:926
-msgid "Edit rule"
-msgstr "編輯規則"
+"This page appears to contain a user script. Do you wish to install it?"
+msgstr "此頁面似乎含有一份使用者命令稿。您想要安裝它嗎?"
 
-#: ../extensions/adblock.c:940
-msgid "_Rule:"
-msgstr "規則(_R):"
-
-#: ../extensions/adblock.c:994
-msgid "Bl_ock image"
-msgstr "阻擋影像(_O)"
-
-#: ../extensions/adblock.c:999
-msgid "Bl_ock link"
-msgstr "阻擋鏈結(_O)"
-
-#: ../extensions/adblock.c:1925
-msgid "Advertisement blocker"
-msgstr "廣告阻擋器"
-
-#: ../extensions/adblock.c:1926
-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
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "此頁面似乎含有一份使用者指令稿。您想要安裝它嗎?"
-
-#: ../extensions/addons.c:223
-msgid "_Install user script"
-msgstr "安裝使用者指令稿(_I)"
+#: ../extensions/addons.c:223
+msgid "_Install user script"
+msgstr "安裝使用者命令稿(_I)"
 
 #. i18n: An infobar shows up when viewing a style on userstyles.org
 #: ../extensions/addons.c:228
@@ -2047,16 +2075,16 @@ msgstr "安裝使用者樣式(_I)"
 msgid "Don't install"
 msgstr "不要安裝"
 
-#: ../extensions/addons.c:319 ../extensions/addons.c:674
+#: ../extensions/addons.c:319 ../extensions/addons.c:673
 msgid "Userscripts"
-msgstr "使用者令稿"
+msgstr "使用者令稿"
 
-#: ../extensions/addons.c:324 ../extensions/addons.c:676
+#: ../extensions/addons.c:324 ../extensions/addons.c:675
 msgid "Userstyles"
 msgstr "使用者樣式"
 
 #: ../extensions/addons.c:370 ../extensions/addons.c:449
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:115
 msgid "Error"
 msgstr "錯誤"
 
@@ -2067,7 +2095,7 @@ msgstr "您想要刪除「%s」嗎?"
 
 #: ../extensions/addons.c:417
 msgid "Delete user script"
-msgstr "刪除使用者令稿"
+msgstr "刪除使用者令稿"
 
 #: ../extensions/addons.c:418
 msgid "Delete user style"
@@ -2078,40 +2106,40 @@ msgstr "刪除使用者樣式"
 msgid "The file <b>%s</b> will be permanently deleted."
 msgstr "將永遠刪除 <b>%s</b> 檔案。"
 
-#: ../extensions/addons.c:563 ../extensions/addons.c:640
+#: ../extensions/addons.c:563 ../extensions/addons.c:639
 msgid "Open in Text Editor"
 msgstr "以文字編輯器開啟"
 
-#: ../extensions/addons.c:565 ../extensions/addons.c:649
+#: ../extensions/addons.c:565 ../extensions/addons.c:648
 msgid "Open Target Folder"
 msgstr "開啟目標資料夾"
 
-#: ../extensions/addons.c:631
+#: ../extensions/addons.c:630
 msgid "Add new addon"
 msgstr "加入新的附加元件"
 
-#: ../extensions/addons.c:657
+#: ../extensions/addons.c:656
 msgid "Remove selected addon"
 msgstr "移除所選的附加元件"
 
-#: ../extensions/addons.c:1682 ../extensions/addons.c:1898
+#: ../extensions/addons.c:1681 ../extensions/addons.c:1897
 msgid "User addons"
 msgstr "使用者附加元件"
 
-#: ../extensions/addons.c:1812
+#: ../extensions/addons.c:1811
 #, c-format
 msgid "Can't monitor folder '%s': %s"
 msgstr "無法監控「%s」資料夾:%s"
 
-#: ../extensions/addons.c:1899
+#: ../extensions/addons.c:1898
 msgid "Support for userscripts and userstyles"
-msgstr "支援使用者令稿與使用者樣式"
+msgstr "支援使用者令稿與使用者樣式"
 
-#: ../extensions/colorful-tabs.c:177
+#: ../extensions/colorful-tabs.c:257
 msgid "Colorful Tabs"
 msgstr "彩色分頁"
 
-#: ../extensions/colorful-tabs.c:178
+#: ../extensions/colorful-tabs.c:258
 msgid "Tint each tab distinctly"
 msgstr "將每個分頁著上不同的色彩"
 
@@ -2120,42 +2148,41 @@ msgstr "將每個分頁著上不同的色彩"
 msgid "Cookie Manager"
 msgstr "訊餅管理員"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:103
+#: ../extensions/cookie-manager/cookie-manager-page.c:99
 msgid "Delete All"
 msgstr "刪除全部"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:105
+#: ../extensions/cookie-manager/cookie-manager-page.c:101
 msgid ""
 "Deletes all shown cookies. If a filter is set, only those cookies are "
 "deleted which match the filter."
-msgstr ""
-"刪除所有顯示的訊餅。若有設定過濾條件,只有那些符合過濾條件的訊餅會被刪除。"
+msgstr "刪除所有顯示的訊餅。若有設定過濾條件,只有那些符合過濾條件的訊餅會被刪除。"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:120
+#: ../extensions/cookie-manager/cookie-manager-page.c:116
 msgid "Expand All"
 msgstr "全部擴展"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:127
+#: ../extensions/cookie-manager/cookie-manager-page.c:123
 msgid "Collapse All"
 msgstr "全部折疊"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:575
+#: ../extensions/cookie-manager/cookie-manager-page.c:571
 msgid "Do you really want to delete all cookies?"
 msgstr "確定要移除所有訊餅?"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:577
+#: ../extensions/cookie-manager/cookie-manager-page.c:573
 msgid "Question"
 msgstr "問題"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:588
+#: ../extensions/cookie-manager/cookie-manager-page.c:584
 msgid "Only cookies which match the filter will be deleted."
 msgstr "只有符合過濾條件的訊餅會被刪除。"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:668
 msgid "At the end of the session"
 msgstr "於工作階段結束"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:683
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -2173,15 +2200,15 @@ msgstr ""
 "<b>期限</b>:%s"
 
 #. i18n: is this cookie secure (SSL)? yes/ no
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "Yes"
 msgstr "是"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:690
+#: ../extensions/cookie-manager/cookie-manager-page.c:678
 msgid "No"
 msgstr "否"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:705
+#: ../extensions/cookie-manager/cookie-manager-page.c:693
 #, c-format
 msgid ""
 "<b>Domain</b>: %s\n"
@@ -2190,20 +2217,20 @@ msgstr ""
 "<b>網域</b>:%s\n"
 "<b>訊餅</b>:%d"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1028
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:570
+#: ../extensions/cookie-manager/cookie-manager-page.c:1016
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:565
 msgid "Name"
 msgstr "名稱"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1080
+#: ../extensions/cookie-manager/cookie-manager-page.c:1068
 msgid "_Expand All"
 msgstr "全部擴展(_E)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1088
+#: ../extensions/cookie-manager/cookie-manager-page.c:1076
 msgid "_Collapse All"
 msgstr "全部折疊(_C)"
 
-#: ../extensions/cookie-manager/cookie-manager-page.c:1140
+#: ../extensions/cookie-manager/cookie-manager-page.c:1128
 msgid "Search Cookies by Name or Domain"
 msgstr "按名稱或網域搜尋 Cookies"
 
@@ -2223,24 +2250,45 @@ msgstr "複製分頁的位址"
 msgid "Copy the addresses of all tabs to the clipboard"
 msgstr "複製所有分頁的位址至剪貼簿"
 
-#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:212
-#, c-format
+#: ../extensions/delayed-load.vala:49
 msgid "Delayed load"
 msgstr "延遲載入"
 
-#: ../extensions/delayed-load.vala:49
-msgid "Delay in seconds until loading the page:"
-msgstr "載入頁面前的延遲秒數:"
-
-#: ../extensions/delayed-load.vala:213
+#: ../extensions/delayed-load.vala:50
 msgid "Delay page load until you actually use the tab."
 msgstr "延遲到您確實使用該頁面時才載入頁面。"
 
+#: ../extensions/devpet.vala:102
+msgid "Double click for more information"
+msgstr "雙擊以瞭解更多資訊"
+
+#: ../extensions/devpet.vala:253
+msgid "DevPet"
+msgstr "DevPet"
+
+#: ../extensions/devpet.vala:254
+msgid "This extension shows glib error messages in systray."
+msgstr "此擴充套件會在系統匣中顯示 glib 錯誤訊息。"
+
 #: ../extensions/external-download-manager.vala:124
+#, c-format
 msgid ""
 "An error occurred when attempting to download a file with the following "
 "plugin:\n"
-msgstr "試圖以下列插件下載檔案時遭遇錯誤:\n"
+"%s\n"
+"\n"
+"Error:\n"
+"%s\n"
+"\n"
+"Carry on without this plugin."
+msgstr ""
+"當試圖以下列插件下載檔案時遭遇錯誤:\n"
+"%s\n"
+"\n"
+"錯誤:\n"
+"%s\n"
+"\n"
+"不使用此插件繼續。"
 
 #: ../extensions/external-download-manager.vala:175
 msgid "External Download Manager - Aria2"
@@ -2280,25 +2328,25 @@ 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:375
+#: ../extensions/feed-panel/feed-panel.c:367
 #, c-format
 msgctxt "Feed"
 msgid "Last updated: %s."
 msgstr "上次更新:%s"
 
-#: ../extensions/feed-panel/feed-panel.c:629
+#: ../extensions/feed-panel/feed-panel.c:620
 msgid "Feeds"
 msgstr "饋流"
 
-#: ../extensions/feed-panel/feed-panel.c:682
+#: ../extensions/feed-panel/feed-panel.c:671
 msgid "Add new feed"
 msgstr "加入新饋流"
 
-#: ../extensions/feed-panel/feed-panel.c:689
+#: ../extensions/feed-panel/feed-panel.c:678
 msgid "Delete feed"
 msgstr "刪除饋流"
 
-#: ../extensions/feed-panel/feed-panel.c:768
+#: ../extensions/feed-panel/feed-panel.c:757
 msgid "_Feeds"
 msgstr "饋流(_F)"
 
@@ -2317,37 +2365,37 @@ msgstr "未支援的饋流格式。"
 msgid "Failed to parse XML feed: %s"
 msgstr "解析 XML 饋流失敗:%s"
 
-#: ../extensions/feed-panel/feed-rss.c:46
+#: ../extensions/feed-panel/feed-rss.c:50
 msgid "Failed to find \"channel\" element in RSS XML data."
 msgstr "無法在 RSS XML 資料內找到必須的 RSS 「channel」元素。"
 
-#: ../extensions/feed-panel/feed-rss.c:51
+#: ../extensions/feed-panel/feed-rss.c:55
 msgid "Unsupported RSS version found."
 msgstr "找到未支援的 RSS 版本。"
 
-#: ../extensions/feed-panel/feed-rss.c:148
+#: ../extensions/feed-panel/feed-rss.c:152
 msgid "Failed to find required RSS \"item\" elements in XML data."
 msgstr "無法在 XML 資料內找到必須的 RSS 「item」元素。"
 
-#: ../extensions/feed-panel/feed-rss.c:248
+#: ../extensions/feed-panel/feed-rss.c:252
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr "無法在在 XML 資料內找到必須的 RSS 「channel」元素。"
 
-#: ../extensions/feed-panel/main.c:116
+#: ../extensions/feed-panel/main.c:117
 #, c-format
 msgid "Feed '%s' already exists"
 msgstr "「%s」饋流已經存在"
 
-#: ../extensions/feed-panel/main.c:192
+#: ../extensions/feed-panel/main.c:193
 #, c-format
 msgid "Error loading feed '%s'"
 msgstr "載入「%s」饋流時發生錯誤"
 
-#: ../extensions/feed-panel/main.c:499
+#: ../extensions/feed-panel/main.c:500
 msgid "Feed Panel"
 msgstr "饋流面板"
 
-#: ../extensions/feed-panel/main.c:500
+#: ../extensions/feed-panel/main.c:501
 msgid "Read Atom/ RSS feeds"
 msgstr "閱讀 Atom/ RSS 饋流"
 
@@ -2368,121 +2416,395 @@ msgstr ""
 "需要主密碼才能\n"
 "開啟密碼資料庫"
 
-#: ../extensions/formhistory/formhistory.c:294
+#: ../extensions/formhistory/formhistory.c:289
 msgid "Remember password on this page?"
 msgstr "記住此網頁上的密碼?"
 
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:294
 msgid "Remember"
 msgstr "記住"
 
-#: ../extensions/formhistory/formhistory.c:300
+#: ../extensions/formhistory/formhistory.c:295
 msgid "Not now"
 msgstr "不是現在"
 
-#: ../extensions/formhistory/formhistory.c:301
+#: ../extensions/formhistory/formhistory.c:296
 msgid "Never for this page"
 msgstr "對於這個網頁永遠不要"
 
-#: ../extensions/formhistory/formhistory.c:427
+#: ../extensions/formhistory/formhistory.c:416
 msgid "Toggle form history state"
 msgstr "從歷史狀態切換"
 
-#: ../extensions/formhistory/formhistory.c:428
+#: ../extensions/formhistory/formhistory.c:417
 msgid "Activate or deactivate form history for the current tab."
 msgstr "為目前分頁啟動或關閉表單歷史。"
 
-#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47
-#: ../midori/midori-bookmarks.c:155
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "開啟資料庫時失敗:%s\n"
-
-#: ../extensions/formhistory/formhistory.c:533
-#: ../extensions/formhistory/formhistory.c:537
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "執行資料庫敘述時失敗:%s\n"
-
-#: ../extensions/formhistory/formhistory.c:624
+#: ../extensions/formhistory/formhistory.c:598
 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
 msgstr "只透過熱鍵 (Ctrl+Shift+F) 在每個分頁上啟動表單歷史"
 
-#: ../extensions/formhistory/formhistory.c:681
+#: ../extensions/formhistory/formhistory.c:655
 msgid "Form history filler"
 msgstr "表單歷史填寫器"
 
-#: ../extensions/formhistory/formhistory.c:682
+#: ../extensions/formhistory/formhistory.c:656
 msgid "Stores history of entered form data"
 msgstr "儲存已輸入表單資料的歷史"
 
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:223
-#: ../extensions/formhistory/formhistory-js-frontend.c:104
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:222
 #, c-format
 msgid "Failed to select suggestions\n"
 msgstr "無法選取建議\n"
 
-#: ../extensions/history-list.vala:204
+#: ../extensions/history-list.vala:251
 msgid "There are no unvisited tabs"
 msgstr "沒有尚未造訪的分頁"
 
-#: ../extensions/history-list.vala:242
-#, c-format
+#: ../extensions/history-list.vala:289
 msgid "History-List"
 msgstr "歷史清單"
 
-#: ../extensions/history-list.vala:282
+#: ../extensions/history-list.vala:329
 msgid "Tab closing behavior"
 msgstr "分頁關閉行為"
 
-#: ../extensions/history-list.vala:290
+#: ../extensions/history-list.vala:337
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../extensions/history-list.vala:296
+#: ../extensions/history-list.vala:343
 msgid "Switch to last viewed tab"
 msgstr "切換至最後檢視的分頁"
 
-#: ../extensions/history-list.vala:302
+#: ../extensions/history-list.vala:349
 msgid "Switch to newest tab"
 msgstr "切換至最新的分頁"
 
-#: ../extensions/history-list.vala:316
+#: ../extensions/history-list.vala:363
 msgid "Flash window on background tabs"
 msgstr "於背景分頁閃動視窗"
 
-#: ../extensions/history-list.vala:448
+#: ../extensions/history-list.vala:498
 msgid "Next new Tab (History List)"
 msgstr "下一個新分頁 (歷史清單)"
 
-#: ../extensions/history-list.vala:449
+#: ../extensions/history-list.vala:499
 msgid "Next new tab from history"
 msgstr "下一個歷史中的新分頁"
 
-#: ../extensions/history-list.vala:458
+#: ../extensions/history-list.vala:508
 msgid "Previous new Tab (History List)"
 msgstr "上一個新分頁 (歷史清單)"
 
-#: ../extensions/history-list.vala:459
+#: ../extensions/history-list.vala:509
 msgid "Previous new tab from history"
 msgstr "上一個歷史中的新分頁"
 
-#: ../extensions/history-list.vala:468
+#: ../extensions/history-list.vala:518
 msgid "Display tab in background (History List)"
 msgstr "在背景顯示分頁 (歷史清單)"
 
-#: ../extensions/history-list.vala:469
+#: ../extensions/history-list.vala:519
 msgid "Display the current selected tab in background"
 msgstr "在背景顯示目前選取的分頁"
 
-#: ../extensions/history-list.vala:596
+#: ../extensions/history-list.vala:648
 msgid "History List"
 msgstr "歷史清單"
 
-#: ../extensions/history-list.vala:597
+#: ../extensions/history-list.vala:649
 msgid "Move to the last used tab when switching or closing tabs"
 msgstr "當切換或關閉分頁時移動最後使用的分頁"
 
+#: ../extensions/nojs/nojs-preferences.c:135
+#: ../extensions/nojs/nojs-preferences.c:281
+#: ../extensions/nojs/nojs-preferences.c:511 ../extensions/nojs/nojs.c:264
+#: ../extensions/nojs/nojs.c:918 ../extensions/nojs/nojs.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:128
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:274
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:657
+#, c-format
+msgid "SQL fails: %s"
+msgstr "SQL 失敗:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:254
+#: ../extensions/nojs/nojs-preferences.c:904 ../extensions/nojs/nojs.c:1030
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:247
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:803
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:899
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1113
+msgid "Accept"
+msgstr "接受"
+
+#: ../extensions/nojs/nojs-preferences.c:258
+#: ../extensions/nojs/nojs-preferences.c:906
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:251
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:805
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:901
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1114
+msgid "Accept for session"
+msgstr "這次執行階段接受"
+
+#: ../extensions/nojs/nojs-preferences.c:262
+#: ../extensions/nojs/nojs-preferences.c:908 ../extensions/nojs/nojs.c:1032
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:255
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:807
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:903
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
+msgid "Block"
+msgstr "封鎖"
+
+#: ../extensions/nojs/nojs-preferences.c:308 ../extensions/nojs/nojs.c:204
+#, c-format
+msgid "Could not open database of extension: %s"
+msgstr "無法開啟擴充套件的資料庫:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:578
+#: ../extensions/nojs/nojs-preferences.c:581
+#: ../extensions/nojs/nojs-preferences.c:632 ../extensions/nojs/nojs.c:249
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:499
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:502
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:553
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
+#, c-format
+msgid "Failed to execute database statement: %s"
+msgstr "執行資料庫敘述時失敗:%s"
+
+#: ../extensions/nojs/nojs-preferences.c:607
+msgid "Do you really want to delete all JavaScript permissions?"
+msgstr "您是否想要刪除所有的 JavaScript 許可?"
+
+#: ../extensions/nojs/nojs-preferences.c:609
+msgid "Delete all JavaScript permissions?"
+msgstr "刪除所有的 JavaScript 許可?"
+
+#: ../extensions/nojs/nojs-preferences.c:613
+msgid ""
+"This action will delete all JavaScript permissions. You will be asked for "
+"permissions again for each web site visited."
+msgstr "此動作將刪除所有的 JavaScript 許可。每當造訪這些網站時,會再次詢問您的許可。"
+
+#: ../extensions/nojs/nojs-preferences.c:809
+#: ../extensions/nojs/nojs-view.c:699
+msgid "Manager instance"
+msgstr "管理員實體"
+
+#: ../extensions/nojs/nojs-preferences.c:810
+#: ../extensions/nojs/nojs-view.c:700
+msgid "Instance to global NoJS manager"
+msgstr "全域 NoJS 管理員的實體"
+
+#. Set up dialog
+#: ../extensions/nojs/nojs-preferences.c:850
+msgid "Configure NoJS"
+msgstr "設定 NoJS"
+
+#: ../extensions/nojs/nojs-preferences.c:866
+msgid ""
+"Below is a list of all web sites and the policy set for them. You can delete "
+"policies by marking the entries and clicking on <i>Delete</i>."
+msgstr "下列為所有網站的清單,以及針對他們的方針設定。您可以藉由標記條目,並按下 <i>刪除</i> 以刪除方針。"
+
+#: ../extensions/nojs/nojs-preferences.c:937
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:836
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:551
+msgid "Domain"
+msgstr "網域"
+
+#: ../extensions/nojs/nojs-preferences.c:949
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:848
+msgid "Policy"
+msgstr "方針"
+
+#: ../extensions/nojs/nojs-preferences.c:978
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:877
+msgid "Delete _all"
+msgstr "刪除全部(_A)"
+
+#. Add "allow-all-sites" checkbox
+#: ../extensions/nojs/nojs-preferences.c:987
+msgid "A_llow scripts at all sites"
+msgstr "允許所有網站的命令稿(_L)"
+
+#. Add "block-unknown-domains" checkbox
+#: ../extensions/nojs/nojs-preferences.c:995
+msgid "Bloc_k scripts at unknown domains by default"
+msgstr "預設封鎖未知網域的命令稿(_K)"
+
+#. Add "check-second-level-only" checkbox
+#: ../extensions/nojs/nojs-preferences.c:1003
+msgid "S_et permissions on second-level domain"
+msgstr "設定第二層級網域的許可(_E)"
+
+#. Add menu item(s) for domain
+#: ../extensions/nojs/nojs-view.c:237
+#, c-format
+msgid "Deny %s"
+msgstr "拒絕 %s"
+
+#: ../extensions/nojs/nojs-view.c:249
+#, c-format
+msgid "Allow %s"
+msgstr "允許 %s"
+
+#: ../extensions/nojs/nojs-view.c:261
+#, c-format
+msgid "Allow %s this session"
+msgstr "本次執行階段允許 %s"
+
+#: ../extensions/nojs/nojs-view.c:706
+msgid "Browser window"
+msgstr "瀏覽器視窗"
+
+#: ../extensions/nojs/nojs-view.c:707
+msgid "The Midori browser instance this view belongs to"
+msgstr "此檢視所屬的 Midori 瀏覽器實體"
+
+#: ../extensions/nojs/nojs-view.c:713
+msgid "View"
+msgstr "檢視"
+
+#: ../extensions/nojs/nojs-view.c:714
+msgid "The Midori view instance this view belongs to"
+msgstr "此檢視所屬的 Midori 檢視實體"
+
+#: ../extensions/nojs/nojs-view.c:720
+msgid "Menu icon state"
+msgstr "選單圖示狀態"
+
+#: ../extensions/nojs/nojs-view.c:721
+msgid "State of menu icon to show in status bar"
+msgstr "狀態列中選單圖示的顯示狀態"
+
+#: ../extensions/nojs/nojs-view.c:792 ../extensions/nojs/nojs.c:1029
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1112
+msgid "Undetermined"
+msgstr "尚未決定"
+
+#: ../extensions/nojs/nojs-view.c:793
+msgid "Allowed"
+msgstr "允許"
+
+#: ../extensions/nojs/nojs-view.c:794
+msgid "Mixed"
+msgstr "混合"
+
+#: ../extensions/nojs/nojs-view.c:795
+msgid "Denied"
+msgstr "拒絕"
+
+#: ../extensions/nojs/nojs.c:143
+msgid ""
+"A fatal error occurred which prevents the NoJS extension to continue. You "
+"should disable it."
+msgstr "有嚴重錯誤發生而使 NoJS 擴充套件無法繼續。您應將之停用。"
+
+#: ../extensions/nojs/nojs.c:147
+msgid "Error in NoJS extension"
+msgstr "NoJS 擴充套件有錯誤發生"
+
+#: ../extensions/nojs/nojs.c:152
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
+msgid "Reason"
+msgstr "原因"
+
+#: ../extensions/nojs/nojs.c:193
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
+#, c-format
+msgid "Could not create configuration folder for extension: %s"
+msgstr "無法為擴充套件建立組態資料夾:%s"
+
+#: ../extensions/nojs/nojs.c:195
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
+msgid "Could not create configuration folder for extension."
+msgstr "無法為擴充套件建立組態資料夾。"
+
+#: ../extensions/nojs/nojs.c:212
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
+msgid "Could not open database of extension."
+msgstr "無法開啟擴充套件資料庫。"
+
+#: ../extensions/nojs/nojs.c:245
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
+msgid "Could not set up database structure of extension."
+msgstr "無法設置擴充套件的資料庫結構。"
+
+#: ../extensions/nojs/nojs.c:721
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1006
+msgid "Extension instance"
+msgstr "擴充套件實體"
+
+#: ../extensions/nojs/nojs.c:722
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1007
+msgid "The Midori extension instance for this extension"
+msgstr "此擴充套件的 Midori 擴充套件實體"
+
+#: ../extensions/nojs/nojs.c:728
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1013
+msgid "Application instance"
+msgstr "應用程式實體"
+
+#: ../extensions/nojs/nojs.c:729
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1014
+msgid "The Midori application instance this extension belongs to"
+msgstr "此擴充套件所屬的 Midiri 應用程式實體"
+
+#: ../extensions/nojs/nojs.c:735
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1020
+msgid "Database instance"
+msgstr "資料庫實體"
+
+#: ../extensions/nojs/nojs.c:736
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1021
+msgid "Pointer to sqlite database instance used by this extension"
+msgstr "此擴充套件使用的 sqlite 資料庫實體指標"
+
+#: ../extensions/nojs/nojs.c:741
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
+msgid "Database path"
+msgstr "資料庫路徑"
+
+#: ../extensions/nojs/nojs.c:742
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1027
+msgid "Path to sqlite database instance used by this extension"
+msgstr "此擴充套件使用的 sqlite 資料庫實體路徑"
+
+#: ../extensions/nojs/nojs.c:748
+msgid "Allow all sites"
+msgstr "允許所有網站"
+
+#: ../extensions/nojs/nojs.c:749
+msgid ""
+"If true this extension will not check policy for each site but allow them."
+msgstr "若為真,此擴充套件不會檢查每個網站的使用方針,而直接允許。"
+
+#: ../extensions/nojs/nojs.c:755
+msgid "Only second level"
+msgstr "僅第二層級"
+
+#: ../extensions/nojs/nojs.c:756
+msgid ""
+"If true this extension will reduce each domain to its second-level "
+"(www.example.org will reduced to example.org)"
+msgstr "若為真,此擴充套件會將每個網域縮減至其第二層級 (www.example.org 會縮減為 example.org)"
+
+#: ../extensions/nojs/nojs.c:762
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1033
+msgid "Unknown domain policy"
+msgstr "未知網域方針"
+
+#: ../extensions/nojs/nojs.c:763
+msgid "Policy to use for unknown domains."
+msgstr "針對未知網域使用的方針。"
+
+#: ../extensions/nojs/nojs.c:1031
+msgid "Accept temporarily"
+msgstr "暫時接受"
+
 #: ../extensions/mouse-gestures.c:513
 msgid "Mouse Gestures"
 msgstr "滑鼠手勢"
@@ -2511,11 +2833,11 @@ msgstr "捷徑"
 msgid "View and edit keyboard shortcuts"
 msgstr "檢視並編輯鍵盤捷徑"
 
-#: ../extensions/status-clock.c:177
+#: ../extensions/status-clock.c:168
 msgid "Statusbar Clock"
 msgstr "狀態列時鐘"
 
-#: ../extensions/status-clock.c:178
+#: ../extensions/status-clock.c:169
 msgid "Display date and time in the statusbar"
 msgstr "於狀態列顯示日期與時間"
 
@@ -2525,11 +2847,15 @@ msgstr "影像"
 
 #: ../extensions/statusbar-features.c:162
 msgid "Scripts"
-msgstr "令稿"
+msgstr "令稿"
 
 #: ../extensions/statusbar-features.c:174
 msgid "Netscape plugins"
-msgstr "Netscapte 外掛程式"
+msgstr "Netscapte 插件"
+
+#: ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "啟用 Netscape 插件"
 
 #: ../extensions/statusbar-features.c:259
 msgid "Statusbar Features"
@@ -2539,15 +2865,15 @@ msgstr "狀態列特色"
 msgid "Easily toggle features on web pages on and off"
 msgstr "輕鬆開啟或關閉網頁上的功能"
 
-#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:588 ../extensions/tab-panel.c:677
 msgid "Tab Panel"
 msgstr "分頁面板"
 
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:660
 msgid "T_ab Panel"
 msgstr "分頁面板(_A)"
 
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:678
 msgid "Show tabs in a vertical panel"
 msgstr "以垂直面板顯示分頁"
 
@@ -2559,77 +2885,68 @@ msgstr "分頁預設只使用圖示表示"
 msgid "New tabs have no label by default"
 msgstr "新分頁預設情況下沒有分頁標籤"
 
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:401
 msgid "Customize Toolbar"
 msgstr "自訂工具列"
 
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:417
 msgid ""
 "Select items to be displayed on the toolbar. Items can be reordered by drag "
 "and drop."
 msgstr "選取工具列上要顯示的項目。這些項目可以利用拖曳方式來重新調整位置。"
 
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:433
 msgid "Available Items"
 msgstr "可用項目"
 
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:454
 msgid "Displayed Items"
 msgstr "顯示的項目"
 
-#: ../extensions/toolbar-editor.c:586
+#: ../extensions/toolbar-editor.c:611
 msgid "_Customize Toolbar…"
 msgstr "自訂工具列(_C)…"
 
-#: ../extensions/toolbar-editor.c:615
+#: ../extensions/toolbar-editor.c:640
 msgid "Toolbar Editor"
 msgstr "工具列編輯器"
 
-#: ../extensions/toolbar-editor.c:616
+#: ../extensions/toolbar-editor.c:641
 msgid "Easily edit the toolbar layout"
 msgstr "輕鬆編輯工具列配置"
 
-#: ../extensions/web-cache.c:462
-msgid "Cache HTTP communication on disk"
-msgstr "對 HTTP 通訊製作一份硬碟快取"
-
-#: ../katze/katze-http-cookies-sqlite.c:129
-#, c-format
-msgid "Failed to load cookies\n"
-msgstr "訊餅載入失敗\n"
-
 #. FIXME: granite: should return GtkWidget* like GTK+
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140
+#: ../midori/midori-privatedata.c:127 ../midori/midori-privatedata.c:138
 msgid "Clear Private Data"
 msgstr "清除隱私資料"
 
-#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144
+#: ../midori/midori-privatedata.c:132 ../midori/midori-privatedata.c:142
 msgid "_Clear private data"
 msgstr "清除隱私資料(_C)"
 
-#: ../midori/midori-privatedata.c:161
+#: ../midori/midori-privatedata.c:162
 msgid "Clear the following data:"
 msgstr "清除下列資料:"
 
-#: ../midori/midori-privatedata.c:171
+#: ../midori/midori-privatedata.c:172
 msgid "Last open _tabs"
 msgstr "上次開啟頁面(_T)"
 
-#: ../midori/midori-privatedata.c:197
+#: ../midori/midori-privatedata.c:198
 msgid "Clear private data when _quitting Midori"
 msgstr "當退出 Midori 時清除隱私資料(_Q)"
 
 #. i18n: Logins and passwords in websites and web forms
-#: ../midori/midori-privatedata.c:324
+#: ../midori/midori-privatedata.c:321
 msgid "Saved logins and _passwords"
 msgstr "儲存登入名稱與密碼(_P)"
 
-#: ../midori/midori-privatedata.c:326
+#: ../midori/midori-privatedata.c:323
 msgid "Cookies and Website data"
 msgstr "訊餅與網站資料"
 
-#: ../midori/midori-privatedata.c:333
+#: ../midori/midori-privatedata.c:328
 msgid "Website icons"
 msgstr "網站圖示"
 
@@ -2637,205 +2954,148 @@ msgstr "網站圖示"
 msgid "Open tabs"
 msgstr "開啟分頁"
 
-#: ../midori/midori-viewcompletion.vala:75
+#: ../midori/midori-viewcompletion.vala:80
 msgid "More open tabs…"
 msgstr "更多開啟的分頁..."
 
-#: ../midori/midori-history.c:25
+#: ../midori/midori-history.c:27
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "清空歷史時失敗:%s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/midori-history.c:122
+#: ../midori/midori-history.c:73
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "移除舊的歷史項目時失敗:%s\n"
 
-#: ../midori/midori-bookmarks.c:104
-msgid "failed to ATTACH old db"
-msgstr "無法 ATTACH 舊資料庫"
-
-#: ../midori/midori-bookmarks.c:111
-msgid "failed to import from old db"
-msgstr "從舊資料庫匯入失敗"
-
-#: ../midori/midori-bookmarks.c:115
-msgid "failed to rollback the transaction"
-msgstr "無法回復處理事項"
-
-#: ../midori/midori-bookmarks.c:119
-msgid "failed to DETACH "
-msgstr "無法 DETACH"
-
-#: ../midori/midori-bookmarks.c:259
+#: ../midori/midori-bookmarks-db.c:519
 #, c-format
-msgid "Couldn't create bookmarks table: %s\n"
-msgstr "無法建立書籤表格:%s\n"
+msgid "Failed to add bookmark item: %s\n"
+msgstr "加入書籤項目失敗:%s\n"
 
-#: ../midori/midori-bookmarks.c:274
+#: ../midori/midori-bookmarks-db.c:574
 #, c-format
-msgid "Couldn't import from old database: %s\n"
-msgstr "無法從舊資料庫匯入:%s\n"
+msgid "Failed to update bookmark: %s\n"
+msgstr "無法更新書籤:%s\n"
 
-#: ../midori/midori-bookmarks.c:311
+#: ../midori/midori-bookmarks-db.c:610
 #, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "無法儲存書籤。%s"
+msgid "Failed to remove bookmark item: %s\n"
+msgstr "無法移除書籤項目:%s\n"
 
-#: ../midori/midori-session.c:199
+#: ../midori/midori-session.c:217
 msgid ""
 "No root certificate file is available. SSL certificates cannot be verified."
 msgstr "沒有可用的根憑證。SSL 憑證無法通過驗證。"
 
-#: ../midori/midori-session.c:368
+#: ../midori/midori-session.c:390
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "無法儲存組態。%s"
 
-#: ../midori/midori-session.c:390 ../midori/midori-frontend.c:504
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "無法載入執行階段:%s\n"
-
-#: ../midori/midori-session.c:419
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "無法儲存執行階段。%s"
-
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/midori-frontend.c:128
+#: ../midori/midori-frontend.c:137
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "無法儲存回收筒。%s"
 
-#: ../midori/midori-frontend.c:333
+#: ../midori/midori-frontend.c:335
 #, c-format
 msgid ""
 "Midori crashed the last time it was opened. You can report the problem at %s."
 msgstr "Midori 似乎於上次開啟時發生當機。您可以前往 %s 回報該問題。"
 
-#: ../midori/midori-frontend.c:342
+#: ../midori/midori-frontend.c:344
 msgid "Modify _preferences"
 msgstr "修改偏好設定(_P)"
 
-#: ../midori/midori-frontend.c:346
+#: ../midori/midori-frontend.c:348
 msgid "Disable all _extensions"
-msgstr "å\81\9cç\94¨æ\89\80æ\9c\89æ\93´å\85\85å\8a\9fè\83½(_E)"
+msgstr "å\81\9cç\94¨æ\89\80æ\9c\89æ\93´å\85\85å¥\97件(_E)"
 
-#: ../midori/midori-frontend.c:355
+#: ../midori/midori-frontend.c:357
 msgid "Show a dialog after Midori crashed"
 msgstr "Midori 當機之後顯示對話窗"
 
-#: ../midori/midori-frontend.c:360
+#: ../midori/midori-frontend.c:362
 msgid "Discard old tabs"
 msgstr "丟棄舊分頁"
 
-#: ../midori/midori-frontend.c:368
+#: ../midori/midori-frontend.c:370
 msgid "Show last crash _log"
 msgstr "顯示上次當機記錄(_L)"
 
-#: ../midori/midori-frontend.c:381
+#: ../midori/midori-frontend.c:383
 msgid "Run in _debugger"
 msgstr "在除錯器中執行(_D)"
 
-#: ../midori/midori-frontend.c:456
+#: ../midori/midori-frontend.c:461
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "Midori 的實體已經在執行中但沒有回應。\n"
 
-#: ../midori/midori-frontend.c:489
+#: ../midori/midori-frontend.c:494
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "無法載入書籤:%s\n"
 
-#: ../midori/midori-frontend.c:520
+#: ../midori/midori-frontend.c:509
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "無法載入執行階段:%s\n"
+
+#: ../midori/midori-frontend.c:525
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "無法載入回收筒:%s\n"
 
-#: ../midori/midori-frontend.c:528
+#: ../midori/midori-frontend.c:533
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "無法載入歷史:%s\n"
 
-#: ../midori/midori-frontend.c:539
+#: ../midori/midori-frontend.c:544
 msgid "The following errors occured:"
 msgstr "發生下列錯誤:"
 
-#: ../midori/midori-frontend.c:544
+#: ../midori/midori-frontend.c:549
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:247
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:292
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:662
-#, c-format
-msgid "SQL fails: %s"
-msgstr "SQL 失敗:%s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116
-msgid "Accept"
-msgstr "接受"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117
-msgid "Accept for session"
-msgstr "這次執行階段接受"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118
-msgid "Block"
-msgstr "封鎖"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:301
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:151
 #, c-format
 msgid "Could not open database of extenstion: %s"
-msgstr "無法開啟擴充功能資料庫:%s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:196
-#, c-format
-msgid "Failed to execute database statement: %s"
-msgstr "執行資料庫敘述時失敗:%s"
+msgstr "無法開啟擴充套件資料庫:%s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:528
 msgid "Do you really want to delete all cookie permissions?"
 msgstr "確定要刪除所有許可的訊餅?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:530
 msgid "Delete all cookie permissions?"
 msgstr "是否要刪除所有許可的訊餅?"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:534
 msgid ""
 "This action will delete all cookie permissions. You will be asked for "
 "permissions again for each web site visited."
-msgstr ""
-"此動作將刪除所有的訊餅許可證明。每次造訪網站時會詢問您是否再次許可使用訊餅。"
+msgstr "此動作將刪除所有的訊餅許可證明。每次造訪網站時會詢問您是否再次許可使用訊餅。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:704
 msgid "Cookie permission manager"
 msgstr "訊餅許可管理員"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 msgid "Instance of current cookie permission manager"
 msgstr "目前訊餅許可管理員的實體"
 
 #. Set up dialog
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:746
 msgid "Configure cookie permission"
 msgstr "設定訊餅許可證"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:761
 #, c-format
 msgid ""
 "Below is a list of all web sites and the policy set for them. You can delete "
@@ -2844,26 +3104,15 @@ msgid ""
 "the policy and clicking on <i>Add</i>."
 msgstr ""
 "下列為所有網站的清單以及相對應的方針設定。您可以先標記條目再按下<i>刪除</i> "
-"鈕來刪除方針。您也可以在下方輸入網域名,選好方針後按下<i>加入</i> 來手動添加"
-"方針。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:556
-msgid "Domain"
-msgstr "網域"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748
-msgid "Policy"
-msgstr "方針"
+"鈕來刪除方針。您也可以在下方輸入網域名,選好方針後按下<i>加入</i> 來手動添加方針。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777
-msgid "Delete _all"
-msgstr "刪除全部(_A)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:892
+msgid "Policy for cookies from domains not in the list: "
+msgstr "針對未列在清單中的網域所設的訊餅方針: "
 
-#. Add "ask-for-unknown-policy" checkbox
-#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786
-msgid "A_sk for policy if unknown for a domain"
-msgstr "如果網域的方針還未設定則詢問(_S)"
+#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:897
+msgid "Ask for a decision"
+msgstr "詢問決定"
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:91
 msgid ""
@@ -2875,126 +3124,63 @@ msgstr "有嚴重錯誤發生致使訊餅許可管理員擴充套件無法繼續
 msgid "Error in cookie permission manager extension"
 msgstr "訊餅許可管理員擴充套件中發生錯誤"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:100
-msgid "Reason"
-msgstr "原因"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:140
-#, c-format
-msgid "Could not create configuration folder for extension: %s"
-msgstr "無法為擴充功能建立組態資料夾:%s"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:142
-msgid "Could not create configuration folder for extension."
-msgstr "無法為擴充功能建立組態資料夾。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:159
-msgid "Could not open database of extension."
-msgstr "無法開啟擴充功能資料庫。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:192
-msgid "Could not set up database structure of extension."
-msgstr "無法設置擴充功能的資料庫結構。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:313
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:312
 #, c-format
 msgid "Could not determine global cookie policy to set for domain: %s"
 msgstr "無法判出要為此網域設定的全域訊餅方針:%s"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:488
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:487
 msgid "Till session end"
 msgstr "直到本執行階段結束"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:512
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:511
 #, c-format
 msgid "The website %s wants to store %d cookies."
 msgstr "網站 %s 想要儲存 %d 塊訊餅。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:514
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:513
 #, c-format
 msgid "The website %s wants to store a cookie."
 msgstr "網站 %s 想要儲存一塊訊餅。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:518
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:517
 #, c-format
 msgid "Multiple websites want to store %d cookies in total."
 msgstr "多個網站一共想要儲存 %d 塊訊餅。"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:526
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:527
 msgid "Accept for this _session"
 msgstr "本次執行階段接受(_S)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:528
 msgid "De_ny"
 msgstr "拒絕(_N)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:530
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:529
 msgid "Deny _this time"
 msgstr "本次拒絕(_T)"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:563
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:558
 msgid "Path"
 msgstr "路徑"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:577
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:572
 msgid "Value"
 msgstr "值"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:588
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:583
 msgid "Expire date"
 msgstr "過期日"
 
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011
-msgid "Extension instance"
-msgstr "擴充功能實體"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012
-msgid "The Midori extension instance for this extension"
-msgstr "此擴充功能的 Midori 擴充功能實體"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018
-msgid "Application instance"
-msgstr "應用程式實體"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019
-msgid "The Midori application instance this extension belongs to"
-msgstr "此擴充功能所屬的 Midiri 應用程式實體"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025
-msgid "Database instance"
-msgstr "資料庫實體"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026
-msgid "Pointer to sqlite database instance used by this extension"
-msgstr "此擴充功能使用的 sqlite 資料庫實體指標"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031
-msgid "Database path"
-msgstr "資料庫路徑"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032
-msgid "Path to sqlite database instance used by this extension"
-msgstr "此擴充功能使用的 sqlite 資料庫實體路徑"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038
-msgid "Ask for unknown policy"
-msgstr "如果方針未明則詢問"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039
+#: ../extensions/cookie-permissions/cookie-permission-manager.c:1034
 msgid ""
-"If true this extension ask for policy for every unknown domain.If false this "
-"extension uses the global cookie policy set in Midori settings."
-msgstr ""
-"如果設定為是,則此擴充功能將在每次遇到未知網域時詢問方針。如果為否,則此擴充"
-"功能會為它套用 Midori 設定值中所設定的全域訊餅方針。"
-
-#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115
-msgid "Undetermined"
-msgstr "尚未決定"
+"The policy to use for domains not individually configured. This only acts to "
+"further restrict the global cookie policy set in Midori settings."
+msgstr "針對網域的使用方針並未個別設定。這只能進一步限制 Midori 設定中的全域訊餅方針。"
 
 #: ../extensions/cookie-permissions/main.c:62
 msgid "Cookie Security Manager"
@@ -3004,19 +3190,68 @@ msgstr "訊餅安全管理員"
 msgid "Manage cookie permission per site"
 msgstr "針對各個網站管理訊餅的許可與否"
 
-#: ../extensions/apps.vala:82
-msgid "Applications"
-msgstr "應用程式"
+#: ../extensions/apps.vala:46
+#, c-format
+msgid "Failed to fetch application icon in %s: %s"
+msgstr "無法擷取 %s 中的應用程式圖示:%s"
 
-#: ../extensions/apps.vala:236
+#: ../extensions/apps.vala:100
+#, c-format
+msgid "Midori (%s)"
+msgstr "Midori (%s)"
+
+#: ../extensions/apps.vala:119 ../extensions/apps.vala:150
+#: ../extensions/apps.vala:154
+#, c-format
+msgid "Failed to create new launcher (%s): %s"
+msgstr "無法建立新的啟動器 (%s):%s"
+
+#: ../extensions/apps.vala:145
+msgid "Launcher created"
+msgstr "啟動器已建立"
+
+#: ../extensions/apps.vala:146
+#, c-format
+msgid "You can now run <b>%s</b> from your launcher or menu"
+msgstr "您現在可以從您的啟動器或選單中執行 <b>%s</b>"
+
+#: ../extensions/apps.vala:153
+msgid "Error creating launcher"
+msgstr "建立啟動器時發生錯誤"
+
+#: ../extensions/apps.vala:191
+msgid "Applications"
+msgstr "應用程式"
+
+#: ../extensions/apps.vala:201
+msgid "New _Profile"
+msgstr "新增個人檔案(_P)"
+
+#: ../extensions/apps.vala:202
+msgid "Creates a new, independant profile and a launcher"
+msgstr "建立新的、獨立的個人檔案與啟動器"
+
+#: ../extensions/apps.vala:213
+msgid "New _App"
+msgstr "新增程式(_A)"
+
+#: ../extensions/apps.vala:214 ../extensions/apps.vala:451
+msgid "Creates a new app for a specific site"
+msgstr "為指定的網站建立新的程式"
+
+#: ../extensions/apps.vala:239
+msgid "Error launching"
+msgstr "啟動時發生錯誤"
+
+#: ../extensions/apps.vala:450
 msgid "Create _Launcher"
 msgstr "建立啟動器(_L)"
 
-#: ../extensions/apps.vala:274
+#: ../extensions/apps.vala:500
 msgid "Web App Manager"
 msgstr "網頁程式管理員"
 
-#: ../extensions/apps.vala:275
+#: ../extensions/apps.vala:501
 msgid "Manage websites installed as applications"
 msgstr "管理安裝成應用程式型態的網站"
 
@@ -3024,790 +3259,190 @@ msgstr "管理安裝成應用程式型態的網站"
 msgid "Transfers"
 msgstr "傳輸"
 
-#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:373
+#: ../extensions/transfers.vala:111 ../extensions/transfers.vala:391
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../extensions/transfers.vala:205
+#. Failure to open is the only known possibility here
+#: ../extensions/transfers.vala:182 ../extensions/transfers.vala:209
+#: ../extensions/transfers.vala:221 ../extensions/transfers.vala:357
+#: ../extensions/transfers.vala:467
+#, c-format
+msgid "Failed to open download: %s"
+msgstr "無法開啟下載:%s"
+
+#: ../extensions/transfers.vala:214
 msgid "Open Destination _Folder"
 msgstr "開啟目的地資料夾(_F)"
 
-#: ../extensions/transfers.vala:212
+#: ../extensions/transfers.vala:225
 msgid "Copy Link Loc_ation"
 msgstr "複製鏈結位置(_A)"
 
-#: ../extensions/transfers.vala:439
+#: ../extensions/transfers.vala:449
 #, c-format
 msgid "The file '<b>%s</b>' has been downloaded."
 msgstr "已下載「<b>%s</b>」檔案。"
 
-#: ../extensions/transfers.vala:440
+#: ../extensions/transfers.vala:451
+#, c-format
+msgid "'<b>%s</b>' and %d other files have been downloaded."
+msgstr "「<b>%s</b>」和另外 %d 份檔案已下載。"
+
+#: ../extensions/transfers.vala:452
 msgid "Transfer completed"
 msgstr "傳輸完成"
 
-#: ../extensions/transfers.vala:463 ../extensions/transfers.vala:464
+#: ../extensions/transfers.vala:507 ../extensions/transfers.vala:508
 msgid "Some files are being downloaded"
 msgstr "有些檔案正在下載中"
 
-#: ../extensions/transfers.vala:466
+#: ../extensions/transfers.vala:510
 msgid "_Quit Midori"
 msgstr "退出 Midori(_Q)"
 
-#: ../extensions/transfers.vala:468
+#: ../extensions/transfers.vala:512
 msgid "The transfers will be cancelled if Midori quits."
 msgstr "若退出 Midori,將會取消傳輸作業。"
 
-#: ../extensions/transfers.vala:515
+#: ../extensions/transfers.vala:561
 msgid "Transfer Manager"
 msgstr "傳輸管理員"
 
-#: ../extensions/transfers.vala:516
+#: ../extensions/transfers.vala:562
 msgid "View downloaded files"
 msgstr "檢視下載的檔案"
 
-#~ msgid "Custom..."
-#~ msgstr "自訂..."
-
-#~ msgid "What to identify as to web pages"
-#~ msgstr "要讓網頁識別為什麼"
-
-#~ msgid "Middle click opens Selection"
-#~ msgstr "按下滑鼠中鍵開啟所選"
-
-#~ msgid "Load an address from the selection via middle click"
-#~ msgstr "透過按下滑鼠中鍵以載入所選位址"
-
-#~ msgid "Could not get path to configuration of extension: path is NULL"
-#~ msgstr "無法取得前往擴充功能組態的路徑:路徑為 NULL"
-
-#~ msgid "Could not get path to configuration of extension."
-#~ msgstr "無法取得前往擴充功能組態的路徑。"
-
-#~ msgid "Confirm storing cookie"
-#~ msgstr "確認儲存訊餅"
-
-#~ msgid "_Details"
-#~ msgstr "細節(_D)"
-
-#~ msgid "Writing failed."
-#~ msgstr "寫入失敗。"
-
-#~ msgid "_Window"
-#~ msgstr "視窗(_W)"
-
-#~ msgid "Kinetic scrolling"
-#~ msgstr "動力捲動"
-
-#~ msgid "Whether scrolling should kinetically move according to speed"
-#~ msgstr "捲動是否該根據速度動態移動"
-
-#~ msgid "Redirects console warnings to the specified FILENAME"
-#~ msgstr "將主控臺警告重新導向至指定的 FILENAME"
-
-#~ msgid "FILENAME"
-#~ msgstr "FILENAME"
-
-#~ msgid "Add Shortcut to the _desktop"
-#~ msgstr "將捷徑加入至桌面(_D)"
-
-#~ 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 "Midori 啟動時要載入什麼"
-
-#~ msgid "The homepage"
-#~ 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 "啟用 HTML 資料庫支援"
-
-#~ msgid "Whether to enable HTML5 database support"
-#~ msgstr "是否要啟用 HTML5 資料庫支援"
-
-#~ msgid "Whether to enable HTML5 local storage support"
-#~ msgstr "是否要啟用 HTML 本地端儲存支援"
-
-#~ 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 "Highlight Matches"
-#~ msgstr "突顯相符者"
-
-#~ 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 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 "未指定任何檔名"
-
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "瀏覽時不儲存任何隱私資料"
-
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "加入捷徑至快速播號"
-
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "將捷徑加入至桌面"
-
-#~ msgid "Create a launcher"
-#~ msgstr "建立啟動器"
-
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "訂閱此新聞饋流"
-
-#~ msgid "Close this window"
-#~ msgstr "關閉這個視窗"
-
-#~ msgid "Close all open windows"
-#~ msgstr "關閉所有開啟的視窗"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "取消上次的修改"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "再次執行上次的修改"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "剪下所選文字"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "複製所選文字"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "從剪貼簿貼上文字"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "刪除所選文字"
-
-#~ msgid "Select all text"
-#~ msgstr "選取所有文字"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "尋找下一個出現的字詞或片語"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "尋找上一個出現的字詞或片語"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "重置縮放等級"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "檢視頁面的原始碼"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "向左捲"
-
-#~ msgid "Scroll down"
-#~ msgstr "向下捲"
-
-#~ msgid "Scroll up"
-#~ msgstr "向上捲"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "向右捲"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "刪除回收筒的內容"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "開啟上次關閉的分頁"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "加入新的書籤資料夾"
-
-#~ msgid "Add, edit and remove search engines…"
-#~ msgstr "加入、編輯、移除搜尋引擎…"
-
-#~ msgid "Clear private data…"
-#~ msgstr "清除隱私資料…"
-
-#~ msgid "Inspect page details and access developer tools…"
-#~ msgstr "審閱頁面詳細資料並存取開發者工具…"
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "切換至上一個分頁"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "切換至下一個分頁"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "將分頁移至上個分頁之後"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "將分頁移至下個分頁之前"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "專注於目前分頁"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "在檢視點之間循環切換焦點"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "只顯示目前分頁的圖示"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "製作目前分頁的複本"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "關閉目前分頁除外的所有分頁"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "開啟上次工作階段儲存的分頁"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "顯示常見問題集"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "開啟 Midori 錯誤追蹤器"
-
-#~ msgid "Show information about the program"
-#~ msgstr "顯示程式相關資訊"
-
-#~ msgid "Show menubar"
-#~ msgstr "顯示選單列"
-
-#~ msgid "Show navigationbar"
-#~ msgstr "顯示導覽列"
-
-#~ msgid "Show sidepanel"
-#~ msgstr "顯示側邊面板"
-
-#~ msgid "Show bookmarkbar"
-#~ msgstr "顯示書籤列"
-
-#~ msgid "Show statusbar"
-#~ msgstr "顯示狀態列"
-
-#~ msgid "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 "Quit the application"
-#~ msgstr "退出應用程式"
-
-#~ msgid "_Contents"
-#~ msgstr "內容(_C)"
-
-#~ msgid "Show the documentation"
-#~ msgstr "顯示文件"
-
-#~ msgid "Failed to execute database statement\n"
-#~ msgstr "執行資料庫敘述時失敗\n"
-
-#~ msgid "All cookies"
-#~ msgstr "所有訊餅"
-
-#~ msgid "Session cookies"
-#~ msgstr "工作階段訊餅"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "顯示傳輸列"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "是否要顯示傳輸列"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "在位置欄中顯示進度"
-
-#~ msgid "Whether to show search engines in the location completion"
-#~ msgstr "是否要在位置欄中顯示載入進度"
-
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "顯示面板的操作控制項"
-
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "是否要顯示面板的操作控制項"
-
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "於新分頁顯示快速播號"
-
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "於新開啟的分頁內顯示快速播號"
-
-#~ msgid "Download Manager"
-#~ msgstr "下載管理員"
-
-#~ msgid "Open external pages in:"
-#~ msgstr "開啟外部頁面於:"
-
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "何處開啟外部開啟的頁面"
-
-#~ msgid "What type of cookies to accept"
-#~ msgstr "要接受什麼類型的訊餅"
-
-#~ msgid "Maximum cookie age"
-#~ msgstr "最大訊餅時限"
-
-#~ msgid "Maximum history age"
-#~ msgstr "最大造訪歷史時限"
-
-#~ msgid "Remember last downloaded files"
-#~ msgstr "記住上次下載檔案"
-
-#~ msgid "Whether the last downloaded files are saved"
-#~ msgstr "是否要儲存上次下載的檔案"
-
-#~ msgid "Not found - %s"
-#~ msgstr "找不到 - %s"
-
-#~ msgid "Download with Download _Manager"
-#~ msgstr "使用下載管理員下載(_M)"
-
-#~ msgid "Document cannot be displayed"
-#~ msgstr "無法顯示文件"
-
-#~ msgid "General"
-#~ msgstr "一般"
-
-#~ msgid "Appearance"
-#~ msgstr "外觀"
-
-#~ msgid "Font settings"
-#~ msgstr "字型設定值"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "強制每英吋 96 點"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "強制畫面像點密度為 96 DPI"
-
-#~ msgid "Interface"
-#~ msgstr "介面"
-
-#~ msgid "Navigationbar"
-#~ msgstr "導覽列"
-
-#~ msgid "External applications"
-#~ msgstr "外部應用程式"
-
-#~ msgid "Web Cookies"
-#~ msgstr "網頁訊餅"
-
-#~ msgid "Delete cookies when quitting Midori"
-#~ msgstr "當退出 Midori 時刪除訊餅"
-
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "刪除大於 1 小時的舊訊餅"
-
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "刪除大於 1 週的舊訊餅"
-
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "刪除大於 1 年的舊訊餅"
-
-#~ msgid "Configure _Advertisement filters…"
-#~ msgstr "設定廣告過濾條件(_A)…"
-
-#~ msgid "Open target folder for selected addon"
-#~ msgstr "為所選的附加元件開啟目標資料夾"
-
-#~ msgid "Next Tab (History List)"
-#~ msgstr "下一個分頁 (歷史清單)"
-
-#~ msgid "Previous Tab (History List)"
-#~ msgstr "上一個分頁 (歷史清單)"
-
-#~ msgid "Previous tab from history"
-#~ msgstr "上一個歷史中的分頁"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
-#~ msgstr "以 Ctrl+Tab 在上次使用時所儲存的分頁間切換"
-
-#~ msgid "Pageholder"
-#~ msgstr "頁面夾"
-
-#~ msgid "_Pageholder"
-#~ msgstr "頁面夾(_P)"
-
-#~ msgid "Keep one or multiple pages open in parallel to your tabs"
-#~ msgstr "與您的分頁平行開啟的一個或多個頁面"
-
-#~ msgid "%d%% loaded"
-#~ msgstr "%d%% 已載入"
-
-#~ msgid "Show transferbar"
-#~ msgstr "顯示傳輸列"
-
-#~ msgid "Hide operating controls"
-#~ msgstr "隱藏操作控制項"
-
-#~ msgid "Show progress in location entry"
-#~ msgstr "在位置欄中顯示進度"
-
-#~ msgid "Whether to show loading progress in the location entry"
-#~ msgstr "是否要在位置欄中顯示載入進度"
-
-#~ msgid "Ask for the destination folder"
-#~ msgstr "詢問目的地資料夾"
-
-#~ msgid "Whether to ask for the destination folder when downloading a file"
-#~ msgstr "下載檔案時是否要詢問儲存的目的地"
-
-#~ msgid "Whether to show a notification when a transfer has been completed"
-#~ msgstr "當傳輸完成時是否要顯示通知"
-
-#~ msgid "_Save Link destination"
-#~ msgstr "儲存鏈結網址(_S)"
-
-#~ msgid "_Download Link destination"
-#~ msgstr "下載鏈結網址(_D)"
-
-#~ msgid "Download I_mage"
-#~ msgstr "下載影像(_M)"
-
-#~ msgid "Spell Checking"
-#~ msgstr "拼字檢查"
-
-#~ msgid "_Quick Find"
-#~ msgstr "快速尋找(_Q)"
-
-#~ msgid "Quickly jump to a word or phrase"
-#~ msgstr "快速跳到字詞或片語"
-
-#~ msgid "View Selection Source"
-#~ msgstr "檢視所選原始碼"
-
-#~ msgid "_Recently visited pages"
-#~ msgstr "最近造訪的頁面(_R)"
-
-#~ msgid "Reopen pages that you visited earlier"
-#~ msgstr "重新開啟您之前造訪過的頁面"
-
-#~ msgid "Both"
-#~ msgstr "兩者"
+#: ../extensions/tabby.vala:361 ../extensions/tabby.vala:372
+#: ../extensions/tabby.vala:385 ../extensions/tabby.vala:390
+#: ../extensions/tabby.vala:399 ../extensions/tabby.vala:404
+#: ../extensions/tabby.vala:424 ../extensions/tabby.vala:428
+#: ../extensions/tabby.vala:438 ../extensions/tabby.vala:443
+#: ../extensions/tabby.vala:455 ../extensions/tabby.vala:461
+#: ../extensions/tabby.vala:470 ../extensions/tabby.vala:474
+#: ../extensions/tabby.vala:478 ../extensions/tabby.vala:482
+#: ../extensions/tabby.vala:506 ../extensions/tabby.vala:511
+#: ../extensions/tabby.vala:574 ../extensions/tabby.vala:577
+#: ../extensions/tabby.vala:590 ../extensions/tabby.vala:595
+#, c-format
+msgid "Failed to update database: %s"
+msgstr "無法更新資料庫:%s"
 
-#~ msgid "Both horizontal"
-#~ msgstr "水平並列"
+#: ../extensions/tabby.vala:520 ../extensions/tabby.vala:524
+#: ../extensions/tabby.vala:548 ../extensions/tabby.vala:552
+#: ../extensions/tabby.vala:614 ../extensions/tabby.vala:617
+#, c-format
+msgid "Failed to select from database: %s"
+msgstr "無法從資料庫選取:%s"
 
-#~ msgid "Load on Startup"
-#~ msgstr "啟動時載入"
+#: ../extensions/tabby.vala:666
+#, c-format
+msgid "Failed to import legacy session: %s"
+msgstr "無法匯入舊有執行階段:%s"
 
-#~ msgid "Original cookies only"
-#~ msgstr "只限原本的訊餅"
+#: ../extensions/tabby.vala:775
+msgid "Tabby"
+msgstr "Tabby"
 
-#~ msgid "Remember last visited pages"
-#~ msgstr "記住上次造訪的頁面"
+#: ../extensions/tabby.vala:776
+msgid "Tab and session management."
+msgstr "分頁與執行階段管理。"
 
-#~ msgid "Whether the last visited pages are saved"
-#~ msgstr "是否要儲存上次造訪的頁面"
+#: ../extensions/flummi.vala:82
+msgid "Flummi"
+msgstr "Flummi"
 
-#~ msgid "Remember last form inputs"
-#~ msgstr "記住上次表單輸入"
+#: ../extensions/flummi.vala:83
+msgid ""
+"This extension provides a task queue for update jobs or recurring events."
+msgstr "此擴充套件提供更新工作或重複事件的作業佇列。"
 
-#~ msgid "Whether the last form inputs are saved"
-#~ msgstr "是否要儲存上次表單輸入"
+#: ../extensions/notes.vala:46
+#, c-format
+msgid "Failed to add new note to database: %s\n"
+msgstr "無法新增記事至資料庫:%s\n"
 
-#~ msgid "Detect proxy server automatically"
-#~ msgstr "自動偵測代理伺服器"
+#: ../extensions/notes.vala:66
+#, c-format
+msgid "Falied to remove note from database: %s\n"
+msgstr "無法從資料庫移除記事:%s\n"
 
-#~ msgid ""
-#~ "Whether to detect the proxy server automatically from the environment"
-#~ msgstr "是否要自動從環境中偵測代理伺服器"
+#: ../extensions/notes.vala:80
+#, c-format
+msgid "Falied to rename note: %s\n"
+msgstr "無法重新命名記事:%s\n"
 
-#~ msgid "Cache size"
-#~ msgstr "快取大小"
+#: ../extensions/notes.vala:96
+#, c-format
+msgid "Falied to update note: %s\n"
+msgstr "無法更新記事:%s\n"
 
-#~ msgid "The allowed size of the cache"
-#~ msgstr "允許的快取大小"
+#: ../extensions/notes.vala:139 ../extensions/notes.vala:179
+#: ../extensions/notes.vala:453
+msgid "Notes"
+msgstr "記事"
 
-#~ msgid "Open _Link"
-#~ msgstr "開啟鏈結(_L)"
+#: ../extensions/notes.vala:146
+msgid "New Note"
+msgstr "新增記事"
 
-#~ msgid "Source"
-#~ msgstr "原始碼"
+#: ../extensions/notes.vala:147
+msgid "Creates a new empty note, urelated to opened pages"
+msgstr "建立新的空白記事,與開啟的頁面無關"
 
-#~ msgid "The character encoding to use by default"
-#~ msgstr "預設使用的字元編碼"
+#: ../extensions/notes.vala:153
+msgid "New note"
+msgstr "新增記事"
 
-#~ msgid "Shrink images automatically"
-#~ msgstr "自動收縮圖像"
+#: ../extensions/notes.vala:197
+#, c-format
+msgid "Failed to select from notes database: %s\n"
+msgstr "無法從記事資料庫中選取:%s\n"
 
-#~ msgid "Automatically shrink standalone images to fit"
-#~ msgstr "自動收縮單獨圖像以符合頁面"
+#: ../extensions/notes.vala:319 ../extensions/notes.vala:327
+msgid "Rename note"
+msgstr "重新命名記事"
 
-#~ msgid "Resizable text areas"
-#~ msgstr "可變更大小的文字區"
+#: ../extensions/notes.vala:356
+msgid "Copy note to clipboard"
+msgstr "將記事複製到剪貼簿"
 
-#~ msgid "Whether text areas are resizable"
-#~ msgstr "是否文字區可變更大小"
+#: ../extensions/notes.vala:368
+msgid "Remove note"
+msgstr "移除記事"
 
-#~ msgid "Enable developer tools"
-#~ msgstr "啟用開發工具"
+#: ../extensions/notes.vala:402
+msgid "Copy selection as note"
+msgstr "將選取內容複製為記事內容"
 
-#~ msgid "Enable special extensions for developers"
-#~ msgstr "啟用給開發者的特殊擴充功能"
+#: ../extensions/notes.vala:454
+msgid "Save text clips from websites as notes"
+msgstr "將網站的文字剪輯片段儲存為記事內容"
 
-#~ msgid "Warning: You are using a superuser account!"
-#~ msgstr "警告:您正在使用超級使用者帳號!"
+#: ../extensions/adblock/extension.vala:38
+msgid "Advertisement blocker"
+msgstr "廣告阻擋器"
 
-#~ msgid "%s has no property '%s'"
-#~ msgstr "%s 沒有任何「%s」屬性"
+#: ../extensions/adblock/extension.vala:39
+msgid "Block advertisements according to a filter list"
+msgstr "根據過濾清單阻擋廣告"
 
-#~ msgid "%s cannot be assigned to %s.%s"
-#~ msgstr "%s 無法被指派為 %s.%s"
+#: ../extensions/adblock/extension.vala:51
+msgid "Configure Advertisement filters"
+msgstr "設定廣告過濾條件"
 
-#~ msgid "%s.%s cannot be accessed"
-#~ msgstr "%s.%s 無法被存取"
+#: ../extensions/adblock/extension.vala:168
+msgid "Bl_ock image"
+msgstr "阻擋影像(_O)"
 
-#~ msgid "_Disable"
-#~ msgstr "停用(_D)"
+#: ../extensions/adblock/extension.vala:171
+msgid "Bl_ock link"
+msgstr "阻擋鏈結(_O)"
 
-#~ msgid "Console"
-#~ msgstr "主控臺"
+#: ../extensions/adblock/extension.vala:183
+msgid "Edit rule"
+msgstr "編輯規則"
 
-#~ msgid "Plugins"
-#~ msgstr "外掛程式"
+#: ../extensions/adblock/extension.vala:197
+msgid "_Rule:"
+msgstr "規則(_R):"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f507ccf
--- /dev/null
@@ -0,0 +1,70 @@
+# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+include(ContainTest)
+add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
+
+include_directories(
+                    "${CMAKE_SOURCE_DIR}"
+                    "${CMAKE_SOURCE_DIR}/midori"
+                    ${DEPS_INCLUDE_DIRS}
+                    ${OPTS_INCLUDE_DIRS}
+                    ${DEPS_GTK_INCLUDE_DIRS}
+                    ${CMAKE_BINARY_DIR}
+                    "${CMAKE_BINARY_DIR}/midori"
+                    )
+file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c *.vala)
+foreach(UNIT_SRC ${TESTS})
+    if (${UNIT_SRC} MATCHES "(.vala)$")
+        string(REPLACE ".vala" "" UNIT ${UNIT_SRC})
+        include(ValaPrecompile)
+        vala_precompile(UNIT_SRC_C ${UNIT}
+            ${UNIT_SRC}
+        PACKAGES
+            ${PKGS}
+        OPTIONS
+            ${VALAFLAGS}
+        CUSTOM_VAPIS
+            ${EXTRA_VAPIS}
+            "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
+            "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
+        )
+
+        add_executable(${UNIT} ${UNIT_SRC_C})
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS "${VALA_CFLAGS}"
+                              )
+    else()
+        string(REPLACE ".c" "" UNIT ${UNIT_SRC})
+        add_executable(${UNIT} ${UNIT_SRC})
+        set_target_properties(${UNIT} PROPERTIES
+                              COMPILE_FLAGS ${CFLAGS}
+                              )
+    endif()
+
+    target_link_libraries(${UNIT}
+                          ${LIBMIDORI}
+                          )
+    add_test(NAME ${UNIT} COMMAND ${UNIT})
+    contain_test (${UNIT} ${UNIT})
+endforeach ()
+
+file(GLOB TESTS ${CMAKE_BINARY_DIR}/extensions/lib*.so)
+foreach(UNIT ${TESTS})
+    string(REPLACE ${CMAKE_BINARY_DIR} "" TEST ${UNIT})
+    string(REPLACE "/" "-" TEST ${TEST})
+    string(REPLACE "-extensions-lib" "" TEST ${TEST})
+    string(REPLACE ".so" "" TEST ${TEST})
+    add_test(NAME ${TEST} COMMAND $<TARGET_FILE:extensions> -e ${UNIT})
+    set(exe $<TARGET_FILE:extensions> -e ${UNIT})
+    contain_test (${TEST} "${exe}")
+endforeach()
+
+file(GLOB TESTS *.sh)
+foreach(UNIT_SRC ${TESTS})
+    string(REPLACE ".sh" "" UNIT ${UNIT_SRC})
+    add_test(NAME ${UNIT} COMMAND ${UNIT_SRC})
+    file(RELATIVE_PATH BLDDIR ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+    set_tests_properties(${UNIT} PROPERTIES
+                         ENVIRONMENT "SRCDIR=${CMAKE_SOURCE_DIR};BLDDIR=${BLDDIR};"
+                         )
+endforeach ()
diff --git a/tests/actions.vala b/tests/actions.vala
new file mode 100644 (file)
index 0000000..b44c891
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+
+ 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.
+*/
+
+void actions_view_page () {
+    var browser = new Midori.Browser ();
+    var view = new Midori.View.with_title (null, new Midori.WebSettings ());
+    browser.add_tab (view);
+    browser.show ();
+    view.set_html ("<body>The earth is <em>flat</em> for a fact.</body>");
+    var loop = MainContext.default ();
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);
+
+    var hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.DOCUMENT) as WebKit.HitTestResult;
+    var menu = view.get_page_context_action (hit_test_result);
+    assert (menu.name == "PageContextMenu");
+    assert (menu.get_by_name ("Back") != null);
+
+#if !HAVE_WEBKIT2
+    hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult;
+    menu = view.get_page_context_action (hit_test_result);
+    var copy = menu.get_by_name ("Copy");
+    assert (!copy.sensitive);
+    assert (view.web_view.search_text ("flat", true, false, false));
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (copy.sensitive);
+#endif
+
+    /* Reload contents to clear selection */
+    view.set_html ("<body>The earth is <em>flat</em> for a fact.</body>");
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);
+
+#if !HAVE_WEBKIT2
+    hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.SELECTION) as WebKit.HitTestResult;
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (!copy.sensitive);
+    assert (view.web_view.search_text ("flat", true, false, false));
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (copy.sensitive);
+#endif
+}
+
+void main (string[] args) {
+    Test.init (ref args);
+    Midori.App.setup (ref args, null);
+    Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
+#if !HAVE_WEBKIT2
+    WebKit.get_default_session ().set_data<bool> ("midori-session-initialized", true);
+#endif
+    Test.add_func ("/actions/view/page", actions_view_page);
+    Test.run ();
+}
+
index b44726ea10442709100eb0d9faa7c60a8a4fbd55..b024f4681310e9ead2ead05c1ce0744fc733d94e 100644 (file)
@@ -18,40 +18,38 @@ bool check_sensible_window_size (Gtk.Window window, Midori.WebSettings settings)
 
 void app_normal () {
     Midori.Test.grab_max_timeout ();
-
     Midori.Test.idle_timeouts ();
     Midori.Test.log_set_fatal_handler_for_icons ();
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-normal", false, null, null, null, -1, null);
+    var app = Midori.normal_app_new (null, "test-normal", false, null, null, -1, null);
     var loop = MainContext.default ();
-    do { loop.iteration (true); } while (loop.pending ());
-    for (var i = 0 ; i < 7; i++) {
+    do { loop.iteration (true); } while (app.browser == null);
+    for (var i = 0 ; i < 3; i++) {
         var tab = app.browser.add_uri ("about:blank") as Midori.View;
         app.browser.close_tab (tab);
         do { loop.iteration (true); } while (loop.pending ());
     }
     Midori.normal_app_on_quit (app);
-    /* FIXME
-    for (var i = 0 ; i < 7; i++) {
-        app.settings.maximum_cache_size++;
-        do { loop.iteration (true); } while (loop.pending ());
-    }
-    */
-
     Midori.Test.release_max_timeout ();
 }
 
 void app_normal_custom_config () {
+    Midori.Test.grab_max_timeout ();
+    Midori.Test.idle_timeouts ();
     Midori.Test.log_set_fatal_handler_for_icons ();
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"),
-        "test-custom-config-normal", false, null, null, null, -1, null);
-    var loop = MainContext.default ();
-    do { loop.iteration (true); } while (loop.pending ());
-    assert (check_sensible_window_size (app.browser, app.settings));
+    string? config_dir = null;
+    try {
+        config_dir = DirUtils.make_tmp ("custom-configXXXXXX");
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var app = Midori.normal_app_new (config_dir,
+        "test-custom-config-normal", false, null, null, -1, null);
     Midori.normal_app_on_quit (app);
+    Midori.Test.release_max_timeout ();
 }
 
 void app_private () {
@@ -67,7 +65,7 @@ void app_private () {
 void app_web () {
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var browser = Midori.web_app_new (null, null, null, null, -1, null);
+    var browser = Midori.web_app_new ("https://mail.google.com", null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     assert (check_sensible_window_size (browser, browser.settings));
@@ -76,100 +74,12 @@ void app_web () {
 void app_web_custom_config () {
     Midori.Paths.Test.reset_runtime_mode ();
     Midori.App.set_instance_is_running (false);
-    var browser = Midori.web_app_new (Midori.Paths.make_tmp_dir ("custom-configXXXXXX"), null, null, null, -1, null);
+    var browser = Midori.web_app_new ("https://mail.google.com", null, null, -1, null);
     var loop = MainContext.default ();
     do { loop.iteration (true); } while (loop.pending ());
     assert (check_sensible_window_size (browser, browser.settings));
 }
 
-
-void app_extensions_load () {
-    Midori.Test.grab_max_timeout ();
-
-    Midori.Test.idle_timeouts ();
-    Midori.Test.log_set_fatal_handler_for_icons ();
-    Midori.Paths.Test.reset_runtime_mode ();
-    Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, null, -1, null);
-    var loop = MainContext.default ();
-    do { loop.iteration (true); } while (loop.pending ());
-    /* No extensions loaded */
-    assert (app.extensions.get_length () == 0);
-    Midori.Extension.load_from_folder (app, null, false);
-    /* All extensions loaded, inactive */
-    assert (app.extensions.get_length () > 0);
-
-    /* Number of expected extensions matches */
-    /* FIXME Counting .so/dll doesn't see multiple extensions in one binary
-    Dir dir;
-    try {
-        dir = Dir.open (Midori.Paths.get_lib_path (PACKAGE_NAME), 0);
-    }
-    catch (Error error) {
-        GLib.error (error.message);
-    }
-    uint count = 0;
-    string? name;
-    while ((name = dir.read_name ()) != null) {
-        if (name.has_suffix (GLib.Module.SUFFIX))
-            count++;
-    }
-    assert (app.extensions.get_length () == count); */
-
-    foreach (var item in app.extensions.get_items ())
-        assert (!(item as Midori.Extension).is_active ());
-
-    for (var i = 0 ; i < 7; i++) {
-        var tab = app.browser.add_uri ("about:blank") as Midori.View;
-        app.browser.close_tab (tab);
-    }
-    do { loop.iteration (true); } while (loop.pending ());
-
-    /*
-    Midori.Test.release_max_timeout ();
-}
-
-void app_extensions_activate () {
-    Midori.Test.grab_max_timeout ();
-
-    Midori.Test.idle_timeouts ();
-    Midori.Test.log_set_fatal_handler_for_icons ();
-    Midori.Paths.Test.reset_runtime_mode ();
-    Midori.App.set_instance_is_running (false);
-    var app = Midori.normal_app_new (null, "test-extensions-normal", false, null, null, null, -1, null);
-    var loop = MainContext.default ();
-    do { loop.iteration (true); } while (loop.pending ());
-    Midori.Extension.load_from_folder (app, null, false);
-
-    assert (app.extensions.get_length () > 0);
-    */
-
-    foreach (var item in app.extensions.get_items ()) {
-        stdout.printf ("- %s\n", (item as Midori.Extension).name);
-        (item as Midori.Extension).activate (app);
-    }
-    do { loop.iteration (true); } while (loop.pending ());
-
-    for (var i = 0 ; i < 7; i++) {
-        var tab = app.browser.add_uri ("about:blank") as Midori.View;
-        app.browser.close_tab (tab);
-    }
-    do { loop.iteration (true); } while (loop.pending ());
-
-    foreach (var item in app.extensions.get_items ())
-        (item as Midori.Extension).deactivate ();
-    do { loop.iteration (true); } while (loop.pending ());
-
-    for (var i = 0 ; i < 7; i++) {
-        var tab = app.browser.add_uri ("about:blank") as Midori.View;
-        app.browser.close_tab (tab);
-        do { loop.iteration (true); } while (loop.pending ());
-    }
-
-    Midori.Test.release_max_timeout ();
-}
-
-
 void main (string[] args) {
     Test.init (ref args);
     Midori.App.setup (ref args, null);
@@ -178,8 +88,6 @@ void main (string[] args) {
     Test.add_func ("/app/private", app_private);
     Test.add_func ("/app/web", app_web);
     Test.add_func ("/app/web-custom-config", app_web_custom_config);
-    Test.add_func ("/app/extensions-load", app_extensions_load);
-    /* Test.add_func ("/app/extensions-activate", app_extensions_activate); */
     Test.run ();
 }
 
index 9d216c62decfacbcd5cf37aa25d9e3be6763c212..ad3ccc2779462b681a5b1f48341641f20ae7002a 100644 (file)
  */
 
 #include "midori.h"
-#include "panels/midori-bookmarks.h"
+#include "midori-bookmarks-db.h"
 
 typedef struct
 {
-    KatzeArray* db_bookmarks;
+    MidoriBookmarksDb* db_bookmarks;
     KatzeArray* test_bookmarks;
 } BookmarksFixture;
 
@@ -37,7 +37,7 @@ fixture_setup (BookmarksFixture* fixture,
     KatzeArray* folder;
     gchar *errmsg = NULL;
 
-    if (!(fixture->db_bookmarks = midori_bookmarks_new (&errmsg)))
+    if (!(fixture->db_bookmarks = midori_bookmarks_db_new (&errmsg)))
         g_error ("Bookmarks couldn't be loaded: %s\n", errmsg);
     g_assert (errmsg == NULL);
     g_assert (g_object_get_data (G_OBJECT (fixture->db_bookmarks), "db"));
@@ -84,8 +84,8 @@ static void
 fixture_teardown (BookmarksFixture* fixture,
                   const TestParameters *params)
 {
-    midori_bookmarks_on_quit (fixture->db_bookmarks);
-    g_object_unref (fixture->db_bookmarks);
+    midori_bookmarks_db_on_quit (fixture->db_bookmarks);
+    /* g_object_unref (fixture->db_bookmarks); */
     g_object_unref (fixture->test_bookmarks);
 }
 
@@ -112,7 +112,7 @@ compare_items (KatzeItem *a, KatzeItem *b)
 /* NB: assumes "title" is unique in a set */
 static void
 compare_test_and_db (KatzeArray* test_bookmarks,
-                     KatzeArray* db_bookmarks,
+                     MidoriBookmarksDb* db_bookmarks,
                      gboolean verbose)
 {
     KatzeArray* db_items;
@@ -127,7 +127,7 @@ compare_test_and_db (KatzeArray* test_bookmarks,
             g_print ("----------\n");
         }
 
-        db_items = midori_array_query_recursive (db_bookmarks,
+        db_items = midori_bookmarks_db_query_recursive (db_bookmarks,
                            "*", "title='%q'", katze_item_get_name (test_item), FALSE);
 
         /* FIXME g_assert_cmpint (katze_array_get_length (db_items), ==, 1); */
@@ -142,30 +142,35 @@ compare_test_and_db (KatzeArray* test_bookmarks,
 }
 
 static void
-insert_bookmarks (KatzeArray* test_bookmarks,
-                  KatzeArray* db_bookmarks,
-                  gboolean verbose)
+print_bookmarks (KatzeArray* test_bookmarks)
 {
     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);
+       print_bookmark (item);
+       g_print ("----------\n");
 
         if (KATZE_ITEM_IS_FOLDER(item))
-            insert_bookmarks (KATZE_ARRAY (item), db_bookmarks, verbose);
+            print_bookmarks (KATZE_ARRAY (item));
     }
     g_list_free (list);
 }
 
+static void
+insert_bookmarks (KatzeArray* test_bookmarks,
+                  MidoriBookmarksDb* db_bookmarks,
+                  gboolean verbose)
+{
+
+    if (verbose)
+    {
+       print_bookmarks (test_bookmarks);
+    }
+
+    midori_bookmarks_db_import_array (db_bookmarks, test_bookmarks, 0);
+}
+
 static void
 simple_test (BookmarksFixture* fixture,
              const TestParameters* params)
index 8e5ab9b2b6a0150cfd8f87629fa04d49ebc48c01..1588c940432b621f7be64ddb93ff60cc36e5336f 100644 (file)
@@ -11,6 +11,7 @@
 
 #include "midori.h"
 
+#ifndef HAVE_WEBKIT2
 static void
 browser_create (void)
 {
@@ -43,7 +44,7 @@ browser_create (void)
     midori_settings_set_download_folder (MIDORI_SETTINGS (settings), temporary_downloads);
     midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
 
-    filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL);
+    filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, FALSE);
     filename2 = g_filename_from_uri (uri, NULL, NULL);
     g_assert_cmpstr (filename, ==, filename2);
     g_free (filename);
@@ -61,6 +62,7 @@ browser_create (void)
     g_object_unref (settings);
     g_object_unref (app);
 }
+#endif
 
 static void
 browser_tooltips (void)
@@ -168,9 +170,9 @@ main (int    argc,
     #ifndef HAVE_WEBKIT2
     g_object_set_data (G_OBJECT (webkit_get_default_session ()),
                        "midori-session-initialized", (void*)1);
-    #endif
-
     g_test_add_func ("/browser/create", browser_create);
+    #endif                   
+
     g_test_add_func ("/browser/tooltips", browser_tooltips);
     g_test_add_func ("/browser/site_data", browser_site_data);
     g_test_add_func ("/browser/block_uris", browser_block_uris);
index 5b9d2c5a95a70c8accd7051d55e26b90f8be5395..88abcf69a08f245e550e510f95ff2fafbb51ebdb 100644 (file)
@@ -43,83 +43,68 @@ class TestCompletion : Midori.Completion {
     }
 }
 
-void completion_autocompleter () {
-    var app = new Midori.App ();
-    var autocompleter = new Midori.Autocompleter (app);
-    assert (!autocompleter.can_complete (""));
-    var completion = new TestCompletion ();
-    autocompleter.add (completion);
-    completion.test_can_complete = false;
-    assert (!autocompleter.can_complete (""));
-    completion.test_can_complete = true;
-    assert (autocompleter.can_complete (""));
-
-    completion.test_suggestions = 0;
-    autocompleter.complete.begin ("");
-    var loop = MainContext.default ();
-    do { loop.iteration (true); } while (loop.pending ());
-    assert (autocompleter.model.iter_n_children (null) == 0);
-
-    completion.test_suggestions = 1;
-    autocompleter.complete.begin ("");
-    do { loop.iteration (true); } while (loop.pending ());
-    assert (autocompleter.model.iter_n_children (null) == 1);
-
-    /* Order */
-    completion.test_suggestions = 2;
-    autocompleter.complete.begin ("");
-    do { loop.iteration (true); } while (loop.pending ());
-    assert (autocompleter.model.iter_n_children (null) == 2);
-    Gtk.TreeIter iter_first;
-    autocompleter.model.get_iter_first (out iter_first);
-    string title;
-    autocompleter.model.get (iter_first, Midori.Autocompleter.Columns.MARKUP, out title);
-    if (title != "First")
-        error ("Expected %s but got %s", "First", title);
-
-    /* Cancellation */
-    autocompleter.complete.begin ("");
-    completion.test_suggestions = 3;
-    autocompleter.complete.begin ("");
-    do { loop.iteration (true); } while (loop.pending ());
-    int n = autocompleter.model.iter_n_children (null);
-    if (n != 3)
-        error ("Expected %d but got %d", 3, n);
-}
-
-struct TestCaseCompletion {
-    public string prefix;
-    public string text;
-    public int expected_count;
-}
-
-const TestCaseCompletion[] completions = {
-    { "history", "example", 1 }
-};
-
-async void complete_spec (Midori.Completion completion, TestCaseCompletion spec) {
-    assert (completion.can_complete (spec.text));
-    var cancellable = new Cancellable ();
-    var suggestions = yield completion.complete (spec.text, null, cancellable);
-    if (spec.expected_count != suggestions.length ())
-        error ("%u expected for %s/ %s but got %u",
-            spec.expected_count, spec.prefix, spec.text, suggestions.length ());
+class CompletionAutocompleter : Midori.Test.Job {
+    public static void test () { new CompletionAutocompleter ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        var app = new Midori.App ();
+        var autocompleter = new Midori.Autocompleter (app);
+        assert (!autocompleter.can_complete (""));
+        var completion = new TestCompletion ();
+        autocompleter.add (completion);
+        completion.test_can_complete = false;
+        assert (!autocompleter.can_complete (""));
+        completion.test_can_complete = true;
+        assert (autocompleter.can_complete (""));
+
+        completion.test_suggestions = 0;
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 0);
+
+        completion.test_suggestions = 1;
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 1);
+
+        /* Order */
+        completion.test_suggestions = 2;
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 2);
+        Gtk.TreeIter iter_first;
+        autocompleter.model.get_iter_first (out iter_first);
+        string title;
+        autocompleter.model.get (iter_first, Midori.Autocompleter.Columns.MARKUP, out title);
+        if (title != "First")
+            error ("Expected %s but got %s", "First", title);
+
+        /* Cancellation */
+        yield autocompleter.complete ("");
+        completion.test_suggestions = 3;
+        yield autocompleter.complete ("");
+        int n = autocompleter.model.iter_n_children (null);
+        if (n != 3)
+            error ("Expected %d but got %d", 3, n);
+    }
 }
 
-void completion_history () {
-    var completion = new Midori.HistoryCompletion ();
-    var app = new Midori.App ();
-    var history = new Katze.Array (typeof (Katze.Item));
-    app.set ("history", history);
-    Sqlite.Database db;
-    Sqlite.Database.open_v2 (":memory:", out db);
-    db.exec ("CREATE TABLE history (uri TEXT, title TEXT);");
-    db.exec ("CREATE TABLE search (uri TEXT, keywords TEXT);");
-    db.exec ("CREATE TABLE bookmarks (uri TEXT, title TEXT);");
-    history.set_data<unowned Sqlite.Database?> ("db", db);
-    completion.prepare (app);
-    foreach (var spec in completions)
-        complete_spec.begin (completion, spec);
+class CompletionHistory : Midori.Test.Job {
+    public static void test () { new CompletionHistory ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        var bookmarks_database = new Midori.BookmarksDatabase ();
+        assert (bookmarks_database.db != null);
+
+        Midori.HistoryDatabase history = new Midori.HistoryDatabase (null);
+        assert (history.db != null);
+        history.clear (0);
+
+        history.insert ("http://example.com", "Ejemplo", 0, 0);
+        var results = yield history.list_by_count_with_bookmarks ("example", 1, cancellable);
+        assert (results.length () == 1);
+        var first = results.nth_data (0);
+        assert (first.title == "Ejemplo");
+        results = yield history.list_by_count_with_bookmarks ("ejemplo", 1, cancellable);
+        assert (results.length () == 1);
+        first = results.nth_data (0);
+        assert (first.title == "Ejemplo");
+    }
 }
 
 struct TestCaseRender {
@@ -149,12 +134,69 @@ void completion_location_action () {
     }
 }
 
+class HistoryMarkup : Midori.Test.Job {
+    public static void test () { new HistoryMarkup ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        var app = new Midori.App ();
+        var autocompleter = new Midori.Autocompleter (app);
+        assert (!autocompleter.can_complete (""));
+
+        var histcomp = new Midori.HistoryCompletion ();
+        assert (!histcomp.can_complete (""));
+
+        //this calls histcomp.prepare (app):
+        autocompleter.add (histcomp);
+
+        //any time the history completion has a db, its can_complete method returns true
+        //assert (!histcomp.can_complete (""));
+
+        //remove entries from previous tests
+        histcomp.database.clear (0);
+
+        histcomp.database.insert ("https://duckduckgo.com/?q=%3E&ia=about", "> (Clojure) - DuckDuckGo", 0, 0);
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 2);
+
+        histcomp.database.insert ("https://duckduckgo.com/", "DuckDuckGo", 0, 0);
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 3);
+
+        histcomp.database.insert ("http://stackoverflow.com/questions/5068951/what-do-lt-and-gt-stand-for",
+            "html - What do &lt; and &gt; stand for? - Stack Overflow", 0, 0);
+        yield autocompleter.complete ("");
+        assert (autocompleter.model.iter_n_children (null) == 4);
+
+        Gtk.TreeIter iter;
+        string title, expected;
+
+        expected = "DuckDuckGo";
+        autocompleter.model.iter_nth_child (out iter, null, 2);
+        autocompleter.model.get (iter, Midori.Autocompleter.Columns.MARKUP, out title);
+        if (title != expected)
+            error ("Expected %s but got %s", expected, title);
+
+        expected = "> (Clojure) - DuckDuckGo";
+        autocompleter.model.iter_nth_child (out iter, null, 3);
+        autocompleter.model.get (iter, Midori.Autocompleter.Columns.MARKUP, out title);
+        if (title != expected)
+            error ("Expected %s but got %s", expected, title);
+
+        expected = "html - What do &lt; and &gt; stand for? - Stack Overflow";
+        autocompleter.model.iter_nth_child (out iter, null, 1);
+        autocompleter.model.get (iter, Midori.Autocompleter.Columns.MARKUP, out title);
+        if (title != expected)
+            error ("Expected %s but got %s", expected, title);
+    }
+}
+
 void main (string[] args) {
-    Test.init (ref args);
+    Midori.Test.init (ref args);
     Midori.App.setup (ref args, null);
-    Test.add_func ("/completion/autocompleter", completion_autocompleter);
-    Test.add_func ("/completion/history", completion_history);
+    Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
+    Test.add_func ("/completion/autocompleter", CompletionAutocompleter.test);
+    Test.add_func ("/completion/history", CompletionHistory.test);
     Test.add_func ("/completion/location-action", completion_location_action);
+    Test.add_func ("/completion/historymarkup", HistoryMarkup.test);
     Test.run ();
 }
 
diff --git a/tests/database.vala b/tests/database.vala
new file mode 100644 (file)
index 0000000..f90cc0c
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2015 Christian Dywan <christian@twotoasts.de>
+
+ 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.
+*/
+
+class DatabaseTest : Midori.Test.Job {
+    public static void test () { new DatabaseTest ().run_sync (); }
+    public override async void run (Cancellable cancellable) throws GLib.Error {
+        var database = new Midori.Database ();
+        database.exec ("CREATE TABLE cats (cat text, favorite text)");
+        database.exec ("INSERT INTO cats (cat, favorite) VALUES ('Henry', 'pillow')");
+        var statement = database.prepare ("SELECT cat FROM cats WHERE favorite = :toy");
+        /* Missing : should throw an error */
+        try {
+            statement.bind ("toy", typeof (string), "pillow");
+        } catch (Midori.DatabaseError error) {
+            Katze.assert_str_equal (statement.query, error.message,
+                "No such parameter 'toy' in statement: " + statement.query);
+        }
+        statement.bind (":toy", typeof (string), "pillow");
+    }
+}
+
+void main (string[] args) {
+    Midori.Test.init (ref args);
+    Midori.App.setup (ref args, null);
+    Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
+    Test.add_func ("/database/bind", DatabaseTest.test);
+    Test.run ();
+}
+
index a5b4dcfdd1d1746c2857b9f53ec469ee8d960849..a3dc561af0836e143dd9519b1bd546eaecd4d52f 100644 (file)
@@ -110,12 +110,12 @@ void download_properties () {
     download.destination_uri = uri;
     download.start ();
 #endif
-    string tee = Midori.Download.get_tooltip (download);
+    string tee = Midori.Download.calculate_tooltip (download);
     assert (tee.contains (Path.get_basename (filename)));
     assert (Midori.Download.get_progress (download) == 0.0);
 
     download.notify["progress"].connect ((pspec) => {
-        string tee2 = Midori.Download.get_tooltip (download);
+        string tee2 = Midori.Download.calculate_tooltip (download);
         assert (tee2.contains (Path.get_basename (filename)));
     });
     var loop = MainContext.default ();
index 34fadb7e24d7bebab0f12d34ed90f4ac5c7f0b83..327ba1badc3b5d57fa01e16ec1a852f24a5bc9ec 100644 (file)
@@ -160,6 +160,7 @@ extension_settings (void)
     midori_extension_set_string_list (extension, "pets", names, 2);
     g_strfreev (names);
     names = midori_extension_get_string_list (extension, "pets", &names_n);
+    g_strfreev (names);
     g_assert_cmpint (names_n, ==, 2);
     midori_extension_deactivate (extension);
 }
@@ -175,12 +176,11 @@ extension_activate (gconstpointer data)
 }
 
 static void
-extension_load (const gchar* extension_path,
-                GDir*        extension_dir)
+extension_load (const gchar* absolute_filename)
 {
-    const gchar* filename;
-    while ((filename = g_dir_read_name (extension_dir)))
-    {
+    g_assert (g_access (absolute_filename, F_OK) == 0);
+    gchar* extension_path = g_path_get_dirname (absolute_filename);
+    gchar* filename = g_path_get_basename (absolute_filename);
         GObject* extension = midori_extension_load_from_file (extension_path, filename, FALSE, TRUE);
         if (KATZE_IS_ARRAY (extension))
         {
@@ -201,7 +201,6 @@ extension_load (const gchar* extension_path,
             g_test_add_data_func (path, extension, extension_activate);
             g_free (path);
         }
-    }
 }
 
 static void
@@ -215,30 +214,33 @@ int
 main (int    argc,
       char** argv)
 {
-    g_test_init (&argc, &argv, NULL);
-    midori_app_setup (&argc, &argv, NULL);
+    midori_test_init (&argc, &argv);
+    gchar* extension;
+    GOptionEntry entries[] = {
+        { "extension", 'e', 0, G_OPTION_ARG_STRING, &extension,
+          "Execute cases defined in extension_init", "EXTENSION" },
+        { NULL }
+    };
+    extension = NULL;
+    midori_app_setup (&argc, &argv, entries);
     midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
     #ifndef HAVE_WEBKIT2
     soup_session_add_feature_by_type (webkit_get_default_session (),
         SOUP_TYPE_COOKIE_JAR);
     #endif
 
-    g_test_add_func ("/extensions/create", extension_create);
-    g_test_add_func ("/extensions/settings", extension_settings);
-    g_test_add_func ("/extensions/config", extension_config);
-
-    if (g_module_supported ())
+    if (extension == NULL)
     {
-        gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME);
-        GDir* extension_dir = g_dir_open (extension_path, 0, NULL);
-        g_assert (extension_dir != NULL);
-
+        g_test_add_func ("/extensions/create", extension_create);
+        g_test_add_func ("/extensions/settings", extension_settings);
+        g_test_add_func ("/extensions/config", extension_config);
+    }
+    else
+    {
+        g_assert (g_module_supported ());
         /* We require that extensions can be loaded repeatedly */
-        extension_load (extension_path, extension_dir);
-        extension_load (extension_path, extension_dir);
-
-        g_dir_close (extension_dir);
-        g_free (extension_path);
+        extension_load (extension);
+        extension_load (extension);
     }
 
     return g_test_run ();
index 70e4c13d96c3b9cef13db98fc5189f0aaf76c7f7..6320e40f4cf10eccb8ea5bf2f0a3f3779a672e3f 100755 (executable)
@@ -6,8 +6,8 @@
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 echo Running 'licensecheck'
-test -z $(which licensecheck) && echo ...SKIPPED: not installed && return 0
+test -z $(which licensecheck) && echo ...SKIPPED: not installed && exit 0
 test -n "$SRCDIR" && cd $SRCDIR
 test -z "$BLDDIR" && BLDDIR=_build
-find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
+find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./_*/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
 echo ...OK
index 326305fb32db412b618611dd8b34ded4d136edd1..518c087b8cc1719c72b42678f2b8ef334640d308 100644 (file)
@@ -279,6 +279,21 @@ magic_uri_format (void)
      { "http://www.csszengarden.com", NULL },
      { "http://live.gnome.org/GTK+/3.0/Tasks", NULL },
      { "http://www.johannkönig.com/index.php?ausw=home", NULL },
+     { "http://en.wikipedia.org/wiki/Fat%20cat", NULL },
+     { "http://en.wikipedia.org/wiki/Fat cat",
+       "http://en.wikipedia.org/wiki/Fat%20cat" },
+     { "http://incomplete.escape/%", NULL },
+     { "http://incomplete.escape/%f", NULL },
+     { "http://invalid.escape/%xx", NULL },
+     { "http://invalid.escape/%gg", NULL },
+     { "http://complete.escape/%41", 
+       "http://complete.escape/A" },
+     { "http://complete.escape/%42C", 
+       "http://complete.escape/BC" },
+     { "http://www.google.com/%21%00ok",
+       "http://www.google.com/!%00ok" },
+     { "http://everything2.com/title/%2526%252364%253B", NULL },
+     { "http://www.google.com/get%25100.html", NULL },
      { "http://digilife.bz/wiki/index.php?Python%E3%81%AE%E9%96%8B%E7%99%BA%E6%89%8B%E9%A0%86",
        "http://digilife.bz/wiki/index.php?Pythonの開発手順" },
      { "http://die-welt.net/~evgeni/LenovoBatteryLinux/", NULL },
@@ -386,6 +401,50 @@ magic_uri_commands (void)
         }
 }
 
+GAppInfo* sokoke_default_for_uri (const gchar* uri, gchar** scheme_ptr);
+
+static gboolean uri_has_default (const gchar* uri)
+{
+    GAppInfo* info = sokoke_default_for_uri (uri, NULL);
+    if (info)
+        g_object_unref (info);
+    return info != NULL;
+}
+
+static void
+magic_uri_protocols (void)
+{
+    g_assert (!sokoke_external_uri (NULL));
+    g_assert (!sokoke_external_uri (""));
+
+    g_assert (!sokoke_external_uri ("http://google.com"));
+    g_assert (!sokoke_external_uri ("HTTP://google.com"));
+    g_assert (!sokoke_external_uri ("Http://google.com"));
+    g_assert (!sokoke_external_uri ("https://google.com"));
+    g_assert (!sokoke_external_uri ("httPS://google.com"));
+    g_assert (!sokoke_external_uri ("file:///home/"));
+    g_assert (!sokoke_external_uri ("geo:100,3000"));
+    g_assert (!sokoke_external_uri ("about:blank"));
+
+    g_assert (!sokoke_external_uri ("https://"));
+    g_assert (!sokoke_external_uri ("http://"));
+    g_assert (!sokoke_external_uri ("http:/"));
+    g_assert (!sokoke_external_uri ("http"));
+    g_assert (sokoke_external_uri ("ftp://ftphost.org") == uri_has_default ("ftp://ftphost.org"));
+    g_assert (sokoke_external_uri ("geometry:bar") == uri_has_default ("geometry:bar"));
+    g_assert (sokoke_external_uri ("httparty:woo") == uri_has_default ("httparty:woo"));
+}
+
+static void
+magic_uri_base_domain (void)
+{
+    #ifdef HAVE_LIBSOUP_2_40_0
+    g_assert_cmpstr ("bbc.co.uk", ==, midori_uri_get_base_domain ("http://www.bbc.co.uk"));
+    g_assert_cmpstr ("zeit.de", ==, midori_uri_get_base_domain ("http://www.zeit.de"));
+    #endif
+    g_assert_cmpstr ("123.456.789.100", ==, midori_uri_get_base_domain ("http://123.456.789.100"));
+}
+
 int
 main (int    argc,
       char** argv)
@@ -404,6 +463,8 @@ main (int    argc,
     g_test_add_func ("/magic-uri/prefix", magic_uri_prefix);
     g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch);
     g_test_add_func ("/magic-uri/commands", magic_uri_commands);
+    g_test_add_func ("/magic-uri/protocols", magic_uri_protocols);
+    g_test_add_func ("/magic-uri/base-domain", magic_uri_base_domain);
 
     return g_test_run ();
 }
diff --git a/tests/notebook.vala b/tests/notebook.vala
new file mode 100644 (file)
index 0000000..383d97b
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
+
+ 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.
+*/
+
+void notebook_menu () {
+    var notebook = new Midori.Notebook ();
+    /* FIXME: we should just use a Tab but currently it has no title property */
+    var tab = new Midori.View.with_title ("a_fairy_tale", new Midori.WebSettings ());
+    /*var tab = new Midori.View.with_title (null, new Midori.WebSettings ());
+    view.set_html ("<title>a_fairy_tale</title><body>The earth is <em>flat</em> for a fact.</body>");
+    var loop = MainContext.default ();
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);*/
+    notebook.insert (tab, 0);
+    var menu = notebook.get_context_action ();
+    var tab_menu = menu.get_by_name ("Tab0");
+    assert (tab_menu != null);
+    /* The underscores should be escaped */
+    Katze.assert_str_equal ("Tab0", tab_menu.label, "‪a__fairy__tale");
+}
+
+void main (string[] args) {
+    Test.init (ref args);
+    Midori.App.setup (ref args, null);
+    Test.add_func ("/notebook/menu", notebook_menu);
+    Test.run ();
+}
old mode 100644 (file)
new mode 100755 (executable)
index 655dd29..e6330c6
@@ -8,7 +8,7 @@
 echo Checking POTFILES.in for completeness
 test -n "$SRCDIR" && cd $SRCDIR
 test -z "$BLDDIR" && BLDDIR=_build
-for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
+for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|_.+|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
     grep -q $(basename $i) po/POTFILES.in || FILES="$FILES$i\n"
 done
 test -n "$FILES" && echo "$FILES...FAILED"
index eab9843c6971a771f2dd9963cd9abff5e9f22de8..530cf5dc16d8b89d45b632b36c524ceee23d35b0 100644 (file)
@@ -38,10 +38,34 @@ void searchaction_form () {
     */
 }
 
+struct TokenSpec {
+    public string uri;
+    public string expected_token;
+}
+
+const TokenSpec[] tokens = {
+    { "https://bugs.launchpad.net/midori/+bugs", "lnch" },
+    { "https://duckduckgo.com/search", "dckd" },
+    { "http://en.wikipedia.org/w/index.php?title=Special:Search&profile=default&search=%s&fulltext=Search&", "wkpd" },
+    { "about:blank", "" },
+    { "", "" },
+    { "file:///", "" },
+    { "file:///form.html", "" }
+};
+
+void searchaction_token () {
+    foreach(var token in tokens)
+    {
+        Katze.assert_str_equal (token.uri,
+            Midori.SearchAction.token_for_uri(token.uri), token.expected_token);
+    }
+}
+
 void main (string[] args) {
     Test.init (ref args);
     Midori.App.setup (ref args, null);
     Test.add_func ("/searchaction/form", searchaction_form);
+    Test.add_func ("/searchaction/token", searchaction_token);
     Test.run ();
 }
 
index 849aba88df57b18cff1cfee7361a29d04a75978d..20d12485559f7e6918a17b9db383d1a17d2bd4c8 100644 (file)
@@ -14,7 +14,11 @@ string get_test_file (string contents) {
         tmp_folder = Midori.Paths.make_tmp_dir ("speeddialXXXXXX");
     string checksum = Checksum.compute_for_string (ChecksumType.MD5, contents);
     string file = Path.build_path (Path.DIR_SEPARATOR_S, tmp_folder, checksum);
-    FileUtils.set_contents (file, contents, -1);
+    try {
+        FileUtils.set_contents (file, contents, -1);
+    } catch (Error file_error) {
+        GLib.error (file_error.message);
+    }
     return file;
 }
 
@@ -57,12 +61,16 @@ static void speeddial_load () {
     }
     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-rename 1 Lorem Ipsum Dolomit");
-    Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem Ipsum Dolomit");
-    dial_data.save_message ("speed_dial-save-delete 1");
-    Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1");
+    try {
+        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-rename 1 Lorem Ipsum Dolomit");
+        Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem Ipsum Dolomit");
+        dial_data.save_message ("speed_dial-save-delete 1");
+        Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1");
+    } catch (Error message_error) {
+        GLib.error (message_error.message);
+    }
 
     data = get_test_file ("""
             [settings]
@@ -79,9 +87,13 @@ static void speeddial_load () {
         """);
     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");
+    try {
+        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");
+    } catch (Error message_error) {
+        GLib.error (message_error.message);
+    }
 }
 
 void main (string[] args) {
index d66927d18bdf04d4fcc56d01b7c8ae1c30d36a9d..3d1eb8999fa45ff3715ce4b6939f370c78817733 100644 (file)
@@ -80,6 +80,8 @@ void tab_special () {
 
     Midori.Test.log_set_fatal_handler_for_icons ();
     var browser = new Midori.Browser ();
+    /* FIXME need proper stock extension mechanism */
+    browser.activate_action ("libabout.so=true");
     var settings = new Midori.WebSettings ();
     browser.set ("settings", settings);
     var tab = new Midori.View.with_title ();
@@ -91,28 +93,20 @@ void tab_special () {
     tab.set_uri ("about:blank");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
     assert (tab.is_blank ());
-    assert (!tab.can_view_source ());
-    assert (tab.special);
+    assert (tab.can_view_source ());
     assert (!tab.can_save ());
 
     tab.set_uri ("about:private");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
     assert (tab.is_blank ());
-    assert (!tab.can_view_source ());
-    assert (tab.special);
-    assert (!tab.can_save ());
-
-    tab.set_uri ("about:nodocs");
-    do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    assert (tab.is_blank ());
-    assert (!tab.can_view_source ());
+    assert (tab.can_view_source ());
     assert (tab.special);
     assert (!tab.can_save ());
 
     tab.set_uri ("http://.invalid");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
     assert (!tab.is_blank ());
-    assert (!tab.can_view_source ());
+    assert (tab.can_view_source ());
     assert (tab.special);
     assert (!tab.can_save ());
 
@@ -123,6 +117,8 @@ void tab_alias () {
     Midori.Test.log_set_fatal_handler_for_icons ();
     var browser = new Midori.Browser ();
     var settings = new Midori.WebSettings ();
+    /* FIXME need proper stock extension mechanism */
+    browser.activate_action ("libabout.so=true");
     browser.set ("settings", settings);
     var tab = new Midori.View.with_title ();
     tab.settings = new Midori.WebSettings ();
@@ -133,7 +129,7 @@ void tab_alias () {
     tab.settings.tabhome = "http://.invalid/";
     tab.set_uri ("about:new");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    assert (tab.uri == tab.settings.tabhome);
+    // FIXME: Katze.assert_str_equal ("about:new", tab.uri, tab.settings.tabhome);
 #if !HAVE_WEBKIT2
     // Check that this is the real page, not white page with a URL
     assert (!tab.web_view.search_text ("about:", true, false, false));
@@ -142,7 +138,7 @@ void tab_alias () {
     tab.settings.tabhome = "about:blank";
     tab.set_uri ("about:new");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    assert (tab.uri == tab.settings.tabhome);
+    // FIXME: Katze.assert_str_equal ("about:new", tab.uri, tab.settings.tabhome);
 #if !HAVE_WEBKIT2
     // Check that this is the real page, not white page with a URL
     assert (!tab.web_view.search_text ("about:", true, false, false));
@@ -152,7 +148,7 @@ void tab_alias () {
     tab.settings.location_entry_search = "http://.invalid/";
     tab.set_uri ("about:new");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    assert (tab.uri == tab.settings.location_entry_search);
+    // FIXME: Katze.assert_str_equal ("about:new", tab.uri, tab.settings.location_entry_search);
 #if !HAVE_WEBKIT2
     // Check that this is the real page, not white page with a URL
     assert (!tab.web_view.search_text ("about:", true, false, false));
@@ -162,7 +158,7 @@ void tab_alias () {
     tab.settings.homepage = "http://.invalid/";
     tab.set_uri ("about:new");
     do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED);
-    assert (tab.uri == tab.settings.homepage);
+    // FIXME: Katze.assert_str_equal ("about:new", tab.uri, tab.settings.homepage);
 #if !HAVE_WEBKIT2
     // Check that this is the real page, not white page with a URL
     assert (!tab.web_view.search_text ("about:", true, false, false));
@@ -213,15 +209,15 @@ void tab_http () {
     source.web_view.load_uri (test_url);
     do { loop.iteration (true); } while (source.load_status != Midori.LoadStatus.FINISHED);
     assert (!source.is_blank ());
-    assert (!source.can_view_source ());
+    /* FIXME assert (!source.can_view_source ()); */
     assert (!source.special);
     /* FIXME assert (source.can_save ()); */
-    assert (source.view_source);
+    /* FIXME assert (source.view_source); */
 
     source.set_uri ("http://.invalid");
     do { loop.iteration (true); } while (source.load_status != Midori.LoadStatus.FINISHED);
     assert (!source.is_blank ());
-    assert (!source.can_view_source ());
+    assert (source.can_view_source ());
     assert (source.special);
     assert (!source.can_save ());
     assert (!source.view_source);
@@ -266,6 +262,36 @@ void tab_download_dialog () {
     assert (!did_request_download);
 }
 
+void tab_scroll () {
+    /* ensure that no scrolls occur due to error iframes */
+    var markup = "<style>p{height: 90%}</style><p></p><iframe src=\"http://.invalid/\" height=\"90%\"/>";
+    Midori.Test.grab_max_timeout ();
+
+    Midori.Test.idle_timeouts ();
+    Midori.Test.log_set_fatal_handler_for_icons ();
+    var browser = new Midori.Browser ();
+    var settings = new Midori.WebSettings ();
+    browser.set ("settings", settings);
+    var loop = MainContext.default ();
+    do { loop.iteration (true); } while (loop.pending ());
+    for (var i = 0 ; i < 7; i++) {
+        var tab = browser.add_uri ("data:text/html;charset=utf-8;base64," + 
+                                       GLib.Base64.encode (markup.data)) as Midori.Tab;
+        #if HAVE_GTK3
+        var vadj = (tab.web_view as Gtk.Scrollable).get_vadjustment ();
+        #else
+        var vadj = (tab.web_view.get_parent () as Gtk.ScrolledWindow).get_vadjustment ();
+        #endif
+        vadj.value_changed.connect ((vadj) => {
+            assert(vadj.get_value () == vadj.get_lower ());
+        });
+        do { loop.iteration (true); } while (tab.progress != 0.0);
+        browser.close_tab (tab as Midori.View);
+    }
+
+    Midori.Test.release_max_timeout ();
+}
+
 void main (string[] args) {
     Test.init (ref args);
     Midori.App.setup (ref args, null);
@@ -281,6 +307,7 @@ void main (string[] args) {
     Test.add_func ("/tab/http", tab_http);
     Test.add_func ("/tab/movement", tab_movement);
     Test.add_func ("/tab/download", tab_download_dialog);
+    Test.add_func ("/tab/scroll", tab_scroll);
     Test.run ();
 }
 
diff --git a/tests/wscript_build b/tests/wscript_build
deleted file mode 100644 (file)
index 21c5c4c..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import os
-import sys
-import Utils
-
-tests = os.listdir ('tests')
-for test in tests:
-    folder = 'tests' + os.sep + test
-    if os.path.isdir (folder):
-        files = os.listdir (folder)
-        target = test
-        source = ''
-        for fila in files:
-            if fila[-2:] == '.c' or fila[-5:] == '.vala':
-                source += ' ' + test + os.sep + fila
-        if not source:
-            Utils.pprint ('RED', folder + ': No source files found')
-            sys.exit (1)
-
-    elif test[-3:] == '.py' or test[-3:] == '.sh':
-        obj = bld.new_task_gen ('command-output')
-        obj.no_inputs = obj.no_outputs = obj.command_is_external = True
-        obj.command = ['python', 'sh'][test[-3:] == '.sh']
-        os.environ['SRCDIR'] = os.getcwd ()
-        os.environ['BLDDIR'] = '_build'
-        obj.argv = [os.path.join (os.getcwd (), folder)]
-        continue
-    elif test[-2:] == '.c':
-        target = test[:-2]
-        source = test
-    elif test[-5:] == '.vala':
-        target = test[:-5]
-        source = test
-    else:
-        Utils.pprint ('YELLOW', folder + ': Skipped')
-        continue
-
-    obj = bld.new_task_gen ('cc', 'program')
-    obj.target = 'test-' + target
-    obj.includes = '.. ../midori ../panels'
-    obj.source = source
-    if 'vala' in source:
-        obj.env.append_value ('CCFLAGS', '-w')
-        obj.vapi_dirs = '../midori ../katze'
-        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 katze midori midori-core'
-        if bld.env['HAVE_GTK3']:
-            obj.packages += ' gtk+-3.0'
-        else:
-            obj.packages += ' gtk+-2.0'
-        if bld.env['HAVE_WEBKIT2']:
-            obj.packages += ' webkit2gtk-3.0'
-        else:
-            obj.packages += ' webkitgtk-3.0'
-    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST'
-    obj.uselib_local = 'midori-c'
-    obj.unit_test = 1
index ac50a674c3783cbef5951d8962d520a3ea52a8f3..f42c15fc3acc7e395f37958b326eb514a003f44d 100644 (file)
@@ -46,7 +46,7 @@ midori_findbar_class_init (MidoriFindbarClass* class)
 
 static void
 midori_findbar_set_icon (MidoriFindbar*       findbar,
-                         GtkIconEntryPosition icon_pos,
+                         GtkEntryIconPosition icon_pos,
                          const gchar*         icon_name)
 {
     if (icon_name != NULL)
@@ -57,7 +57,7 @@ midori_findbar_set_icon (MidoriFindbar*       findbar,
         g_free (symbolic_icon_name);
     }
     else
-        gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
+        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (findbar->find_text),
                                                 icon_pos, NULL);
 }
 
@@ -146,7 +146,7 @@ midori_findbar_invoke (MidoriFindbar* findbar,
         gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text));
     else
     {
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, STOCK_EDIT_FIND);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, STOCK_EDIT_FIND);
         gtk_widget_show (GTK_WIDGET (findbar->find_case));
         gtk_widget_show (GTK_WIDGET (findbar->find_close));
         if (selected_text != NULL)
@@ -188,11 +188,11 @@ midori_findbar_preedit_changed_cb (GtkWidget*     entry,
     if (g_utf8_strlen (preedit, -1) >= 1)
     {
         gboolean case_sensitive = midori_findbar_case_sensitive (findbar);
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, STOCK_EDIT_CLEAR);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, STOCK_EDIT_CLEAR);
         midori_tab_find (MIDORI_TAB (view), preedit, case_sensitive, TRUE);
     }
     else
-        midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, NULL);
+        midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, NULL);
 }
 
 static void
@@ -292,7 +292,7 @@ midori_findbar_search_text (MidoriFindbar* findbar,
     const gchar* text;
     gboolean case_sensitive;
 
-    midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
+    midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
 
     if (typing)
     {
index 95f9ebdf845f141b9ba7255aa0b1cdec29bae22d..6da645d5b507a3ce0e0195c49d63bd95d55e8411 100755 (executable)
@@ -9,10 +9,10 @@
 #
 # See the file COPYING for the full license text.
 #
-# midori-dev: Run, update or debug Midori from git.
+# midori-dev: Run, update or debug Midori from bzr.
 
-# Adjust this to where you have your git sources
-DEVDIR=~/src/xfce/midori/git
+# Adjust this to where you have your bzr sources
+DEVDIR=~/src/xfce/midori/bzr
 
 # Location of stdout and stderr from running midori
 LOG=~/.midori.out
@@ -40,8 +40,8 @@ if [ $CMD == "dev" ]; then
 fi
 
 case $CMD in
-  git)
-    exec ./waf build --run "$@" >& $LOG
+  bzr)
+    exec _build/midori/midori "$@" >& $LOG
     ;;
   gdb)
     gdb $BIN core
@@ -72,13 +72,13 @@ case $CMD in
     fi
     ;;
   pull)
-    git pull
+    bzr pull
     ;;
   *)
     cat << EOM
 Usage: Create a symlink midori-<CMD>, or run 'midori-dev <CMD>'
 where CMD can be
-  git:  run the current git version
+  bzr:  run the current bzr version
   gdb:  open the last core dump in gdb
   save: saves relevant information about the last crash
         so that it can be analyzed later
index 78ab4f9acad047b40a99d708f9d0900eb901f124..e207aa684502f890088e80ffd48762ae200a4274 100755 (executable)
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2013 Christian Dywan <christian@twotoasts.de>
+# Copyright (C) 2013-2014 Christian Dywan <christian@twotoasts.de>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -9,27 +9,42 @@
 #
 # See the file COPYING for the full license text.
 
-OLDVER=$(git describe --abbrev=0)
-NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
+OLDVER=$(grep -r --color=no '^set(VERSION' CMakeLists.txt | sed -r "s@.+ ([0-9.]+)\)@\1@")
+NEWVER="$2"
+test -z "$NEWVER" && NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
 if [ "x$1" = "xbefore" ]; then
     echo Bumping from $OLDVER to $NEWVER
-    sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi
-    echo; echo v$NEWVER:; git log --pretty='format: %s' $OLDVER..HEAD | grep -v l10n | grep -v makedist | grep -v tools/release | grep -v nsi | grep -v -E 'Update .+ translation'; echo
+    sed -i "s@$OLDVER@$NEWVER@g" CMakeLists.txt win32/makedist/midori.nsi
+    mv ChangeLog ChangeLog.old || exit 1
+    echo This file is licensed under the terms of the expat license, see the file EXPAT. > ChangeLog
+    echo >> ChangeLog
+    echo v$NEWVER >> ChangeLog
+    bzr log --line -rtag:$OLDVER.. \
+        | sed -r 's@.+20[0-9][0-9]-[0-9]+-[0-9]+ @ @' \
+        | sed 's@\[merge\] @@' \
+        | grep -v -E 'l10n|Revert |makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori|POTFILES.in' \
+        >> ChangeLog
+    tail -n+2 ChangeLog.old >> ChangeLog
+    rm ChangeLog.old
+    curl http://wiki.xfce.org/_export/raw/midori/contribute | \
+        sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \
+        sed -r 's@<code( bash|)>|</code>@@g' > HACKING.new
+    test -s HACKING.new && mv HACKING{.new,} || rm HACKING.new
     curl http://wiki.xfce.org/_export/xhtml/midori/faq | \
         sed 's@This is a list of frequently asked questions@This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a>@g' | \
-        sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html
-elif [ "x$1" = "xafter" ]; then
-    echo -n git commit -m "'Bump version to $NEWVER'"
+        sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html.new
+    test -s data/faq.html.new && mv data/faq.html{.new,} || rm data/faq.html.new
+    echo -n bzr commit -p -m "'Bump version to $NEWVER'"
     case $SHELL in
     *fish*)
         echo -n '; and ' ;;
     *)
         echo -n ' && ' ;;
     esac
-    echo git tag -a $NEWVER -m "'Bump version to $NEWVER'"
+    echo bzr tag $NEWVER
+elif [ "x$1" = "xafter" ]; then
     echo Press RETURN to download tarball now; read yes
-    wget http://git.xfce.org/apps/midori/snapshot/midori-$NEWVER.tar.bz2
-    echo https://releases.xfce.org/
+    wget http://bazaar.launchpad.net/~midori/midori/trunk/tarball
     echo Press RETURN to update Launchpad bugs now; read yes
     if [ -n $(which bugreleaser 1>/dev/null) ]; then
         bugreleaser midori
@@ -37,6 +52,6 @@ elif [ "x$1" = "xafter" ]; then
         echo bzr branch lp:~mgiuca/+junk/launchpad-tools
     fi
 else
-    echo 'Usage: ['$(basename $0)']' 'before|after'
+    echo 'Usage: ['$(basename $0)']' 'before|after' [NEW VERSION]
     exit 1
 fi
diff --git a/waf-modules/wafadmin/3rdparty/boost.py b/waf-modules/wafadmin/3rdparty/boost.py
deleted file mode 100644 (file)
index dca426c..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os.path,glob,types,re,sys
-import Configure,config_c,Options,Utils,Logs
-from Logs import warn,debug
-from Configure import conf
-boost_code='''
-#include <iostream>
-#include <boost/version.hpp>
-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
deleted file mode 100644 (file)
index e61f988..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 281a71f..0000000
+++ /dev/null
@@ -1,676 +0,0 @@
-#! /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']<HEXVERSION:
-                               raise Utils.WafError('Version mismatch! reconfigure the project')
-                       for t in env['tools']:
-                               self.setup(**t)
-               try:
-                       gc.disable()
-                       f=data=None
-                       Node.Nodu=self.node_class
-                       try:
-                               f=open(os.path.join(self.bdir,DBFILE),'rb')
-                       except(IOError,EOFError):
-                               pass
-                       try:
-                               if f:data=cPickle.load(f)
-                       except AttributeError:
-                               if Logs.verbose>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
deleted file mode 100644 (file)
index e2307a0..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index add9349..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 7068644..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 666de6d..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 2b84696..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 8f46274..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 7da9883..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-#! /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)<self.numjobs:
-                               TaskConsumer.consumers.append(TaskConsumer())
-               while not self.stop:
-                       self.refill_task_list()
-                       tsk=self.get_next()
-                       if not tsk:
-                               if self.count:
-                                       continue
-                               else:
-                                       break
-                       if tsk.hasrun:
-                               self.processed+=1
-                               self.manager.add_finished(tsk)
-                               continue
-                       try:
-                               st=tsk.runnable_status()
-                       except Exception,e:
-                               self.processed+=1
-                               if self.stop and not Options.options.keep:
-                                       tsk.hasrun=SKIPPED
-                                       self.manager.add_finished(tsk)
-                                       continue
-                               self.error_handler(tsk)
-                               self.manager.add_finished(tsk)
-                               tsk.hasrun=EXCEPTION
-                               tsk.err_msg=Utils.ex_stack()
-                               continue
-                       if st==ASK_LATER:
-                               self.postpone(tsk)
-                       elif st==SKIP_ME:
-                               self.processed+=1
-                               tsk.hasrun=SKIPPED
-                               self.manager.add_finished(tsk)
-                       else:
-                               tsk.position=(self.processed,self.total)
-                               self.count+=1
-                               tsk.master=self
-                               self.processed+=1
-                               if self.numjobs==1:
-                                       process_task(tsk)
-                               else:
-                                       TaskConsumer.ready.put(tsk)
-                                       if not TaskConsumer.consumers:
-                                               TaskConsumer.consumers=[TaskConsumer()for i in xrange(self.numjobs)]
-               while self.error and self.count:
-                       self.get_out()
-               assert(self.count==0 or self.stop)
-
diff --git a/waf-modules/wafadmin/Scripting.py b/waf-modules/wafadmin/Scripting.py
deleted file mode 100644 (file)
index 4087ba1..0000000
+++ /dev/null
@@ -1,414 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys,shutil,traceback,datetime,inspect,errno
-import Utils,Configure,Build,Logs,Options,Environment,Task
-from Logs import error,warn,info
-from Constants import*
-g_gz='bz2'
-commands=[]
-def prepare_impl(t,cwd,ver,wafdir):
-       Options.tooldir=[t]
-       Options.launch_dir=cwd
-       if'--version'in sys.argv:
-               opt_obj=Options.Handler()
-               opt_obj.curdir=cwd
-               opt_obj.parse_args()
-               sys.exit(0)
-       msg1='Waf: Please run waf from a directory containing a file named "%s" or run distclean'%WSCRIPT_FILE
-       build_dir_override=None
-       candidate=None
-       lst=os.listdir(cwd)
-       search_for_candidate=True
-       if WSCRIPT_FILE in lst:
-               candidate=cwd
-       elif'configure'in sys.argv and not WSCRIPT_BUILD_FILE in lst:
-               calldir=os.path.abspath(os.path.dirname(sys.argv[0]))
-               if WSCRIPT_FILE in os.listdir(calldir):
-                       candidate=calldir
-                       search_for_candidate=False
-               else:
-                       error('arg[0] directory does not contain a wscript file')
-                       sys.exit(1)
-               build_dir_override=cwd
-       while search_for_candidate:
-               if len(cwd)<=3:
-                       break
-               dirlst=os.listdir(cwd)
-               if WSCRIPT_FILE in dirlst:
-                       candidate=cwd
-               if'configure'in sys.argv and candidate:
-                       break
-               if Options.lockfile in dirlst:
-                       env=Environment.Environment()
-                       try:
-                               env.load(os.path.join(cwd,Options.lockfile))
-                       except:
-                               error('could not load %r'%Options.lockfile)
-                       try:
-                               os.stat(env['cwd'])
-                       except:
-                               candidate=cwd
-                       else:
-                               candidate=env['cwd']
-                       break
-               cwd=os.path.dirname(cwd)
-       if not candidate:
-               if'-h'in sys.argv or'--help'in sys.argv:
-                       warn('No wscript file found: the help message may be incomplete')
-                       opt_obj=Options.Handler()
-                       opt_obj.curdir=cwd
-                       opt_obj.parse_args()
-               else:
-                       error(msg1)
-               sys.exit(0)
-       try:
-               os.chdir(candidate)
-       except OSError:
-               raise Utils.WafError("the folder %r is unreadable"%candidate)
-       Utils.set_main_module(os.path.join(candidate,WSCRIPT_FILE))
-       if build_dir_override:
-               d=getattr(Utils.g_module,BLDDIR,None)
-               if d:
-                       msg=' Overriding build directory %s with %s'%(d,build_dir_override)
-                       warn(msg)
-               Utils.g_module.blddir=build_dir_override
-       def set_def(obj,name=''):
-               n=name or obj.__name__
-               if not n in Utils.g_module.__dict__:
-                       setattr(Utils.g_module,n,obj)
-       for k in[dist,distclean,distcheck,clean,install,uninstall]:
-               set_def(k)
-       set_def(Configure.ConfigurationContext,'configure_context')
-       for k in['build','clean','install','uninstall']:
-               set_def(Build.BuildContext,k+'_context')
-       opt_obj=Options.Handler(Utils.g_module)
-       opt_obj.curdir=candidate
-       try:
-               f=Utils.g_module.set_options
-       except AttributeError:
-               pass
-       else:
-               opt_obj.sub_options([''])
-       opt_obj.parse_args()
-       if not'init'in Utils.g_module.__dict__:
-               Utils.g_module.init=Utils.nada
-       if not'shutdown'in Utils.g_module.__dict__:
-               Utils.g_module.shutdown=Utils.nada
-       main()
-def prepare(t,cwd,ver,wafdir):
-       if WAFVERSION!=ver:
-               msg='Version mismatch: waf %s <> wafadmin %s (wafdir %s)'%(ver,WAFVERSION,wafdir)
-               print('\033[91mError: %s\033[0m'%msg)
-               sys.exit(1)
-       try:
-               prepare_impl(t,cwd,ver,wafdir)
-       except Utils.WafError,e:
-               error(str(e))
-               sys.exit(1)
-       except KeyboardInterrupt:
-               Utils.pprint('RED','Interrupted')
-               sys.exit(68)
-def main():
-       global commands
-       commands=Options.arg_line[:]
-       while commands:
-               x=commands.pop(0)
-               ini=datetime.datetime.now()
-               if x=='configure':
-                       fun=configure
-               elif x=='build':
-                       fun=build
-               else:
-                       fun=getattr(Utils.g_module,x,None)
-               if not fun:
-                       raise Utils.WscriptError('No such command %r'%x)
-               ctx=getattr(Utils.g_module,x+'_context',Utils.Context)()
-               if x in['init','shutdown','dist','distclean','distcheck']:
-                       try:
-                               fun(ctx)
-                       except TypeError:
-                               fun()
-               else:
-                       fun(ctx)
-               ela=''
-               if not Options.options.progress_bar:
-                       ela=' (%s)'%Utils.get_elapsed_time(ini)
-               if x!='init'and x!='shutdown':
-                       info('%r finished successfully%s'%(x,ela))
-               if not commands and x!='shutdown':
-                       commands.append('shutdown')
-def configure(conf):
-       src=getattr(Options.options,SRCDIR,None)
-       if not src:src=getattr(Utils.g_module,SRCDIR,None)
-       if not src:src=getattr(Utils.g_module,'top',None)
-       if not src:
-               src='.'
-               incomplete_src=1
-       src=os.path.abspath(src)
-       bld=getattr(Options.options,BLDDIR,None)
-       if not bld:bld=getattr(Utils.g_module,BLDDIR,None)
-       if not bld:bld=getattr(Utils.g_module,'out',None)
-       if not bld:
-               bld='build'
-               incomplete_bld=1
-       if bld=='.':
-               raise Utils.WafError('Setting blddir="." may cause distclean problems')
-       bld=os.path.abspath(bld)
-       try:os.makedirs(bld)
-       except OSError:pass
-       targets=Options.options.compile_targets
-       Options.options.compile_targets=None
-       Options.is_install=False
-       conf.srcdir=src
-       conf.blddir=bld
-       conf.post_init()
-       if'incomplete_src'in vars():
-               conf.check_message_1('Setting srcdir to')
-               conf.check_message_2(src)
-       if'incomplete_bld'in vars():
-               conf.check_message_1('Setting blddir to')
-               conf.check_message_2(bld)
-       conf.sub_config([''])
-       conf.store()
-       env=Environment.Environment()
-       env[BLDDIR]=bld
-       env[SRCDIR]=src
-       env['argv']=sys.argv
-       env['commands']=Options.commands
-       env['options']=Options.options.__dict__
-       env['hash']=conf.hash
-       env['files']=conf.files
-       env['environ']=dict(conf.environ)
-       env['cwd']=os.path.split(Utils.g_module.root_path)[0]
-       if Utils.g_module.root_path!=src:
-               env.store(os.path.join(src,Options.lockfile))
-       env.store(Options.lockfile)
-       Options.options.compile_targets=targets
-def clean(bld):
-       '''removes the build files'''
-       try:
-               proj=Environment.Environment(Options.lockfile)
-       except IOError:
-               raise Utils.WafError('Nothing to clean (project not configured)')
-       bld.load_dirs(proj[SRCDIR],proj[BLDDIR])
-       bld.load_envs()
-       bld.is_install=0
-       bld.add_subdirs([os.path.split(Utils.g_module.root_path)[0]])
-       try:
-               bld.clean()
-       finally:
-               bld.save()
-def check_configured(bld):
-       if not Configure.autoconfig:
-               return bld
-       conf_cls=getattr(Utils.g_module,'configure_context',Utils.Context)
-       bld_cls=getattr(Utils.g_module,'build_context',Utils.Context)
-       def reconf(proj):
-               back=(Options.commands,Options.options.__dict__,Logs.zones,Logs.verbose)
-               Options.commands=proj['commands']
-               Options.options.__dict__=proj['options']
-               conf=conf_cls()
-               conf.environ=proj['environ']
-               configure(conf)
-               (Options.commands,Options.options.__dict__,Logs.zones,Logs.verbose)=back
-       try:
-               proj=Environment.Environment(Options.lockfile)
-       except IOError:
-               conf=conf_cls()
-               configure(conf)
-       else:
-               try:
-                       bld=bld_cls()
-                       bld.load_dirs(proj[SRCDIR],proj[BLDDIR])
-                       bld.load_envs()
-               except Utils.WafError:
-                       reconf(proj)
-                       return bld_cls()
-       try:
-               proj=Environment.Environment(Options.lockfile)
-       except IOError:
-               raise Utils.WafError('Auto-config: project does not configure (bug)')
-       h=0
-       try:
-               for file in proj['files']:
-                       if file.endswith('configure'):
-                               h=hash((h,Utils.readf(file)))
-                       else:
-                               mod=Utils.load_module(file)
-                               h=hash((h,mod.waf_hash_val))
-       except(OSError,IOError):
-               warn('Reconfiguring the project: a file is unavailable')
-               reconf(proj)
-       else:
-               if(h!=proj['hash']):
-                       warn('Reconfiguring the project: the configuration has changed')
-                       reconf(proj)
-       return bld_cls()
-def install(bld):
-       '''installs the build files'''
-       bld=check_configured(bld)
-       Options.commands['install']=True
-       Options.commands['uninstall']=False
-       Options.is_install=True
-       bld.is_install=INSTALL
-       build_impl(bld)
-       bld.install()
-def uninstall(bld):
-       '''removes the installed files'''
-       Options.commands['install']=False
-       Options.commands['uninstall']=True
-       Options.is_install=True
-       bld.is_install=UNINSTALL
-       try:
-               def runnable_status(self):
-                       return SKIP_ME
-               setattr(Task.Task,'runnable_status_back',Task.Task.runnable_status)
-               setattr(Task.Task,'runnable_status',runnable_status)
-               build_impl(bld)
-               bld.install()
-       finally:
-               setattr(Task.Task,'runnable_status',Task.Task.runnable_status_back)
-def build(bld):
-       bld=check_configured(bld)
-       Options.commands['install']=False
-       Options.commands['uninstall']=False
-       Options.is_install=False
-       bld.is_install=0
-       return build_impl(bld)
-def build_impl(bld):
-       try:
-               proj=Environment.Environment(Options.lockfile)
-       except IOError:
-               raise Utils.WafError("Project not configured (run 'waf configure' first)")
-       bld.load_dirs(proj[SRCDIR],proj[BLDDIR])
-       bld.load_envs()
-       info("Waf: Entering directory `%s'"%bld.bldnode.abspath())
-       bld.add_subdirs([os.path.split(Utils.g_module.root_path)[0]])
-       bld.pre_build()
-       try:
-               bld.compile()
-       finally:
-               if Options.options.progress_bar:print('')
-               info("Waf: Leaving directory `%s'"%bld.bldnode.abspath())
-       bld.post_build()
-       bld.install()
-excludes='.bzr .bzrignore .git .gitignore .svn CVS .cvsignore .arch-ids {arch} SCCS BitKeeper .hg _MTN _darcs Makefile Makefile.in config.log .gitattributes .hgignore .hgtags'.split()
-dist_exts='~ .rej .orig .pyc .pyo .bak .tar.bz2 tar.gz .zip .swp'.split()
-def dont_dist(name,src,build_dir):
-       global excludes,dist_exts
-       if(name.startswith(',,')or name.startswith('++')or name.startswith('.waf')or(src=='.'and name==Options.lockfile)or name in excludes or name==build_dir):
-               return True
-       for ext in dist_exts:
-               if name.endswith(ext):
-                       return True
-       return False
-def copytree(src,dst,build_dir):
-       names=os.listdir(src)
-       os.makedirs(dst)
-       for name in names:
-               srcname=os.path.join(src,name)
-               dstname=os.path.join(dst,name)
-               if dont_dist(name,src,build_dir):
-                       continue
-               if os.path.isdir(srcname):
-                       copytree(srcname,dstname,build_dir)
-               else:
-                       shutil.copy2(srcname,dstname)
-def distclean(ctx=None):
-       '''removes the build directory'''
-       global commands
-       lst=os.listdir('.')
-       for f in lst:
-               if f==Options.lockfile:
-                       try:
-                               proj=Environment.Environment(f)
-                       except:
-                               Logs.warn('could not read %r'%f)
-                               continue
-                       try:
-                               shutil.rmtree(proj[BLDDIR])
-                       except IOError:
-                               pass
-                       except OSError,e:
-                               if e.errno!=errno.ENOENT:
-                                       Logs.warn('project %r cannot be removed'%proj[BLDDIR])
-                       try:
-                               os.remove(f)
-                       except OSError,e:
-                               if e.errno!=errno.ENOENT:
-                                       Logs.warn('file %r cannot be removed'%f)
-               if not commands and f.startswith('.waf'):
-                       shutil.rmtree(f,ignore_errors=True)
-def dist(appname='',version=''):
-       '''makes a tarball for redistributing the sources'''
-       import tarfile
-       if not appname:appname=Utils.g_module.APPNAME
-       if not version:version=Utils.g_module.VERSION
-       tmp_folder=appname+'-'+version
-       if g_gz in['gz','bz2']:
-               arch_name=tmp_folder+'.tar.'+g_gz
-       else:
-               arch_name=tmp_folder+'.'+'zip'
-       try:
-               shutil.rmtree(tmp_folder)
-       except(OSError,IOError):
-               pass
-       try:
-               os.remove(arch_name)
-       except(OSError,IOError):
-               pass
-       blddir=getattr(Utils.g_module,BLDDIR,None)
-       if not blddir:
-               blddir=getattr(Utils.g_module,'out',None)
-       copytree('.',tmp_folder,blddir)
-       dist_hook=getattr(Utils.g_module,'dist_hook',None)
-       if dist_hook:
-               back=os.getcwd()
-               os.chdir(tmp_folder)
-               try:
-                       dist_hook()
-               finally:
-                       os.chdir(back)
-       if g_gz in['gz','bz2']:
-               tar=tarfile.open(arch_name,'w:'+g_gz)
-               tar.add(tmp_folder)
-               tar.close()
-       else:
-               Utils.zip_folder(tmp_folder,arch_name,tmp_folder)
-       try:from hashlib import sha1 as sha
-       except ImportError:from sha import sha
-       try:
-               digest=" (sha=%r)"%sha(Utils.readf(arch_name)).hexdigest()
-       except:
-               digest=''
-       info('New archive created: %s%s'%(arch_name,digest))
-       if os.path.exists(tmp_folder):shutil.rmtree(tmp_folder)
-       return arch_name
-def distcheck(appname='',version='',subdir=''):
-       '''checks if the sources compile (tarball from 'dist')'''
-       import tempfile,tarfile
-       if not appname:appname=Utils.g_module.APPNAME
-       if not version:version=Utils.g_module.VERSION
-       waf=os.path.abspath(sys.argv[0])
-       tarball=dist(appname,version)
-       path=appname+'-'+version
-       if os.path.exists(path):
-               shutil.rmtree(path)
-       t=tarfile.open(tarball)
-       for x in t:t.extract(x)
-       t.close()
-       if subdir:
-               build_path=os.path.join(path,subdir)
-       else:
-               build_path=path
-       instdir=tempfile.mkdtemp('.inst','%s-%s'%(appname,version))
-       ret=Utils.pproc.Popen([waf,'configure','build','install','uninstall','--destdir='+instdir],cwd=build_path).wait()
-       if ret:
-               raise Utils.WafError('distcheck failed with code %i'%ret)
-       if os.path.exists(instdir):
-               raise Utils.WafError('distcheck succeeded, but files were left in %s'%instdir)
-       shutil.rmtree(path)
-def add_subdir(dir,bld):
-       bld.recurse(dir,'build')
-
diff --git a/waf-modules/wafadmin/Task.py b/waf-modules/wafadmin/Task.py
deleted file mode 100644 (file)
index 3ce229d..0000000
+++ /dev/null
@@ -1,780 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-import sys
-if sys.hexversion < 0x020400f0: from sets import Set as set
-import os,shutil,sys,re,random,datetime,tempfile,shlex
-from Utils import md5
-import Build,Runner,Utils,Node,Logs,Options
-from Logs import debug,warn,error
-from Constants import*
-algotype=NORMAL
-COMPILE_TEMPLATE_SHELL='''
-def f(task):
-       env = task.env
-       wd = getattr(task, 'cwd', None)
-       p = env.get_flat
-       cmd = \'\'\' %s \'\'\' % s
-       return task.exec_command(cmd, cwd=wd)
-'''
-COMPILE_TEMPLATE_NOSHELL='''
-def f(task):
-       env = task.env
-       wd = getattr(task, 'cwd', None)
-       def to_list(xx):
-               if isinstance(xx, str): return [xx]
-               return xx
-       lst = []
-       %s
-       lst = [x for x in lst if x]
-       return task.exec_command(lst, cwd=wd)
-'''
-file_deps=Utils.nada
-class TaskManager(object):
-       def __init__(self):
-               self.groups=[]
-               self.tasks_done=[]
-               self.current_group=0
-               self.groups_names={}
-       def group_name(self,g):
-               if not isinstance(g,TaskGroup):
-                       g=self.groups[g]
-               for x in self.groups_names:
-                       if id(self.groups_names[x])==id(g):
-                               return x
-               return''
-       def group_idx(self,tg):
-               se=id(tg)
-               for i in range(len(self.groups)):
-                       g=self.groups[i]
-                       for t in g.tasks_gen:
-                               if id(t)==se:
-                                       return i
-               return None
-       def get_next_set(self):
-               ret=None
-               while not ret and self.current_group<len(self.groups):
-                       ret=self.groups[self.current_group].get_next_set()
-                       if ret:return ret
-                       else:
-                               self.groups[self.current_group].process_install()
-                               self.current_group+=1
-               return(None,None)
-       def add_group(self,name=None,set=True):
-               g=TaskGroup()
-               if name and name in self.groups_names:
-                       error('add_group: name %s already present'%name)
-               self.groups_names[name]=g
-               self.groups.append(g)
-               if set:
-                       self.current_group=len(self.groups)-1
-       def set_group(self,idx):
-               if isinstance(idx,str):
-                       g=self.groups_names[idx]
-                       for x in xrange(len(self.groups)):
-                               if id(g)==id(self.groups[x]):
-                                       self.current_group=x
-               else:
-                       self.current_group=idx
-       def add_task_gen(self,tgen):
-               if not self.groups:self.add_group()
-               self.groups[self.current_group].tasks_gen.append(tgen)
-       def add_task(self,task):
-               if not self.groups:self.add_group()
-               self.groups[self.current_group].tasks.append(task)
-       def total(self):
-               total=0
-               if not self.groups:return 0
-               for group in self.groups:
-                       total+=len(group.tasks)
-               return total
-       def add_finished(self,tsk):
-               self.tasks_done.append(tsk)
-               bld=tsk.generator.bld
-               if bld.is_install:
-                       f=None
-                       if'install'in tsk.__dict__:
-                               f=tsk.__dict__['install']
-                               if f:f(tsk)
-                       else:
-                               tsk.install()
-class TaskGroup(object):
-       def __init__(self):
-               self.tasks=[]
-               self.tasks_gen=[]
-               self.cstr_groups=Utils.DefaultDict(list)
-               self.cstr_order=Utils.DefaultDict(set)
-               self.temp_tasks=[]
-               self.ready=0
-               self.post_funs=[]
-       def reset(self):
-               for x in self.cstr_groups:
-                       self.tasks+=self.cstr_groups[x]
-               self.tasks=self.temp_tasks+self.tasks
-               self.temp_tasks=[]
-               self.cstr_groups=Utils.DefaultDict(list)
-               self.cstr_order=Utils.DefaultDict(set)
-               self.ready=0
-       def process_install(self):
-               for(f,k,kw)in self.post_funs:
-                       f(*k,**kw)
-       def prepare(self):
-               self.ready=1
-               file_deps(self.tasks)
-               self.make_cstr_groups()
-               self.extract_constraints()
-       def get_next_set(self):
-               global algotype
-               if algotype==NORMAL:
-                       tasks=self.tasks_in_parallel()
-                       maxj=MAXJOBS
-               elif algotype==JOBCONTROL:
-                       (maxj,tasks)=self.tasks_by_max_jobs()
-               elif algotype==MAXPARALLEL:
-                       tasks=self.tasks_with_inner_constraints()
-                       maxj=MAXJOBS
-               else:
-                       raise Utils.WafError("unknown algorithm type %s"%(algotype))
-               if not tasks:return()
-               return(maxj,tasks)
-       def make_cstr_groups(self):
-               self.cstr_groups=Utils.DefaultDict(list)
-               for x in self.tasks:
-                       h=x.hash_constraints()
-                       self.cstr_groups[h].append(x)
-       def set_order(self,a,b):
-               self.cstr_order[a].add(b)
-       def compare_exts(self,t1,t2):
-               x="ext_in"
-               y="ext_out"
-               in_=t1.attr(x,())
-               out_=t2.attr(y,())
-               for k in in_:
-                       if k in out_:
-                               return-1
-               in_=t2.attr(x,())
-               out_=t1.attr(y,())
-               for k in in_:
-                       if k in out_:
-                               return 1
-               return 0
-       def compare_partial(self,t1,t2):
-               m="after"
-               n="before"
-               name=t2.__class__.__name__
-               if name in Utils.to_list(t1.attr(m,())):return-1
-               elif name in Utils.to_list(t1.attr(n,())):return 1
-               name=t1.__class__.__name__
-               if name in Utils.to_list(t2.attr(m,())):return 1
-               elif name in Utils.to_list(t2.attr(n,())):return-1
-               return 0
-       def extract_constraints(self):
-               keys=self.cstr_groups.keys()
-               max=len(keys)
-               for i in xrange(max):
-                       t1=self.cstr_groups[keys[i]][0]
-                       for j in xrange(i+1,max):
-                               t2=self.cstr_groups[keys[j]][0]
-                               val=(self.compare_exts(t1,t2)or self.compare_partial(t1,t2))
-                               if val>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<maxjobs:
-                               remaining+=ret
-                               ret=[t]
-                               maxjobs=m
-                       else:
-                               ret.append(t)
-               self.temp_tasks=remaining
-               return(maxjobs,ret)
-       def tasks_with_inner_constraints(self):
-               if not self.ready:self.prepare()
-               if getattr(self,"done",None):return None
-               for p in self.cstr_order:
-                       for v in self.cstr_order[p]:
-                               for m in self.cstr_groups[p]:
-                                       for n in self.cstr_groups[v]:
-                                               n.set_run_after(m)
-               self.cstr_order=Utils.DefaultDict(set)
-               self.cstr_groups=Utils.DefaultDict(list)
-               self.done=1
-               return self.tasks[:]
-class store_task_type(type):
-       def __init__(cls,name,bases,dict):
-               super(store_task_type,cls).__init__(name,bases,dict)
-               name=cls.__name__
-               if name.endswith('_task'):
-                       name=name.replace('_task','')
-               if name!='TaskBase':
-                       TaskBase.classes[name]=cls
-class TaskBase(object):
-       __metaclass__=store_task_type
-       color="GREEN"
-       maxjobs=MAXJOBS
-       classes={}
-       stat=None
-       def __init__(self,*k,**kw):
-               self.hasrun=NOT_RUN
-               try:
-                       self.generator=kw['generator']
-               except KeyError:
-                       self.generator=self
-                       self.bld=Build.bld
-               if kw.get('normal',1):
-                       self.generator.bld.task_manager.add_task(self)
-       def __repr__(self):
-               return'\n\t{task: %s %s}'%(self.__class__.__name__,str(getattr(self,"fun","")))
-       def __str__(self):
-               if hasattr(self,'fun'):
-                       return'executing: %s\n'%self.fun.__name__
-               return self.__class__.__name__+'\n'
-       def exec_command(self,*k,**kw):
-               if self.env['env']:
-                       kw['env']=self.env['env']
-               return self.generator.bld.exec_command(*k,**kw)
-       def runnable_status(self):
-               return RUN_ME
-       def can_retrieve_cache(self):
-               return False
-       def call_run(self):
-               if self.can_retrieve_cache():
-                       return 0
-               return self.run()
-       def run(self):
-               if hasattr(self,'fun'):
-                       return self.fun(self)
-               return 0
-       def post_run(self):
-               pass
-       def display(self):
-               col1=Logs.colors(self.color)
-               col2=Logs.colors.NORMAL
-               if Options.options.progress_bar==1:
-                       return self.generator.bld.progress_line(self.position[0],self.position[1],col1,col2)
-               if Options.options.progress_bar==2:
-                       ela=Utils.get_elapsed_time(self.generator.bld.ini)
-                       try:
-                               ins=','.join([n.name for n in self.inputs])
-                       except AttributeError:
-                               ins=''
-                       try:
-                               outs=','.join([n.name for n in self.outputs])
-                       except AttributeError:
-                               outs=''
-                       return'|Total %s|Current %s|Inputs %s|Outputs %s|Time %s|\n'%(self.position[1],self.position[0],ins,outs,ela)
-               total=self.position[1]
-               n=len(str(total))
-               fs='[%%%dd/%%%dd] %%s%%s%%s'%(n,n)
-               return fs%(self.position[0],self.position[1],col1,str(self),col2)
-       def attr(self,att,default=None):
-               ret=getattr(self,att,self)
-               if ret is self:return getattr(self.__class__,att,default)
-               return ret
-       def hash_constraints(self):
-               a=self.attr
-               sum=hash((self.__class__.__name__,str(a('before','')),str(a('after','')),str(a('ext_in','')),str(a('ext_out','')),self.__class__.maxjobs))
-               return sum
-       def format_error(self):
-               if getattr(self,"err_msg",None):
-                       return self.err_msg
-               elif self.hasrun==CRASHED:
-                       try:
-                               return" -> 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<backslash>\\)|(?P<dollar>\$\$)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})",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
deleted file mode 100644 (file)
index 6b22fdf..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-#! /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("<task_gen '%s' of type %s defined in %s>"%(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
deleted file mode 100644 (file)
index cbc8406..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-
diff --git a/waf-modules/wafadmin/Tools/ar.py b/waf-modules/wafadmin/Tools/ar.py
deleted file mode 100644 (file)
index 80617cc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index a7a1698..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index c23bbd0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index c65499a..0000000
+++ /dev/null
@@ -1,397 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index d8eb20c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 6f1fef6..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 5f0a04f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 4aee3e3..0000000
+++ /dev/null
@@ -1,532 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 0773120..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index c2b49f3..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 36250ab..0000000
+++ /dev/null
@@ -1,368 +0,0 @@
-#! /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 i<max:
-               c=txt[i]
-               if c=='"'or c=="'":
-                       buf.append(txt[begin:i])
-                       delim=c
-                       i+=1
-                       while i<max:
-                               c=txt[i]
-                               if c==delim:break
-                               elif c=='\\':
-                                       i+=1
-                               i+=1
-                       i+=1
-                       begin=i
-               elif c=='/':
-                       buf.append(txt[begin:i])
-                       i+=1
-                       if i==max:break
-                       c=txt[i]
-                       if c=='+':
-                               i+=1
-                               nesting=1
-                               c=None
-                               while i<max:
-                                       prev=c
-                                       c=txt[i]
-                                       if prev=='/'and c=='+':
-                                               nesting+=1
-                                               c=None
-                                       elif prev=='+'and c=='/':
-                                               nesting-=1
-                                               if nesting==0:break
-                                               c=None
-                                       i+=1
-                       elif c=='*':
-                               i+=1
-                               c=None
-                               while i<max:
-                                       prev=c
-                                       c=txt[i]
-                                       if prev=='*'and c=='/':break
-                                       i+=1
-                       elif c=='/':
-                               i+=1
-                               while i<max and txt[i]!='\n':
-                                       i+=1
-                       else:
-                               begin=i-1
-                               continue
-                       i+=1
-                       begin=i
-                       buf.append(' ')
-               else:
-                       i+=1
-       buf.append(txt[begin:])
-       return buf
-class d_parser(object):
-       def __init__(self,env,incpaths):
-               self.allnames=[]
-               self.re_module=re.compile("module\s+([^;]+)")
-               self.re_import=re.compile("import\s+([^;]+)")
-               self.re_import_bindings=re.compile("([^:]+):(.*)")
-               self.re_import_alias=re.compile("[^=]+=(.+)")
-               self.env=env
-               self.nodes=[]
-               self.names=[]
-               self.incpaths=incpaths
-       def tryfind(self,filename):
-               found=0
-               for n in self.incpaths:
-                       found=n.find_resource(filename.replace('.','/')+'.d')
-                       if found:
-                               self.nodes.append(found)
-                               self.waiting.append(found)
-                               break
-               if not found:
-                       if not filename in self.names:
-                               self.names.append(filename)
-       def get_strings(self,code):
-               self.module=''
-               lst=[]
-               mod_name=self.re_module.search(code)
-               if mod_name:
-                       self.module=re.sub('\s+','',mod_name.group(1))
-               import_iterator=self.re_import.finditer(code)
-               if import_iterator:
-                       for import_match in import_iterator:
-                               import_match_str=re.sub('\s+','',import_match.group(1))
-                               bindings_match=self.re_import_bindings.match(import_match_str)
-                               if bindings_match:
-                                       import_match_str=bindings_match.group(1)
-                               matches=import_match_str.split(',')
-                               for match in matches:
-                                       alias_match=self.re_import_alias.match(match)
-                                       if alias_match:
-                                               match=alias_match.group(1)
-                                       lst.append(match)
-               return lst
-       def start(self,node):
-               self.waiting=[node]
-               while self.waiting:
-                       nd=self.waiting.pop(0)
-                       self.iter(nd)
-       def iter(self,node):
-               path=node.abspath(self.env)
-               code="".join(filter_comments(path))
-               names=self.get_strings(code)
-               for x in names:
-                       if x in self.allnames:continue
-                       self.allnames.append(x)
-                       self.tryfind(x)
-def scan(self):
-       env=self.env
-       gruik=d_parser(env,env['INC_PATHS'])
-       gruik.start(self.inputs[0])
-       if Logs.verbose:
-               debug('deps: nodes found for %s: %s %s'%(str(self.inputs[0]),str(gruik.nodes),str(gruik.names)))
-       return(gruik.nodes,gruik.names)
-def get_target_name(self):
-       v=self.env
-       tp='program'
-       for x in self.features:
-               if x in['dshlib','dstaticlib']:
-                       tp=x.lstrip('d')
-       return v['D_%s_PATTERN'%tp]%self.target
-d_params={'dflags':'','importpaths':'','libs':'','libpaths':'','generate_headers':False,}
-def init_d(self):
-       for x in d_params:
-               setattr(self,x,getattr(self,x,d_params[x]))
-class d_taskgen(TaskGen.task_gen):
-       def __init__(self,*k,**kw):
-               TaskGen.task_gen.__init__(self,*k,**kw)
-               if len(k)>1:
-                       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
deleted file mode 100644 (file)
index 449bdc0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 69cb8f4..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 0a1600b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index c977bee..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 2a685f7..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 72ed66c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index d9574c8..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 7b6c94e..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-#! /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('<refentrytitle>(.*)</refentrytitle>',re.M)
-n2_regexp=re.compile('<manvolnum>(.*)</manvolnum>',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
deleted file mode 100644 (file)
index daa9415..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /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<len(_options)+1:
-               iter+=1
-               complete=True
-               for name,help,default in _options:
-                       name=name.upper()
-                       if not env[name]:
-                               try:
-                                       env[name]=Utils.subst_vars(get_param(name,default),env)
-                               except TypeError:
-                                       complete=False
-       if not complete:
-               lst=[name for name,_,_ in _options if not env[name.upper()]]
-               raise Utils.WafError('Variable substitution failure %r'%lst)
-def set_options(opt):
-       inst_dir=opt.add_option_group('Installation directories','By default, "waf install" will put the files in\
- "/usr/local/bin", "/usr/local/lib" etc. An installation prefix other\
- than "/usr/local" can be given using "--prefix", for example "--prefix=$HOME"')
-       for k in('--prefix','--destdir'):
-               option=opt.parser.get_option(k)
-               if option:
-                       opt.parser.remove_option(k)
-                       inst_dir.add_option(option)
-       inst_dir.add_option('--exec-prefix',help='installation prefix [Default: ${PREFIX}]',default='',dest='EXEC_PREFIX')
-       dirs_options=opt.add_option_group('Pre-defined installation directories','')
-       for name,help,default in _options:
-               option_name='--'+name
-               str_default=default
-               str_help='%s [Default: %s]'%(help,str_default)
-               dirs_options.add_option(option_name,help=str_help,default='',dest=name.upper())
-
diff --git a/waf-modules/wafadmin/Tools/gob2.py b/waf-modules/wafadmin/Tools/gob2.py
deleted file mode 100644 (file)
index 8cced82..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import TaskGen
-TaskGen.declare_chain(name='gob2',rule='${GOB2} -o ${TGT[0].bld_dir(env)} ${GOB2FLAGS} ${SRC}',ext_in='.gob',ext_out='.c')
-def detect(conf):
-       gob2=conf.find_program('gob2',var='GOB2',mandatory=True)
-       conf.env['GOB2']=gob2
-       conf.env['GOB2FLAGS']=''
-
diff --git a/waf-modules/wafadmin/Tools/gxx.py b/waf-modules/wafadmin/Tools/gxx.py
deleted file mode 100644 (file)
index 8ec5e92..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys
-import Configure,Options,Utils
-import ccroot,ar
-from Configure import conftest
-def find_gxx(conf):
-       cxx=conf.find_program(['g++','c++'],var='CXX',mandatory=True)
-       cxx=conf.cmd_to_list(cxx)
-       ccroot.get_cc_version(conf,cxx,gcc=True)
-       conf.env.CXX_NAME='gcc'
-       conf.env.CXX=cxx
-def gxx_common_flags(conf):
-       v=conf.env
-       v['CXXFLAGS_DEBUG']=['-g']
-       v['CXXFLAGS_RELEASE']=['-O2']
-       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['RPATH_ST']='-Wl,-rpath,%s'
-       v['CXXDEFINES_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_CXXFLAGS']=['-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 gxx_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_CXXFLAGS']=[]
-       v.append_value('shlib_CXXFLAGS','-DDLL_EXPORT')
-       v.append_value('LINKFLAGS','-Wl,--enable-auto-import')
-def gxx_modifier_cygwin(conf):
-       gxx_modifier_win32(conf)
-       v=conf.env
-       v['shlib_PATTERN']='cyg%s.dll'
-       v.append_value('shlib_LINKFLAGS','-Wl,--enable-auto-image-base')
-def gxx_modifier_darwin(conf):
-       v=conf.env
-       v['shlib_CXXFLAGS']=['-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 gxx_modifier_aix(conf):
-       v=conf.env
-       v['program_LINKFLAGS']=['-Wl,-brtl']
-       v['shlib_LINKFLAGS']=['-shared','-Wl,-brtl,-bexpfull']
-       v['SHLIB_MARKER']=''
-def gxx_modifier_platform(conf):
-       dest_os=conf.env['DEST_OS']or Utils.unversioned_sys_platform()
-       gxx_modifier_func=globals().get('gxx_modifier_'+dest_os)
-       if gxx_modifier_func:
-               gxx_modifier_func(conf)
-def detect(conf):
-       conf.find_gxx()
-       conf.find_cpp()
-       conf.find_ar()
-       conf.gxx_common_flags()
-       conf.gxx_modifier_platform()
-       conf.cxx_load_tools()
-       conf.cxx_add_flags()
-       conf.link_add_flags()
-
-conftest(find_gxx)
-conftest(gxx_common_flags)
-conftest(gxx_modifier_win32)
-conftest(gxx_modifier_cygwin)
-conftest(gxx_modifier_darwin)
-conftest(gxx_modifier_aix)
-conftest(gxx_modifier_platform)
diff --git a/waf-modules/wafadmin/Tools/icc.py b/waf-modules/wafadmin/Tools/icc.py
deleted file mode 100644 (file)
index 12a0125..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys
-import Configure,Options,Utils
-import ccroot,ar,gcc
-from Configure import conftest
-def find_icc(conf):
-       if sys.platform=='cygwin':
-               conf.fatal('The Intel compiler does not work on Cygwin')
-       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('icc',var='CC')
-       if not cc:cc=conf.find_program('ICL',var='CC')
-       if not cc:conf.fatal('Intel C Compiler (icc) was not found')
-       cc=conf.cmd_to_list(cc)
-       ccroot.get_cc_version(conf,cc,icc=True)
-       v['CC']=cc
-       v['CC_NAME']='icc'
-detect='''
-find_icc
-find_ar
-gcc_common_flags
-gcc_modifier_platform
-cc_load_tools
-cc_add_flags
-link_add_flags
-'''
-
-conftest(find_icc)
diff --git a/waf-modules/wafadmin/Tools/icpc.py b/waf-modules/wafadmin/Tools/icpc.py
deleted file mode 100644 (file)
index f2ad8c6..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys
-import Configure,Options,Utils
-import ccroot,ar,gxx
-from Configure import conftest
-def find_icpc(conf):
-       if sys.platform=='cygwin':
-               conf.fatal('The Intel compiler does not work on Cygwin')
-       v=conf.env
-       cxx=None
-       if v['CXX']:cxx=v['CXX']
-       elif'CXX'in conf.environ:cxx=conf.environ['CXX']
-       if not cxx:cxx=conf.find_program('icpc',var='CXX')
-       if not cxx:conf.fatal('Intel C++ Compiler (icpc) was not found')
-       cxx=conf.cmd_to_list(cxx)
-       ccroot.get_cc_version(conf,cxx,icc=True)
-       v['CXX']=cxx
-       v['CXX_NAME']='icc'
-detect='''
-find_icpc
-find_ar
-gxx_common_flags
-gxx_modifier_platform
-cxx_load_tools
-cxx_add_flags
-link_add_flags
-'''
-
-conftest(find_icpc)
diff --git a/waf-modules/wafadmin/Tools/intltool.py b/waf-modules/wafadmin/Tools/intltool.py
deleted file mode 100644 (file)
index 3f374b9..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,re
-import Configure,TaskGen,Task,Utils,Runner,Options,Build,config_c
-from TaskGen import feature,before,taskgen
-from Logs import error
-class intltool_in_taskgen(TaskGen.task_gen):
-       def __init__(self,*k,**kw):
-               TaskGen.task_gen.__init__(self,*k,**kw)
-def iapply_intltool_in_f(self):
-       try:self.meths.remove('apply_core')
-       except ValueError:pass
-       for i in self.to_list(self.source):
-               node=self.path.find_resource(i)
-               podir=getattr(self,'podir','po')
-               podirnode=self.path.find_dir(podir)
-               if not podirnode:
-                       error("could not find the podir %r"%podir)
-                       continue
-               cache=getattr(self,'intlcache','.intlcache')
-               self.env['INTLCACHE']=os.path.join(self.path.bldpath(self.env),podir,cache)
-               self.env['INTLPODIR']=podirnode.srcpath(self.env)
-               self.env['INTLFLAGS']=getattr(self,'flags',['-q','-u','-c'])
-               task=self.create_task('intltool',node,node.change_ext(''))
-               task.install_path=self.install_path
-class intltool_po_taskgen(TaskGen.task_gen):
-       def __init__(self,*k,**kw):
-               TaskGen.task_gen.__init__(self,*k,**kw)
-def apply_intltool_po(self):
-       try:self.meths.remove('apply_core')
-       except ValueError:pass
-       self.default_install_path='${LOCALEDIR}'
-       appname=getattr(self,'appname','set_your_app_name')
-       podir=getattr(self,'podir','')
-       def install_translation(task):
-               out=task.outputs[0]
-               filename=out.name
-               (langname,ext)=os.path.splitext(filename)
-               inst_file=langname+os.sep+'LC_MESSAGES'+os.sep+appname+'.mo'
-               self.bld.install_as(os.path.join(self.install_path,inst_file),out,self.env,self.chmod)
-       linguas=self.path.find_resource(os.path.join(podir,'LINGUAS'))
-       if linguas:
-               file=open(linguas.abspath())
-               langs=[]
-               for line in file.readlines():
-                       if not line.startswith('#'):
-                               langs+=line.split()
-               file.close()
-               re_linguas=re.compile('[-a-zA-Z_@.]+')
-               for lang in langs:
-                       if re_linguas.match(lang):
-                               node=self.path.find_resource(os.path.join(podir,re_linguas.match(lang).group()+'.po'))
-                               task=self.create_task('po')
-                               task.set_inputs(node)
-                               task.set_outputs(node.change_ext('.mo'))
-                               if self.bld.is_install:task.install=install_translation
-       else:
-               Utils.pprint('RED',"Error no LINGUAS file found in po directory")
-Task.simple_task_type('po','${POCOM} -o ${TGT} ${SRC}',color='BLUE',shell=False)
-Task.simple_task_type('intltool','${INTLTOOL} ${INTLFLAGS} ${INTLCACHE} ${INTLPODIR} ${SRC} ${TGT}',color='BLUE',after="cc_link cxx_link",shell=False)
-def detect(conf):
-       pocom=conf.find_program('msgfmt')
-       if not pocom:
-               conf.fatal('The program msgfmt (gettext) is mandatory!')
-       conf.env['POCOM']=pocom
-       intltool=conf.find_program('intltool-merge',var='INTLTOOL')
-       if not intltool:
-               if Options.platform=='win32':
-                       perl=conf.find_program('perl',var='PERL')
-                       if not perl:
-                               conf.fatal('The program perl (required by intltool) could not be found')
-                       intltooldir=Configure.find_file('intltool-merge',os.environ['PATH'].split(os.pathsep))
-                       if not intltooldir:
-                               conf.fatal('The program intltool-merge (intltool, gettext-devel) is mandatory!')
-                       conf.env['INTLTOOL']=Utils.to_list(conf.env['PERL'])+[intltooldir+os.sep+'intltool-merge']
-                       conf.check_message('intltool','',True,' '.join(conf.env['INTLTOOL']))
-               else:
-                       conf.fatal('The program intltool-merge (intltool, gettext-devel) is mandatory!')
-       def getstr(varname):
-               return getattr(Options.options,varname,'')
-       prefix=conf.env['PREFIX']
-       datadir=getstr('datadir')
-       if not datadir:datadir=os.path.join(prefix,'share')
-       conf.define('LOCALEDIR',os.path.join(datadir,'locale'))
-       conf.define('DATADIR',datadir)
-       if conf.env['CC']or conf.env['CXX']:
-               conf.check(header_name='locale.h')
-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('--datadir',type='string',default='',dest='datadir',help='read-only application data')
-
-before('apply_core')(iapply_intltool_in_f)
-feature('intltool_in')(iapply_intltool_in_f)
-feature('intltool_po')(apply_intltool_po)
diff --git a/waf-modules/wafadmin/Tools/javaw.py b/waf-modules/wafadmin/Tools/javaw.py
deleted file mode 100644 (file)
index c45fc9e..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-import sys
-if sys.hexversion < 0x020400f0: from sets import Set as set
-import os,re
-from Configure import conf
-import TaskGen,Task,Utils,Options,Build
-from TaskGen import feature,before,taskgen
-class_check_source='''
-public class Test {
-       public static void main(String[] argv) {
-               Class lib;
-               if (argv.length < 1) {
-                       System.err.println("Missing argument");
-                       System.exit(77);
-               }
-               try {
-                       lib = Class.forName(argv[0]);
-               } catch (ClassNotFoundException e) {
-                       System.err.println("ClassNotFoundException");
-                       System.exit(1);
-               }
-               lib = null;
-               System.exit(0);
-       }
-}
-'''
-def jar_files(self):
-       basedir=getattr(self,'basedir','.')
-       destfile=getattr(self,'destfile','test.jar')
-       jaropts=getattr(self,'jaropts',[])
-       jarcreate=getattr(self,'jarcreate','cf')
-       dir=self.path.find_dir(basedir)
-       if not dir:raise
-       jaropts.append('-C')
-       jaropts.append(dir.abspath(self.env))
-       jaropts.append('.')
-       out=self.path.find_or_declare(destfile)
-       tsk=self.create_task('jar_create')
-       tsk.set_outputs(out)
-       tsk.inputs=[x for x in dir.find_iter(src=0,bld=1)if x.id!=out.id]
-       tsk.env['JAROPTS']=jaropts
-       tsk.env['JARCREATE']=jarcreate
-def apply_java(self):
-       Utils.def_attrs(self,jarname='',jaropts='',classpath='',sourcepath='.',srcdir='.',source_re='**/*.java',jar_mf_attributes={},jar_mf_classpath=[])
-       if getattr(self,'source_root',None):
-               self.srcdir=self.source_root
-       nodes_lst=[]
-       if not self.classpath:
-               if not self.env['CLASSPATH']:
-                       self.env['CLASSPATH']='..'+os.pathsep+'.'
-       else:
-               self.env['CLASSPATH']=self.classpath
-       srcdir_node=self.path.find_dir(self.srcdir)
-       if not srcdir_node:
-               raise Utils.WafError('could not find srcdir %r'%self.srcdir)
-       src_nodes=[x for x in srcdir_node.ant_glob(self.source_re,flat=False)]
-       bld_nodes=[x.change_ext('.class')for x in src_nodes]
-       self.env['OUTDIR']=[srcdir_node.bldpath(self.env)]
-       tsk=self.create_task('javac')
-       tsk.set_inputs(src_nodes)
-       tsk.set_outputs(bld_nodes)
-       if getattr(self,'compat',None):
-               tsk.env.append_value('JAVACFLAGS',['-source',self.compat])
-       if hasattr(self,'sourcepath'):
-               fold=[self.path.find_dir(x)for x in self.to_list(self.sourcepath)]
-               names=os.pathsep.join([x.srcpath()for x in fold])
-       else:
-               names=srcdir_node.srcpath()
-       if names:
-               tsk.env.append_value('JAVACFLAGS',['-sourcepath',names])
-       if self.jarname:
-               jtsk=self.create_task('jar_create',bld_nodes,self.path.find_or_declare(self.jarname))
-               jtsk.set_run_after(tsk)
-               if not self.env.JAROPTS:
-                       if self.jaropts:
-                               self.env.JAROPTS=self.jaropts
-                       else:
-                               dirs='.'
-                               self.env.JAROPTS=['-C',''.join(self.env['OUTDIR']),dirs]
-Task.simple_task_type('jar_create','${JAR} ${JARCREATE} ${TGT} ${JAROPTS}',color='GREEN',shell=False)
-cls=Task.simple_task_type('javac','${JAVAC} -classpath ${CLASSPATH} -d ${OUTDIR} ${JAVACFLAGS} ${SRC}',shell=False)
-cls.color='BLUE'
-def post_run_javac(self):
-       par={}
-       for x in self.inputs:
-               par[x.parent.id]=x.parent
-       inner={}
-       for k in par.values():
-               path=k.abspath(self.env)
-               lst=os.listdir(path)
-               for u in lst:
-                       if u.find('$')>=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
deleted file mode 100644 (file)
index 5993f8e..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 50b28ce..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 459dc76..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 8851fb8..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 67cd939..0000000
+++ /dev/null
@@ -1,586 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 04dd345..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index b3dcd3a..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 37cbaf6..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-#! /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='''
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleGetInfoString</key>
-       <string>Created by Waf</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>NOTE</key>
-       <string>THIS IS A GENERATED FILE, DO NOT MODIFY</string>
-       <key>CFBundleExecutable</key>
-       <string>%s</string>
-</dict>
-</plist>
-'''
-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
deleted file mode 100644 (file)
index f922336..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /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<minver:
-                       conf.fatal('perl is too old')
-               cver='.'.join(map(str,minver))
-       conf.check_message('perl',cver,True,version)
-def check_perl_module(conf,module):
-       cmd=[conf.env['PERL'],'-e','use %s'%module]
-       r=Utils.pproc.call(cmd,stdout=Utils.pproc.PIPE,stderr=Utils.pproc.PIPE)==0
-       conf.check_message("perl module %s"%module,"",r)
-       return r
-def check_perl_ext_devel(conf):
-       if not conf.env.PERL:
-               conf.fatal('perl detection is required first')
-       def read_out(cmd):
-               return Utils.to_list(Utils.cmd_output([conf.env.PERL,'-MConfig','-e',cmd]))
-       conf.env.LINKFLAGS_PERLEXT=read_out('print $Config{lddlflags}')
-       conf.env.CPPPATH_PERLEXT=read_out('print "$Config{archlib}/CORE"')
-       conf.env.CCFLAGS_PERLEXT=read_out('print "$Config{ccflags} $Config{cccdlflags}"')
-       conf.env.XSUBPP=read_out('print "$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}"')
-       conf.env.EXTUTILS_TYPEMAP=read_out('print "$Config{privlib}/ExtUtils/typemap"')
-       conf.env.perlext_PATTERN='%s.'+read_out('print $Config{dlext}')[0]
-       if getattr(Options.options,'perlarchdir',None):
-               conf.env.ARCHDIR_PERL=Options.options.perlarchdir
-       else:
-               conf.env.ARCHDIR_PERL=read_out('print $Config{sitearch}')[0]
-def set_options(opt):
-       opt.add_option("--with-perl-binary",type="string",dest="perlbinary",help='Specify alternate perl binary',default=None)
-       opt.add_option("--with-perl-archdir",type="string",dest="perlarchdir",help='Specify directory where to install arch specific files',default=None)
-
-before('apply_incpaths','apply_type_vars','apply_lib_vars')(init_perlext)
-feature('perlext')(init_perlext)
-extension(EXT_XS)(xsubpp_file)
-conf(check_perl_version)
-conf(check_perl_module)
-conf(check_perl_ext_devel)
diff --git a/waf-modules/wafadmin/Tools/preproc.py b/waf-modules/wafadmin/Tools/preproc.py
deleted file mode 100644 (file)
index 65c6de6..0000000
+++ /dev/null
@@ -1,616 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-import sys
-if sys.hexversion < 0x020400f0: from sets import Set as set
-import re,sys,os,string
-import Logs,Build,Utils
-from Logs import debug,error
-import traceback
-class PreprocError(Utils.WafError):
-       pass
-POPFILE='-'
-recursion_limit=5000
-go_absolute=0
-standard_includes=['/usr/include']
-if sys.platform=="win32":
-       standard_includes=[]
-use_trigraphs=0
-'apply the trigraph rules first'
-strict_quotes=0
-g_optrans={'not':'!','and':'&&','bitand':'&','and_eq':'&=','or':'||','bitor':'|','or_eq':'|=','xor':'^','xor_eq':'^=','compl':'~',}
-re_lines=re.compile('^[ \t]*(#|%:)[ \t]*(ifdef|ifndef|if|else|elif|endif|include|import|define|undef|pragma)[ \t]*(.*)\r*$',re.IGNORECASE|re.MULTILINE)
-re_mac=re.compile("^[a-zA-Z_]\w*")
-re_fun=re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]')
-re_pragma_once=re.compile('^\s*once\s*',re.IGNORECASE)
-re_nl=re.compile('\\\\\r*\n',re.MULTILINE)
-re_cpp=re.compile(r"""(/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)|//[^\n]*|("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|.[^/"'\\]*)""",re.MULTILINE)
-trig_def=[('??'+a,b)for a,b in zip("=-/!'()<>",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<hex>[a-fA-F0-9]+)(?P<qual1>[uUlL]*)|L*?'(?P<char>(\\.|[^\\'])+)'|(?P<n1>\d+)[Ee](?P<exp0>[+-]*?\d+)(?P<float0>[fFlL]*)|(?P<n2>\d*\.\d+)([Ee](?P<exp1>[+-]*?\d+))?(?P<float1>[fFlL]*)|(?P<n4>\d+\.\d*)([Ee](?P<exp2>[+-]*?\d+))?(?P<float2>[fFlL]*)|(?P<oct>0*)(?P<n0>\d+)(?P<qual2>[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<b)
-       elif d=='>':c=int(a>b)
-       elif d=='>=':c=int(a>=b)
-       elif d=='^':c=int(a^b)
-       elif d=='<<':c=a<<b
-       elif d=='>>':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<len(lst):
-                               (p,v)=lst[i]
-                               if p==OP:
-                                       if v==')':
-                                               count_par-=1
-                                               if count_par==0:
-                                                       break
-                                       elif v=='(':
-                                               count_par+=1
-                               i+=1
-                       else:
-                               raise PreprocError("rparen expected %r"%lst)
-                       (num,_)=get_term(lst[1:i])
-                       return(num,lst[i+1:])
-               elif v=='+':
-                       return get_num(lst[1:])
-               elif v=='-':
-                       num,lst=get_num(lst[1:])
-                       return(reduce_nums('-1',num,'*'),lst)
-               elif v=='!':
-                       num,lst=get_num(lst[1:])
-                       return(int(not int(num)),lst)
-               elif v=='~':
-                       return(~int(num),lst)
-               else:
-                       raise PreprocError("invalid op token %r for get_num"%lst)
-       elif p==NUM:
-               return v,lst[1:]
-       elif p==IDENT:
-               return 0,lst[1:]
-       else:
-               raise PreprocError("invalid token %r for get_num"%lst)
-def get_term(lst):
-       if not lst:raise PreprocError("empty list for get_term")
-       num,lst=get_num(lst)
-       if not lst:
-               return(num,[])
-       (p,v)=lst[0]
-       if p==OP:
-               if v=='&&'and not num:
-                       return(num,[])
-               elif v=='||'and num:
-                       return(num,[])
-               elif v==',':
-                       return get_term(lst[1:])
-               elif v=='?':
-                       count_par=0
-                       i=1
-                       while i<len(lst):
-                               (p,v)=lst[i]
-                               if p==OP:
-                                       if v==')':
-                                               count_par-=1
-                                       elif v=='(':
-                                               count_par+=1
-                                       elif v==':':
-                                               if count_par==0:
-                                                       break
-                               i+=1
-                       else:
-                               raise PreprocError("rparen expected %r"%lst)
-                       if int(num):
-                               return get_term(lst[1:i])
-                       else:
-                               return get_term(lst[i+1:])
-               else:
-                       num2,lst=get_num(lst[1:])
-                       if not lst:
-                               num2=reduce_nums(num,num2,v)
-                               return get_term([(NUM,num2)]+lst)
-                       p2,v2=lst[0]
-                       if p2!=OP:
-                               raise PreprocError("op expected %r"%lst)
-                       if prec[v2]>=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):
-               (p,v)=lst[i]
-               if p==IDENT and v=="defined":
-                       del lst[i]
-                       if i<len(lst):
-                               (p2,v2)=lst[i]
-                               if p2==IDENT:
-                                       if v2 in defs:
-                                               lst[i]=(NUM,1)
-                                       else:
-                                               lst[i]=(NUM,0)
-                               elif p2==OP and v2=='(':
-                                       del lst[i]
-                                       (p2,v2)=lst[i]
-                                       del lst[i]
-                                       if v2 in defs:
-                                               lst[i]=(NUM,1)
-                                       else:
-                                               lst[i]=(NUM,0)
-                               else:
-                                       raise PreprocError("invalid define expression %r"%lst)
-               elif p==IDENT and v in defs:
-                       if isinstance(defs[v],str):
-                               a,b=extract_macro(defs[v])
-                               defs[v]=b
-                       macro_def=defs[v]
-                       to_add=macro_def[1]
-                       if isinstance(macro_def[0],list):
-                               del lst[i]
-                               for x in xrange(len(to_add)):
-                                       lst.insert(i,to_add[x])
-                                       i+=1
-                       else:
-                               args=[]
-                               del lst[i]
-                               if 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 i<len(lst):
-                                       p2,v2=lst[i]
-                                       del lst[i]
-                                       if p2==OP and count_paren==0:
-                                               if v2=='(':
-                                                       one_param.append((p2,v2))
-                                                       count_paren+=1
-                                               elif v2==')':
-                                                       if one_param:args.append(one_param)
-                                                       break
-                                               elif v2==',':
-                                                       if not one_param:raise PreprocError("empty param in funcall %s"%p)
-                                                       args.append(one_param)
-                                                       one_param=[]
-                                               else:
-                                                       one_param.append((p2,v2))
-                                       else:
-                                               one_param.append((p2,v2))
-                                               if v2=='(':count_paren+=1
-                                               elif v2==')':count_paren-=1
-                               else:
-                                       raise PreprocError('malformed macro')
-                               accu=[]
-                               arg_table=macro_def[0]
-                               j=0
-                               while j<len(to_add):
-                                       (p2,v2)=to_add[j]
-                                       if p2==OP and v2=='#':
-                                               if j+1<len(to_add)and to_add[j+1][0]==IDENT and to_add[j+1][1]in arg_table:
-                                                       toks=args[arg_table[to_add[j+1][1]]]
-                                                       accu.append((STR,stringize(toks)))
-                                                       j+=1
-                                               else:
-                                                       accu.append((p2,v2))
-                                       elif p2==OP and v2=='##':
-                                               if accu and j+1<len(to_add):
-                                                       t1=accu[-1]
-                                                       if to_add[j+1][0]==IDENT and to_add[j+1][1]in arg_table:
-                                                               toks=args[arg_table[to_add[j+1][1]]]
-                                                               if toks:
-                                                                       accu[-1]=paste_tokens(t1,toks[0])
-                                                                       accu.extend(toks[1:])
-                                                               else:
-                                                                       accu.append((p2,v2))
-                                                                       accu.extend(toks)
-                                                       elif to_add[j+1][0]==IDENT and to_add[j+1][1]=='__VA_ARGS__':
-                                                               va_toks=[]
-                                                               st=len(macro_def[0])
-                                                               pt=len(args)
-                                                               for x in args[pt-st+1:]:
-                                                                       va_toks.extend(x)
-                                                                       va_toks.append((OP,','))
-                                                               if va_toks:va_toks.pop()
-                                                               if len(accu)>1:
-                                                                       (p3,v3)=accu[-1]
-                                                                       (p4,v4)=accu[-2]
-                                                                       if v3=='##':
-                                                                               accu.pop()
-                                                                               if v4==','and pt<st:
-                                                                                       accu.pop()
-                                                               accu+=va_toks
-                                                       else:
-                                                               accu[-1]=paste_tokens(t1,to_add[j+1])
-                                                       j+=1
-                                               else:
-                                                       accu.append((p2,v2))
-                                       elif p2==IDENT and v2 in arg_table:
-                                               toks=args[arg_table[v2]]
-                                               reduce_tokens(toks,defs,ban+[v])
-                                               accu.extend(toks)
-                                       else:
-                                               accu.append((p2,v2))
-                                       j+=1
-                               reduce_tokens(accu,defs,ban+[v])
-                               for x in xrange(len(accu)-1,-1,-1):
-                                       lst.insert(i,accu[x])
-               i+=1
-def eval_macro(lst,adefs):
-       reduce_tokens(lst,adefs,[])
-       if not lst:raise PreprocError("missing tokens to evaluate")
-       (p,v)=reduce_eval(lst)
-       return int(v)!=0
-def extract_macro(txt):
-       t=tokenize(txt)
-       if re_fun.search(txt):
-               p,name=t[0]
-               p,v=t[1]
-               if p!=OP:raise PreprocError("expected open parenthesis")
-               i=1
-               pindex=0
-               params={}
-               prev='('
-               while 1:
-                       i+=1
-                       p,v=t[i]
-                       if prev=='(':
-                               if p==IDENT:
-                                       params[v]=pindex
-                                       pindex+=1
-                                       prev=p
-                               elif p==OP and v==')':
-                                       break
-                               else:
-                                       raise PreprocError("unexpected token (3)")
-                       elif prev==IDENT:
-                               if p==OP and v==',':
-                                       prev=v
-                               elif p==OP and v==')':
-                                       break
-                               else:
-                                       raise PreprocError("comma or ... expected")
-                       elif prev==',':
-                               if p==IDENT:
-                                       params[v]=pindex
-                                       pindex+=1
-                                       prev=p
-                               elif p==OP and v=='...':
-                                       raise PreprocError("not implemented (1)")
-                               else:
-                                       raise PreprocError("comma or ... expected (2)")
-                       elif prev=='...':
-                               raise PreprocError("not implemented (2)")
-                       else:
-                               raise PreprocError("unexpected else")
-               return(name,[params,t[i+1:]])
-       else:
-               (p,v)=t[0]
-               return(v,[[],t[1:]])
-re_include=re.compile('^\s*(<(?P<a>.*)>|"(?P<b>.*)")')
-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
deleted file mode 100644 (file)
index 3ec444b..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 4ebe0e0..0000000
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /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('<!DOCTYPE RCC><RCC version="1.0">\n<qresource>\n')
-       for k in task.inputs:
-               f.write(' <file>')
-               f.write(k.path_to_parent(task.path))
-               f.write('</file>\n')
-       f.write('</qresource>\n</RCC>')
-       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
deleted file mode 100644 (file)
index 56fd088..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /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<minver:
-                       conf.fatal('ruby is too old')
-               cver=".".join([str(x)for x in minver])
-       conf.check_message('ruby',cver,True,version)
-def check_ruby_ext_devel(conf):
-       if not conf.env.RUBY:
-               conf.fatal('ruby detection is required first')
-       if not conf.env.CC_NAME and not conf.env.CXX_NAME:
-               conf.fatal('load a c/c++ compiler first')
-       version=tuple(map(int,conf.env.RUBY_VERSION.split(".")))
-       def read_out(cmd):
-               return Utils.to_list(Utils.cmd_output([conf.env.RUBY,'-rrbconfig','-e',cmd]))
-       def read_config(key):
-               return read_out('puts Config::CONFIG[%r]'%key)
-       ruby=conf.env['RUBY']
-       archdir=read_config('archdir')
-       cpppath=archdir
-       if version>=(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
deleted file mode 100644 (file)
index ef04348..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index b520bf9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 68d8047..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-#! /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'\\(?P<type>include|input|import|bringin|lstinputlisting){(?P<file>[^{}]*)}',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
deleted file mode 100644 (file)
index a53e311..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index d9d5c15..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-#! /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<min_version:
-               conf.fatal("valac version too old to be used with this tool")
-               return
-       conf.env['VALAC_VERSION']=valac_version
-       conf.env['VALAFLAGS']=''
-def set_options(opt):
-       valaopts=opt.add_option_group('Vala Compiler Options')
-       valaopts.add_option('--vala-target-glib',default=None,dest='vala_target_glib',metavar='MAJOR.MINOR',help='Target version of glib for Vala GObject code generation')
-
-extension(EXT_VALA)(vala_file)
diff --git a/waf-modules/wafadmin/Tools/winres.py b/waf-modules/wafadmin/Tools/winres.py
deleted file mode 100644 (file)
index c9516f5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys,re
-import TaskGen,Task
-from Utils import quote_whitespace
-from TaskGen import extension
-EXT_WINRC=['.rc']
-winrc_str='${WINRC} ${_CPPDEFFLAGS} ${_CCDEFFLAGS} ${WINRCFLAGS} ${_CPPINCFLAGS} ${_CCINCFLAGS} ${WINRC_TGT_F} ${TGT} ${WINRC_SRC_F} ${SRC}'
-def rc_file(self,node):
-       obj_ext='.rc.o'
-       if self.env['WINRC_TGT_F']=='/fo':obj_ext='.res'
-       rctask=self.create_task('winrc',node,node.change_ext(obj_ext))
-       self.compiled_tasks.append(rctask)
-Task.simple_task_type('winrc',winrc_str,color='BLUE',before='cc cxx',shell=False)
-def detect(conf):
-       v=conf.env
-       winrc=v['WINRC']
-       v['WINRC_TGT_F']='-o'
-       v['WINRC_SRC_F']='-i'
-       if not winrc:
-               if v['CC_NAME']in['gcc','cc','g++','c++']:
-                       winrc=conf.find_program('windres',var='WINRC',path_list=v['PATH'])
-               elif v['CC_NAME']=='msvc':
-                       winrc=conf.find_program('RC',var='WINRC',path_list=v['PATH'])
-                       v['WINRC_TGT_F']='/fo'
-                       v['WINRC_SRC_F']=''
-       if not winrc:
-               conf.fatal('winrc was not found!')
-       v['WINRCFLAGS']=''
-
-extension(EXT_WINRC)(rc_file)
diff --git a/waf-modules/wafadmin/Tools/xlc.py b/waf-modules/wafadmin/Tools/xlc.py
deleted file mode 100644 (file)
index d6bcb2c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys
-import Configure,Options,Utils
-import ccroot,ar
-from Configure import conftest
-def find_xlc(conf):
-       cc=conf.find_program(['xlc_r','xlc'],var='CC',mandatory=True)
-       cc=conf.cmd_to_list(cc)
-       conf.env.CC_NAME='xlc'
-       conf.env.CC=cc
-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=v['CC']
-       v['CPP']=cpp
-def xlc_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']=''
-       v['SHLIB_MARKER']=''
-       v['STATICLIB_MARKER']=''
-       v['FULLSTATIC_MARKER']='-static'
-       v['program_LINKFLAGS']=['-Wl,-brtl']
-       v['program_PATTERN']='%s'
-       v['shlib_CCFLAGS']=['-fPIC','-DPIC']
-       v['shlib_LINKFLAGS']=['-G','-Wl,-brtl,-bexpfull']
-       v['shlib_PATTERN']='lib%s.so'
-       v['staticlib_LINKFLAGS']=''
-       v['staticlib_PATTERN']='lib%s.a'
-def detect(conf):
-       conf.find_xlc()
-       conf.find_cpp()
-       conf.find_ar()
-       conf.xlc_common_flags()
-       conf.cc_load_tools()
-       conf.cc_add_flags()
-       conf.link_add_flags()
-
-conftest(find_xlc)
-conftest(find_cpp)
-conftest(xlc_common_flags)
diff --git a/waf-modules/wafadmin/Tools/xlcxx.py b/waf-modules/wafadmin/Tools/xlcxx.py
deleted file mode 100644 (file)
index ce0e3bc..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys
-import Configure,Options,Utils
-import ccroot,ar
-from Configure import conftest
-def find_xlcxx(conf):
-       cxx=conf.find_program(['xlc++_r','xlc++'],var='CXX',mandatory=True)
-       cxx=conf.cmd_to_list(cxx)
-       conf.env.CXX_NAME='xlc++'
-       conf.env.CXX=cxx
-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=v['CXX']
-       v['CPP']=cpp
-def xlcxx_common_flags(conf):
-       v=conf.env
-       v['CXXFLAGS_DEBUG']=['-g']
-       v['CXXFLAGS_RELEASE']=['-O2']
-       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['RPATH_ST']='-Wl,-rpath,%s'
-       v['CXXDEFINES_ST']='-D%s'
-       v['SONAME_ST']=''
-       v['SHLIB_MARKER']=''
-       v['STATICLIB_MARKER']=''
-       v['FULLSTATIC_MARKER']='-static'
-       v['program_LINKFLAGS']=['-Wl,-brtl']
-       v['program_PATTERN']='%s'
-       v['shlib_CXXFLAGS']=['-fPIC','-DPIC']
-       v['shlib_LINKFLAGS']=['-G','-Wl,-brtl,-bexpfull']
-       v['shlib_PATTERN']='lib%s.so'
-       v['staticlib_LINKFLAGS']=''
-       v['staticlib_PATTERN']='lib%s.a'
-def detect(conf):
-       conf.find_xlcxx()
-       conf.find_cpp()
-       conf.find_ar()
-       conf.xlcxx_common_flags()
-       conf.cxx_load_tools()
-       conf.cxx_add_flags()
-       conf.link_add_flags()
-
-conftest(find_xlcxx)
-conftest(find_cpp)
-conftest(xlcxx_common_flags)
diff --git a/waf-modules/wafadmin/Utils.py b/waf-modules/wafadmin/Utils.py
deleted file mode 100644 (file)
index 5fc4b8c..0000000
+++ /dev/null
@@ -1,532 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import os,sys,imp,string,errno,traceback,inspect,re,shutil,datetime,gc
-try:from UserDict import UserDict
-except ImportError:from collections import UserDict
-if sys.hexversion>=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<ver:
-               Logs.error("waf version should be at most %s (%s found)"%(maxi,ver))
-               sys.exit(1)
-def python_24_guard():
-       if sys.hexversion<0x20400f0 or sys.hexversion>=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
deleted file mode 100644 (file)
index cbc8406..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-
diff --git a/waf-modules/wafadmin/ansiterm.py b/waf-modules/wafadmin/ansiterm.py
deleted file mode 100644 (file)
index bf865ac..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 67b39f9..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index b2414c8..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-#! /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
deleted file mode 100755 (executable)
index 568f50a..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/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/README_OPENSUSE_MINGW.txt b/win32/README_OPENSUSE_MINGW.txt
deleted file mode 100644 (file)
index ed8a59a..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-This file is licensed under the terms of the LGPL 2.1, see the file COPYING.
-
-        FILES
-
-README.txt              This file, explaining how to build Midori.
-midori-0.3.3.nsi        The NSIS installer creation script.
-
-packages.list           The suse mingw packages required to build Midori.
-x86-mingw32-opensuse/   Install and update script for the opensuse repository.
-
-makedist/               Scripts to create distribution package
-                       from cross-compiled binaries and libs.
-
-crossconfig.sh          Setup environment for cross build and run
-                       configure script for cross build.
-
-
-        INTRODUCTION
-
-This document will explain how to get Midori compiling for windows, hopefully.
-
-
-        REQUIREMENTS
-
-A working tool chain with the mingw compiler is required. This can either be
-native in Windows or a cross-chain.
-This tool chain must have the following applications and all applications
-needed to build Midori:
-- basename, for x86-mingw32-opensuse
-- bash, for the shell scripts
-- cat, for makedist.midori
-- cp, for x86-mingw32-opensuse and makedist.midori
-- cpio, for x86-mingw32-opensuse
-- echo, for x86-mingw32-opensuse and makedist.midori
-- find, for makedist.midori
-- git, to get the development sources
-- grep, for makedist.midori
-- gunzip, for x86-mingw32-opensuse
-- head, for x86-mingw32-opensuse
-- ls, for makedist.midori
-- mkdir, for x86-mingw32-opensuse and makedist.midori
-- mktemp, for makedist.midori
-- pwd, for makedist.midori
-- rm, for x86-mingw32-opensuse and makedist.midori
-- rmdir, for makedist.midori
-- rpm2cpio, for x86-mingw32-opensuse
-- sed, for x86-mingw32-opensuse
-- sha1sum, for makedist.midori
-- sort, for x86-mingw32-opensuse and makedist.midori
-- strings, for makedist.midori
-- tar, to unpack the scripts
-- touch, for x86-mingw32-opensuse
-- uniq, for makedist.midori
-- wget, for x86-mingw32-opensuse
-- xmlgrep, for x86-mingw32-opensuse
-- zip, for makedist.midori
-
-
-        PREPARATIONS
-
-Install all the packages needed by Midori and its dependencies. There are two
-ways to do this. Automatically install the dependencies from opensuse.org or
-manually install them.
-To automatically install the packages use the scripts and change configuration
-in header of install.sh file where needed. And run ./install.sh to install all
-necessary packages.
-This script can be also invoked with "update" argument ./install.sh update
-to update the installed packages to newer versions.
-To install the dependencies manually install the packages in packages.list.
-This are all the packages needed by Midori and its dependencies.
-
-Get the Midori sources. Either use git to get them or download a snapshot or a
-release. See http://git.xfce.org/apps/midori or
-http://archive.xfce.org/src/apps/midori/
-
-
-        BUILDING
-
-Read the instruction in the source tree. For cross compiling the script
-crossconfig.sh might help.
-
-
-        DISTRIBUTION
-
-To create a Windows installer for Midori you need NSIS. See
-http://nsis.sourceforge.net/Main_Page
-Use the makedist.midori script to get all files needed for distribution. Add
-the version number as argument to makedist.midori to create a version number
-in the distribution package. eg. ./makedist.midori -0.3.3
-To complete the installer unzip the file created by the makedist script.
-Compile midori-0.3.3.nsi with NSIS.
-
index 27feaf342aea4a84cc92e59fac429fabd37d78f7..20d2986bc68594aa689b4ae26485337770031d73 100755 (executable)
 
 # a bit of configuration
 root_dir=$MINGW_PREFIX
+where_am_i=$PWD
 
 if [ "$GSTREAMER_API_VERSION" == "" ]; then
-    GSTREAMER_API_VERSION=0.10
+    WEBKIT_VER=$(grep -E '(DEPS_GTK_webkitgtk\-)(.*)(_VERSION)'  CMakeCache.txt|cut -d \= -f 2 |cut -c 1)
+    if [ "$WEBKIT_VER" == "2" ]; then
+        GSTREAMER_API_VERSION=1.0
+    else
+        GSTREAMER_API_VERSION=0.10
+    fi
 fi
 
 if [ "$MINGW_PREFIX" == "" ]; then
@@ -39,12 +45,18 @@ 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'`
+GTK3_BUILD=1
+# Default to gtk3 but check just in case
+GTK3=$(grep GTK3 CMakeCache.txt | awk -F \= '{print $2}')
+if [ "$GTK3" != "ON" ] && [ "$GTK3" != "1" ];then
+    GTK3_BUILD=0
+fi
+
+version=$(grep PACKAGE_VERSION ./midori/CMakeFiles/midori.dir/DependInfo.cmake|sed -e 's/^.*PACKAGE_VERSION=\\"\([^"]*\)\\".*$/\1/')
 
 #strip sha from version if release
 if [ "$RELEASE" != "" ];then
-    version=$(echo $version| awk -F \- '{print $1}')
+    version=$(echo $version| awk -F \~ '{print $1}')
 fi
 
 if [ "$1" != "" ]; then
@@ -71,9 +83,8 @@ else
 fi
 
 if [ "NSIS" != "" ];then
-    where_am_i=$PWD
-    cp -a $where_am_i/win32/makedist/midori.nsi $temp_dir
-    cp -a $where_am_i/win32/makedist/midori.ico $temp_dir
+    cp -a $where_am_i/../win32/makedist/midori.nsi $temp_dir
+    cp -a $where_am_i/../win32/makedist/midori.ico $temp_dir
 fi
 
 # function: dll-recursive <list of exe and dll files ...>
@@ -119,6 +130,32 @@ grab_files ()
    popd > /dev/null
 }
 
+grab_icons()
+{
+  local theme="$1"
+  local list="$2"
+  
+  sizes=$(grep CreateDirectory $list |awk -F '"' '{print $2}' |awk -F '\' '{print $6}')
+  categories=$(grep InstallIconTheme $list | awk -F '"' '{print $2}'|sort|uniq)
+
+       
+  for category in $categories
+  do
+     category_icons=$(grep InstallIconTheme $list |grep $category|awk -F '"' '{print $4}')
+     for size in $sizes
+     do
+       mkdir -p $workdir/share/icons/$theme/$category/$size
+       for icon in $category_icons
+        do
+         cp -L /usr/share/icons/$theme/$category/$size/$icon.* $workdir/share/icons/$theme/$category/$size/
+        done
+     done
+  done
+
+  cp -L /usr/share/icons/$theme/index.theme $workdir/share/icons/$theme 
+
+}
+
 echo "Creating $ARCHIVE"
 
 # create destination folder
@@ -132,10 +169,19 @@ 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-$GSTREAMER_API_VERSION/*.dll >> $temp_dir/midori.exe.lst
 # we ship gdb now for -g and diagnostic button
 dll_recursive gdb.exe >> $temp_dir/midori.exe.lst
 
+for i in $(cat $temp_dir/midori.exe.lst | grep -v midori | sort | uniq)
+do
+  if [ -f $root_dir/bin/$i ]; then
+  rpm -qf $root_dir/bin/$i >> $temp_dir/packages_used.lst
+  fi
+done
+
+dll_recursive ../lib/gstreamer-$GSTREAMER_API_VERSION/*.dll >> $temp_dir/midori.exe.lst
+rpm -qf $root_dir/lib/gstreamer-$GSTREAMER_API_VERSION/*.dll >> $temp_dir/packages_used.lst
+
 if [ "$DEBUG_BUILD" != "" ]; then
     dll_recursive GtkLauncher.exe >> $temp_dir/midori.exe.lst
 fi
@@ -197,16 +243,24 @@ echo "<*> Copying resources and translations..."
 
 # copy share
 grab_files share midori
-grab_files share icons
 grab_files share mime
 grab_files share midori.mo
 
+grab_icons Faenza $where_am_i/../win32/makedist/midori.nsi
+
 # We need to ship our CA bundle for now
-cp /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
+cp -Lr /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
+
+GREYBIRD_VER="1.3.4"
 
 if [ "$GTK3_BUILD" == "1" ]; then
     grab_files share webkitgtk-3.0
     grab_files share schemas
+
+    wget --no-verbose "https://github.com/shimmerproject/Greybird/archive/v$GREYBIRD_VER.tar.gz" -P $temp_dir
+    tar xf "$temp_dir/v$GREYBIRD_VER.tar.gz" -C $temp_dir
+    mkdir -p $workdir/share/themes/Greybird
+    cp -Lr $temp_dir/Greybird-$GREYBIRD_VER/gtk-3.0 $workdir/share/themes/Greybird
     MO_VER=30
 else
     grab_files share MS-Windows
@@ -220,6 +274,10 @@ if [ "$DEBUG_BUILD" == "" ];then
     popd > /dev/null
 fi
 
+rpm -qf /etc/pki/tls/certs/ca-bundle.crt >> $temp_dir/packages_used.lst
+rpm -qf /usr/share/icons/Faenza/ >> $temp_dir/packages_used.lst
+echo "https://github.com/shimmerproject/Greybird/archive/v$GREYBIRD_VER.tar.gz" >> $temp_dir/packages_used.lst
+
 # copy locales for gtk
 # so we have translated stock items, file dialogs
 
@@ -250,6 +308,7 @@ if [ "$GTK3_BUILD" == "1" ]; then
     cat > $gtk_rc_file << _EOF
 [Settings]
 gtk-icon-theme-name = Faenza
+gtk-menu-images = true
 _EOF
 
 else
@@ -265,6 +324,20 @@ gtk-toolbar-style = GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size = GTK_ICON_SIZE_MENU
 _EOF
 
+mkdir -p $workdir/etc/xdg/midori
+
+cat >> $workdir/etc/xdg/midori/config << _EOF
+[settings]
+default-font-family=Times New Roman
+monospace-font-family=Courier New
+default-font-size=14
+default-monospace-font-size=14
+_EOF
+
+# Don't hardcode mingw path, otherwise fontconfig uses fallback settings
+# which tend to look very bad on Windows
+sed -r 's@>.+(conf\.d)<@>\1@g' -i $workdir/etc/fonts/fonts.conf
+
 popd > /dev/null
 
 echo "<*> Copying docs..."
@@ -272,6 +345,8 @@ echo "<*> Copying docs..."
 # copy doc files to root
 cp -L $workdir/share/doc/midori/{COPYING,AUTHORS} $workdir
 
+cat $temp_dir/packages_used.lst | sort | uniq > $workdir/share/doc/midori/README.packages
+rm $temp_dir/packages_used.lst
 
 #drop a/la files, we don't do static builds anyway
 find $workdir -iname *.*a -exec rm {} \;
@@ -290,7 +365,7 @@ fi
 if [ "$NSIS" != "" ];then
     nsis_file=Midori-${version}_setup.exe
     echo "Creating $nsis_file"
-    makensis -NOCD -V2 ./midori.nsi
+    makensis -NOCD -V4 ./midori.nsi
     mv $nsis_file $where_am_i
 fi
 popd > /dev/null
index 840ac60a4ad8dbc3cbc8538a7d250ccf78d9b666..feeab278f066fce8be5aefb3447a896cb42ae368 100644 (file)
@@ -21,7 +21,7 @@ RequestExecutionLevel admin ; set execution level for Windows Vista
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Midori"
-!define PRODUCT_VERSION "0.5.2"
+!define PRODUCT_VERSION "0.5.10"
 !define PRODUCT_BUILD "0"
 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
 !define PRODUCT_PUBLISHER "Christian Dywan"
@@ -136,38 +136,26 @@ Section "!Program Files" SEC01
        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 /nonfatal "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png"
-!macroend
-
-!macro InstallIconThemeRename OPath IPath
-       !insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath}
-       File /nonfatal "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png"
-       File /nonfatal "/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}
+!macro InstallIconTheme ICat IName
+       File "/oname=${ICat}\16\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\16\${IName}.png"
+       File "/oname=${Icat}\22\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\22\${IName}.png"
+       File "/oname=${Icat}\24\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\24\${IName}.png"
+       File /nonfatal "/oname=${ICat}\32\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\32\${IName}.png"
+       File /nonfatal "/oname=${ICat}\48\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\48\${IName}.png"
+       File /nonfatal "/oname=${ICat}\scalable\${IName}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\scalable\${IName}.svg"
 !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}"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\16"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\22"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\24"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\32"
 !macroend
 
 !macro CreateIconThemeSections SectionPath
        !insertmacro CreateIconThemeSectionsSmall ${SectionPath}
-       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\48x48\${SectionPath}"
-       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\48"
+       CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\${SectionPath}\scalable"
 !macroend
 
        SetOutPath "$INSTDIR\share\icons\${ICON_THEME}"
@@ -181,88 +169,93 @@ Section "!Program Files" SEC01
        !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-down"
-       !insertmacro InstallIconTheme "actions\go-home"
-       !insertmacro InstallIconTheme "actions\go-jump"
-       !insertmacro InstallIconTheme "actions\go-next"
-       !insertmacro InstallIconTheme "actions\go-previous"
-       !insertmacro InstallIconTheme "actions\go-up"
-       !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\gtk-yes"
-       !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"
+       !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-down"
+       !insertmacro InstallIconTheme "actions" "go-home"
+       !insertmacro InstallIconTheme "actions" "go-jump"
+       !insertmacro InstallIconTheme "actions" "go-next"
+       !insertmacro InstallIconTheme "actions" "go-previous"
+       !insertmacro InstallIconTheme "actions" "go-up"
+       !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" "gtk-yes"
+       !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" "gtk-dialog-error"
+       !insertmacro InstallIconTheme "status" "gtk-dialog-info"
+       !insertmacro InstallIconTheme "status" "gtk-dialog-warning"
+       !insertmacro InstallIconTheme "status" "locked"
+       !insertmacro InstallIconTheme "status" "network-error"
+       !insertmacro InstallIconTheme "status" "network-idle"
 
 SectionEnd
 
@@ -282,6 +275,8 @@ SectionEnd
 
 Section "Desktop Shortcuts" SEC03
        SectionIn 1
+       # CreateShortCut implicitly sets content of OUTDIR as working directory for shortcut, set it to bin
+       SetOutPath "$INSTDIR\bin"
        CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}"
        CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}"
 SectionEnd
index 97a610e17166c48c1b15bb43debf44c1c35837dd..d27713bc36943c5d6e4258bf8232bb8d6534ed1e 100755 (executable)
 # See the file COPYING for the full license text.
 
 
-version=$(git describe --abbrev=0)
-dropbox_dir=$HOME/Dropbox/Public
+SRCDIR=$PWD
+CONFIGURE_OPTIONS="-DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_VERBOSE_MAKEFILE=0 -DEXTRA_WARNINGS=1"
 
 # 32-bit build
 #mingw32-env
 export MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw"
 eval `rpm --eval %{mingw32_env}`
 
-./configure --prefix=$MINGW_PREFIX --enable-gtk3
-make clean
-sudo make install
+rm -fr _mingw32
+mkdir _mingw32 && cd _mingw32
+mingw32-cmake -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX ${CONFIGURE_OPTIONS} $SRCDIR
+make
+sudo make install || exit
 
-rpmquery -qa mingw32* > midori-${version}-deps-i686.txt
-rm -f midori-$version.sha1
 
-MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 NSIS=1 ./win32/makedist/makedist.midori
-mv -v midori-${version}.7z $dropbox_dir
-mv -v Midori-${version}_setup.exe $dropbox_dir
+version=$(grep set\(VERSION $SRCDIR/CMakeLists.txt|head -n1|sed -e 's/^.*set(VERSION \([0-9.]*\)).*$/\1/')
 
-dropbox puburl $dropbox_dir/midori-${version}.7z >  release_links.txt
-dropbox puburl $dropbox_dir/Midori-${version}_setup.exe >> release_links.txt
+rpmquery -qa mingw32* > $SRCDIR/midori-${version}-deps-i686.txt
+rm -f $SRCDIR/midori-$version.sha1
 
-if [ "$64BIT" != "" ]; then
+MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 NSIS=1 $SRCDIR/win32/makedist/makedist.midori
+mv -v midori-${version}.7z midori_${version}_32_.7z
+mv -v Midori-${version}_setup.exe midori_${version}_32_.exe
+
+if [ "$DO_64BIT" != "" ]; then
+    cd $SRCDIR
     # 64-bit build
     #mingw64-env
     export MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw"
     eval `rpm --eval %{mingw64_env}`
 
-    ./configure --prefix=$MINGW_PREFIX --enable-gtk3
-    make clean
-    sudo make install
+    rm -fr _mingw64
+    mkdir _mingw64 && cd _mingw64
+    mingw64-cmake -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX ${CONFIGURE_OPTIONS} $SRCDIR
+    make
+    sudo make install || exit
 
-    rpmquery -qa mingw64* > midori-${version}-deps-x86_64.txt
-    MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 sh ./win32/makedist/makedist.midori x86_64-portable
-    mv -v midori-${version}-x86_64-portable.7z $dropbox_dir
-    dropbox puburl $dropbox_dir/midori-${version}-x86_64-portable.7z >> release_links.txt
+    rpmquery -qa mingw64* > $SRCDIR/midori-${version}-deps-x86_64.txt
+    MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 sh $SRCDIR/win32/makedist/makedist.midori x86_64-portable
 fi
 
+cd $SRCDIR
+
 echo
 echo "============================="
 echo "Midori win32 release details:"
diff --git a/win32/old/README_OPENSUSE_MINGW.txt b/win32/old/README_OPENSUSE_MINGW.txt
new file mode 100644 (file)
index 0000000..ed8a59a
--- /dev/null
@@ -0,0 +1,92 @@
+This file is licensed under the terms of the LGPL 2.1, see the file COPYING.
+
+        FILES
+
+README.txt              This file, explaining how to build Midori.
+midori-0.3.3.nsi        The NSIS installer creation script.
+
+packages.list           The suse mingw packages required to build Midori.
+x86-mingw32-opensuse/   Install and update script for the opensuse repository.
+
+makedist/               Scripts to create distribution package
+                       from cross-compiled binaries and libs.
+
+crossconfig.sh          Setup environment for cross build and run
+                       configure script for cross build.
+
+
+        INTRODUCTION
+
+This document will explain how to get Midori compiling for windows, hopefully.
+
+
+        REQUIREMENTS
+
+A working tool chain with the mingw compiler is required. This can either be
+native in Windows or a cross-chain.
+This tool chain must have the following applications and all applications
+needed to build Midori:
+- basename, for x86-mingw32-opensuse
+- bash, for the shell scripts
+- cat, for makedist.midori
+- cp, for x86-mingw32-opensuse and makedist.midori
+- cpio, for x86-mingw32-opensuse
+- echo, for x86-mingw32-opensuse and makedist.midori
+- find, for makedist.midori
+- git, to get the development sources
+- grep, for makedist.midori
+- gunzip, for x86-mingw32-opensuse
+- head, for x86-mingw32-opensuse
+- ls, for makedist.midori
+- mkdir, for x86-mingw32-opensuse and makedist.midori
+- mktemp, for makedist.midori
+- pwd, for makedist.midori
+- rm, for x86-mingw32-opensuse and makedist.midori
+- rmdir, for makedist.midori
+- rpm2cpio, for x86-mingw32-opensuse
+- sed, for x86-mingw32-opensuse
+- sha1sum, for makedist.midori
+- sort, for x86-mingw32-opensuse and makedist.midori
+- strings, for makedist.midori
+- tar, to unpack the scripts
+- touch, for x86-mingw32-opensuse
+- uniq, for makedist.midori
+- wget, for x86-mingw32-opensuse
+- xmlgrep, for x86-mingw32-opensuse
+- zip, for makedist.midori
+
+
+        PREPARATIONS
+
+Install all the packages needed by Midori and its dependencies. There are two
+ways to do this. Automatically install the dependencies from opensuse.org or
+manually install them.
+To automatically install the packages use the scripts and change configuration
+in header of install.sh file where needed. And run ./install.sh to install all
+necessary packages.
+This script can be also invoked with "update" argument ./install.sh update
+to update the installed packages to newer versions.
+To install the dependencies manually install the packages in packages.list.
+This are all the packages needed by Midori and its dependencies.
+
+Get the Midori sources. Either use git to get them or download a snapshot or a
+release. See http://git.xfce.org/apps/midori or
+http://archive.xfce.org/src/apps/midori/
+
+
+        BUILDING
+
+Read the instruction in the source tree. For cross compiling the script
+crossconfig.sh might help.
+
+
+        DISTRIBUTION
+
+To create a Windows installer for Midori you need NSIS. See
+http://nsis.sourceforge.net/Main_Page
+Use the makedist.midori script to get all files needed for distribution. Add
+the version number as argument to makedist.midori to create a version number
+in the distribution package. eg. ./makedist.midori -0.3.3
+To complete the installer unzip the file created by the makedist script.
+Compile midori-0.3.3.nsi with NSIS.
+
diff --git a/win32/old/x86-mingw32-opensuse/crossconfig.sh b/win32/old/x86-mingw32-opensuse/crossconfig.sh
new file mode 100755 (executable)
index 0000000..169c094
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# Copyright (C) 2010-2011 Peter de Ridder <peter@xfce.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# See the file COPYING for the full license text.
+
+export MINGW_PREFIX=~/dev/mingw/mingw32
+export PATH=$MINGW_PREFIX/bin:$PATH
+export PKG_CONFIG_PATH=$MINGW_PREFIX/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=
+export MINGW_BUILD=`gcc -dumpmachine`
+export MINGW_TARGET=i386-mingw32
+
+find_compiler ()
+{
+    export CC=$( find /usr/bin -iname *mingw32*gcc )
+}
+
+find_compiler
+if [ "$CC" != "" ]; then
+    CC=${CC} ./configure --prefix=$MINGW_PREFIX $@
+else
+    echo "Cannot find cross-complier! Please install mingw version of gcc compiler."
+fi
diff --git a/win32/old/x86-mingw32-opensuse/install.sh b/win32/old/x86-mingw32-opensuse/install.sh
new file mode 100755 (executable)
index 0000000..e999331
--- /dev/null
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Copyright (C) 2010-2011 Peter de Ridder <peter@xfce.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# See the file COPYING for the full license text.
+
+# config variables
+REPO_URL=http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_11.4
+REPO_ARCH=noarch
+DOWNLOAD_PATH=~/dev/mingw/packages/opensuse
+BUILD_PATH=~/tmp/opensuse
+INSTALL_PATH=~/dev/mingw/mingw32
+
+if [[ "$1" == "update" ]]
+then
+  UPDATE=yes
+fi
+
+which xmlgrep 2> /dev/null && HAVE_XMLGREP=1 || HAVE_XMLGREP=0
+if [[ "$HAVE_XMLGREP" == "0" ]]; then
+    echo -e "\nPlease install xmlclitools http://robur.slu.se/jensl/xmlclitools\n"
+    exit
+fi
+
+# create download and build directory
+mkdir -p $DOWNLOAD_PATH
+mkdir -p $BUILD_PATH
+
+rm $DOWNLOAD_PATH/repomd.xml
+wget -nc $REPO_URL/repodata/repomd.xml -P $DOWNLOAD_PATH || exit 1
+OTHER_FILE=`xmlgrep -c -f $DOWNLOAD_PATH/repomd.xml repomd.data:type=other.location | sed 's/.*href="\([^"]*\)".*/\1/'`
+
+wget -nc $REPO_URL/$OTHER_FILE -O $DOWNLOAD_PATH/other.xml.gz || exit 1
+rm $DOWNLOAD_PATH/other.xml
+#gunzip -N $DOWNLOAD_PATH/`basename $OTHER_FILE`
+gunzip -N $DOWNLOAD_PATH/other.xml
+
+rm packages.version
+touch packages.version
+
+# download all packages
+while read line
+do
+  VERSION=`xmlgrep -c -f $DOWNLOAD_PATH/other.xml otherdata.package:name="$line":arch="$REPO_ARCH" | awk -F\< '{print $2}' |sed -e 'h' -e 's/^.*ver="\([^"]*\)".*$/\1/p' -e 'g' -e 's/^.*rel="\([^"]*\)".*$/\1/' | sed -e N -e 's/\n/-/' | sort -V -r | head -n 1`
+  FILE=$line-$VERSION.$REPO_ARCH.rpm
+  test "$UPDATE" == yes || echo $FILE >> packages.version
+  if [ ! -f $DOWNLOAD_PATH/$FILE ]
+  then
+    test "$UPDATE" == yes && echo $FILE >> packages.version
+    wget -nc $REPO_URL/$REPO_ARCH/$FILE -P $DOWNLOAD_PATH
+  fi
+done < packages.list
+
+# convert and install packages
+while read line
+do
+  pushd $BUILD_PATH
+  # extract rpm
+  rpm2cpio $DOWNLOAD_PATH/$line | cpio -i -d
+
+  if [ -d $BUILD_PATH/usr/i686-pc-ming32/sys-root/mingw ]
+  then
+    # convert pkgconfig files
+    if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ]
+    then
+      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
+    fi
+    # install the package
+    cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/
+  fi
+
+  if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ]
+  then
+    # convert pkgconfig files
+    if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig ]
+    then
+      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
+    fi
+    # install the package
+    cp -rf $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/* $INSTALL_PATH/
+  fi
+
+  # remove the extracted file
+  rm -rf $BUILD_PATH/usr
+  popd
+done < packages.version
+
+# remove build directory
+rm -rf $BUILD_PATH
diff --git a/win32/old/x86-mingw32-opensuse/packages.list b/win32/old/x86-mingw32-opensuse/packages.list
new file mode 100644 (file)
index 0000000..31c57f3
--- /dev/null
@@ -0,0 +1,89 @@
+This file is licensed under the terms of the LGPL 2.1, see the file COPYING.
+
+mingw32-atk
+mingw32-atk-devel
+mingw32-cairo-devel
+mingw32-dbus-1
+mingw32-dbus-1-glib
+mingw32-dbus-1-glib-devel
+mingw32-enchant
+mingw32-enchant-devel
+mingw32-fontconfig
+mingw32-fontconfig-devel
+mingw32-freetype
+mingw32-freetype-devel
+mingw32-gcc-c++
+mingw32-gcc
+mingw32-gdb
+mingw32-gdk-pixbuf
+mingw32-gdk-pixbuf-devel
+mingw32-gettext-runtime
+mingw32-gettext-tools
+mingw32-glib2
+mingw32-glib2-devel
+mingw32-glib-networking
+mingw32-gst-plugins-base-devel
+mingw32-gstreamer-devel
+mingw32-gtk2
+mingw32-gtk2-devel
+mingw32-hunspell
+mingw32-hunspell-devel
+mingw32-libexpat
+mingw32-libexpat-devel
+mingw32-libgcc
+mingw32-libgcrypt
+mingw32-libgcrypt-devel
+mingw32-libcairo2
+mingw32-libgeoclue
+mingw32-libgeoclue-devel
+mingw32-libgnutls
+mingw32-libgnutls-devel
+mingw32-libgpg-error
+mingw32-libgpg-error-devel
+mingw32-libgstinterfaces
+mingw32-libgstreamer
+mingw32-libidn
+mingw32-libidn-devel
+mingw32-libintl
+mingw32-libintl-devel
+mingw32-libjasper
+mingw32-libjasper-devel
+mingw32-libjpeg
+mingw32-libjpeg-devel
+mingw32-libopenssl
+mingw32-libopenssl-devel
+mingw32-libpng
+mingw32-libpng-devel
+mingw32-libsoup
+mingw32-libsoup-devel
+mingw32-libstdc++
+mingw32-libsqlite
+mingw32-libsqlite-devel
+mingw32-libtasn1
+mingw32-libtasn1-devel
+mingw32-libtiff
+mingw32-libtiff-devel
+mingw32-libwebkitgtk
+mingw32-libwebkitgtk-devel
+mingw32-webkit-tools
+mingw32-libxml2
+mingw32-libxml2-devel
+mingw32-libxslt
+mingw32-libxslt-devel
+mingw32-pango
+mingw32-pango-devel
+mingw32-pixman
+mingw32-pixman-devel
+mingw32-pthreads
+mingw32-pthreads-devel
+mingw32-libproxy
+mingw32-libmodman
+mingw32-shared-mime-info
+mingw32-shared-mime-info-devel
+mingw32-win_iconv
+mingw32-win_iconv-devel
+mingw32-zlib
+mingw32-zlib-devel
+mingw32-libunique
+mingw32-libunique-devel
+mingw32-libffi
diff --git a/win32/x86-mingw32-opensuse/crossconfig.sh b/win32/x86-mingw32-opensuse/crossconfig.sh
deleted file mode 100755 (executable)
index 169c094..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2010-2011 Peter de Ridder <peter@xfce.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-export MINGW_PREFIX=~/dev/mingw/mingw32
-export PATH=$MINGW_PREFIX/bin:$PATH
-export PKG_CONFIG_PATH=$MINGW_PREFIX/lib/pkgconfig
-export PKG_CONFIG_LIBDIR=
-export MINGW_BUILD=`gcc -dumpmachine`
-export MINGW_TARGET=i386-mingw32
-
-find_compiler ()
-{
-    export CC=$( find /usr/bin -iname *mingw32*gcc )
-}
-
-find_compiler
-if [ "$CC" != "" ]; then
-    CC=${CC} ./configure --prefix=$MINGW_PREFIX $@
-else
-    echo "Cannot find cross-complier! Please install mingw version of gcc compiler."
-fi
diff --git a/win32/x86-mingw32-opensuse/install.sh b/win32/x86-mingw32-opensuse/install.sh
deleted file mode 100755 (executable)
index e999331..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2010-2011 Peter de Ridder <peter@xfce.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# config variables
-REPO_URL=http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_11.4
-REPO_ARCH=noarch
-DOWNLOAD_PATH=~/dev/mingw/packages/opensuse
-BUILD_PATH=~/tmp/opensuse
-INSTALL_PATH=~/dev/mingw/mingw32
-
-if [[ "$1" == "update" ]]
-then
-  UPDATE=yes
-fi
-
-which xmlgrep 2> /dev/null && HAVE_XMLGREP=1 || HAVE_XMLGREP=0
-if [[ "$HAVE_XMLGREP" == "0" ]]; then
-    echo -e "\nPlease install xmlclitools http://robur.slu.se/jensl/xmlclitools\n"
-    exit
-fi
-
-# create download and build directory
-mkdir -p $DOWNLOAD_PATH
-mkdir -p $BUILD_PATH
-
-rm $DOWNLOAD_PATH/repomd.xml
-wget -nc $REPO_URL/repodata/repomd.xml -P $DOWNLOAD_PATH || exit 1
-OTHER_FILE=`xmlgrep -c -f $DOWNLOAD_PATH/repomd.xml repomd.data:type=other.location | sed 's/.*href="\([^"]*\)".*/\1/'`
-
-wget -nc $REPO_URL/$OTHER_FILE -O $DOWNLOAD_PATH/other.xml.gz || exit 1
-rm $DOWNLOAD_PATH/other.xml
-#gunzip -N $DOWNLOAD_PATH/`basename $OTHER_FILE`
-gunzip -N $DOWNLOAD_PATH/other.xml
-
-rm packages.version
-touch packages.version
-
-# download all packages
-while read line
-do
-  VERSION=`xmlgrep -c -f $DOWNLOAD_PATH/other.xml otherdata.package:name="$line":arch="$REPO_ARCH" | awk -F\< '{print $2}' |sed -e 'h' -e 's/^.*ver="\([^"]*\)".*$/\1/p' -e 'g' -e 's/^.*rel="\([^"]*\)".*$/\1/' | sed -e N -e 's/\n/-/' | sort -V -r | head -n 1`
-  FILE=$line-$VERSION.$REPO_ARCH.rpm
-  test "$UPDATE" == yes || echo $FILE >> packages.version
-  if [ ! -f $DOWNLOAD_PATH/$FILE ]
-  then
-    test "$UPDATE" == yes && echo $FILE >> packages.version
-    wget -nc $REPO_URL/$REPO_ARCH/$FILE -P $DOWNLOAD_PATH
-  fi
-done < packages.list
-
-# convert and install packages
-while read line
-do
-  pushd $BUILD_PATH
-  # extract rpm
-  rpm2cpio $DOWNLOAD_PATH/$line | cpio -i -d
-
-  if [ -d $BUILD_PATH/usr/i686-pc-ming32/sys-root/mingw ]
-  then
-    # convert pkgconfig files
-    if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ]
-    then
-      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
-    fi
-    # install the package
-    cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/
-  fi
-
-  if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ]
-  then
-    # convert pkgconfig files
-    if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig ]
-    then
-      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
-    fi
-    # install the package
-    cp -rf $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/* $INSTALL_PATH/
-  fi
-
-  # remove the extracted file
-  rm -rf $BUILD_PATH/usr
-  popd
-done < packages.version
-
-# remove build directory
-rm -rf $BUILD_PATH
diff --git a/win32/x86-mingw32-opensuse/packages.list b/win32/x86-mingw32-opensuse/packages.list
deleted file mode 100644 (file)
index 31c57f3..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-This file is licensed under the terms of the LGPL 2.1, see the file COPYING.
-
-mingw32-atk
-mingw32-atk-devel
-mingw32-cairo-devel
-mingw32-dbus-1
-mingw32-dbus-1-glib
-mingw32-dbus-1-glib-devel
-mingw32-enchant
-mingw32-enchant-devel
-mingw32-fontconfig
-mingw32-fontconfig-devel
-mingw32-freetype
-mingw32-freetype-devel
-mingw32-gcc-c++
-mingw32-gcc
-mingw32-gdb
-mingw32-gdk-pixbuf
-mingw32-gdk-pixbuf-devel
-mingw32-gettext-runtime
-mingw32-gettext-tools
-mingw32-glib2
-mingw32-glib2-devel
-mingw32-glib-networking
-mingw32-gst-plugins-base-devel
-mingw32-gstreamer-devel
-mingw32-gtk2
-mingw32-gtk2-devel
-mingw32-hunspell
-mingw32-hunspell-devel
-mingw32-libexpat
-mingw32-libexpat-devel
-mingw32-libgcc
-mingw32-libgcrypt
-mingw32-libgcrypt-devel
-mingw32-libcairo2
-mingw32-libgeoclue
-mingw32-libgeoclue-devel
-mingw32-libgnutls
-mingw32-libgnutls-devel
-mingw32-libgpg-error
-mingw32-libgpg-error-devel
-mingw32-libgstinterfaces
-mingw32-libgstreamer
-mingw32-libidn
-mingw32-libidn-devel
-mingw32-libintl
-mingw32-libintl-devel
-mingw32-libjasper
-mingw32-libjasper-devel
-mingw32-libjpeg
-mingw32-libjpeg-devel
-mingw32-libopenssl
-mingw32-libopenssl-devel
-mingw32-libpng
-mingw32-libpng-devel
-mingw32-libsoup
-mingw32-libsoup-devel
-mingw32-libstdc++
-mingw32-libsqlite
-mingw32-libsqlite-devel
-mingw32-libtasn1
-mingw32-libtasn1-devel
-mingw32-libtiff
-mingw32-libtiff-devel
-mingw32-libwebkitgtk
-mingw32-libwebkitgtk-devel
-mingw32-webkit-tools
-mingw32-libxml2
-mingw32-libxml2-devel
-mingw32-libxslt
-mingw32-libxslt-devel
-mingw32-pango
-mingw32-pango-devel
-mingw32-pixman
-mingw32-pixman-devel
-mingw32-pthreads
-mingw32-pthreads-devel
-mingw32-libproxy
-mingw32-libmodman
-mingw32-shared-mime-info
-mingw32-shared-mime-info-devel
-mingw32-win_iconv
-mingw32-win_iconv-devel
-mingw32-zlib
-mingw32-zlib-devel
-mingw32-libunique
-mingw32-libunique-devel
-mingw32-libffi
diff --git a/wscript b/wscript
deleted file mode 100644 (file)
index 7d9aba0..0000000
--- a/wscript
+++ /dev/null
@@ -1,752 +0,0 @@
-#! /usr/bin/env python
-# WAF build script for midori
-# This file is licensed under the terms of the expat license, see the file EXPAT.
-
-import sys
-
-# Waf version check, for global waf installs
-try:
-    from Constants import WAFVERSION
-except:
-    WAFVERSION='1.0.0'
-if WAFVERSION[:3] != '1.5':
-    print ('Incompatible Waf, use 1.5')
-    sys.exit (1)
-
-import Build
-import Options
-import Utils
-import pproc as subprocess
-import os
-try:
-    import UnitTest
-except:
-    import unittestw as UnitTest
-import Task
-from TaskGen import extension, feature, taskgen
-import misc
-from Configure import find_program_impl
-
-APPNAME = 'midori'
-VERSION = VERSION_FULL = '0.5.2'
-VERSION_SUFFIX = ' (%s)' % VERSION
-
-try:
-    if os.path.isdir ('.git'):
-        git = Utils.cmd_output (['git', 'describe'], silent=True)
-        if git:
-            VERSION_FULL = git.strip ()
-    elif os.path.isdir ('.bzr'):
-        bzr = Utils.cmd_output (['bzr', 'revno'], silent=True)
-        if bzr:
-            VERSION_FULL = '%s~r%s' % (VERSION, bzr.strip ())
-    else:
-        folder = os.getcwd ()
-        if VERSION in folder:
-            VERSION_FULL = os.path.basename (folder)
-    if VERSION in VERSION_FULL:
-        VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
-except:
-    pass
-
-srcdir = '.'
-blddir = '_build' # recognized by ack
-
-def option_enabled (option):
-    if getattr (Options.options, 'enable_' + option):
-        return True
-    if getattr (Options.options, 'disable_' + option):
-        return False
-    return True
-
-def is_mingw (env):
-    if 'CC' in env:
-        cc = env['CC']
-        if not isinstance (cc, str):
-            cc = ''.join (cc)
-        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')
-    rctask.set_inputs (node)
-    rctask.set_outputs (node.change_ext ('.rc.o'))
-    self.compiled_tasks.append (rctask)
-rc_file = extension ('.rc')(rc_file)
-Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE',
-    before='cc cxx', shell=False)
-
-def configure (conf):
-    def option_checkfatal (option, desc):
-        if hasattr (Options.options, 'enable_' + option):
-            if getattr (Options.options, 'enable_' + option):
-                Utils.pprint ('RED', desc + ' N/A')
-                sys.exit (1)
-
-    def dirname_default (dirname, default, defname=None):
-        if getattr (Options.options, dirname) == '':
-            dirvalue = default
-        else:
-            dirvalue = getattr (Options.options, dirname)
-        if not defname:
-            defname = dirname
-        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_message_custom ('release version', '', VERSION_FULL)
-
-    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')
-        if not conf.env['INTLTOOL'] and conf.env['POCOM']:
-            option_checkfatal ('nls', 'localization')
-            conf.define ('ENABLE_NLS', 0)
-        else:
-            conf.define ('ENABLE_NLS', 1)
-    else:
-        conf.define ('ENABLE_NLS', 0)
-        conf.check_message_custom ('nls', '', 'disabled')
-
-    conf.find_program ('rsvg-convert', var='RSVG_CONVERT')
-
-    if is_win32 (conf.env):
-        conf.find_program ('windres', var='WINRC')
-        conf.env['platform'] = 'win32'
-
-    # This is specific to cross compiling with mingw
-    if is_mingw (conf.env) and Options.platform != 'win32':
-        if not 'AR' in os.environ and not 'RANLIB' in os.environ:
-            conf.env['AR'] = os.environ['CC'][:-3] + 'ar'
-        if conf.find_program (os.environ['CC'][:-3] + 'windres', var='WINRC'):
-            os.environ['WINRC'] = os.environ['CC'][:-3] + 'windres'
-        Options.platform = 'win32'
-        # Make sure we don't have -fPIC in the CCFLAGS
-        conf.env["shlib_CCFLAGS"] = []
-        # Adjust file naming
-        conf.env["shlib_PATTERN"] = 'lib%s.dll'
-        conf.env['program_PATTERN'] = '%s.exe'
-        # Use Visual C++ compatible alignment
-        conf.env.append_value ('CCFLAGS', '-mms-bitfields')
-        conf.env['staticlib_LINKFLAGS'] = []
-
-        Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.')
-
-    dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib'))
-    if conf.env['PREFIX'] == '/usr':
-        dirname_default ('SYSCONFDIR', '/etc')
-    else:
-        dirname_default ('SYSCONFDIR', os.path.join (conf.env['PREFIX'], 'etc'))
-    dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share'),
-    # Use MDATADIR because DATADIR is a constant in objidl.h on Windows
-        'MDATADIR')
-    conf.undefine ('DATADIR')
-    dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc'))
-    if not APPNAME in conf.env['DOCDIR']:
-        conf.env['DOCDIR'] += '/' + APPNAME
-        conf.define ('DOCDIR', conf.env['DOCDIR'])
-
-    if option_enabled ('apidocs'):
-        conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN')
-        conf.find_program ('gtkdoc-mktmpl', var='GTKDOC_MKTMPL')
-        conf.find_program ('gtkdoc-mkdb', var='GTKDOC_MKDB')
-        conf.find_program ('gtkdoc-mkhtml', var='GTKDOC_MKHTML')
-        if conf.env['GTKDOC_SCAN'] and conf.env['GTKDOC_MKTMPL'] \
-            and conf.env['GTKDOC_MKDB'] and conf.env['GTKDOC_MKHTML']:
-            pass
-        else:
-            option_checkfatal ('apidocs', 'API documentation')
-    else:
-        conf.check_message_custom ('gtk-doc', '', 'disabled')
-
-    def check_pkg (name, version='', mandatory=True, var=None, args=''):
-        if not var:
-            var = name.split ('-')[0].upper ()
-        ver_str = ['',' >= ' + version][version != '']
-        def okmsg_ver (kw):
-            return conf.check_cfg (modversion=name, uselibstore=var)
-        conf.check_cfg (msg='Checking for ' + name + ver_str, okmsg=okmsg_ver,
-            package=name, uselib_store=var, args='--cflags --libs ' + args,
-            atleast_version=version, mandatory=mandatory)
-        have = conf.env['HAVE_' + var] == 1
-        conf.define (var + '_VERSION', ['No', conf.check_cfg (modversion=name,
-            uselib_store=var, errmsg=name + ver_str + ' not found')][have])
-        return have
-
-    if option_enabled ('libnotify'):
-        if not check_pkg ('libnotify', mandatory=False):
-            option_checkfatal ('libnotify', 'notifications')
-    else:
-        conf.define ('LIBNOTIFY_VERSION', 'No')
-        conf.check_message_custom ('libnotify', '', 'disabled')
-    conf.define ('HAVE_LIBNOTIFY', [0,1][conf.env['LIBNOTIFY_VERSION'] != 'No'])
-
-    if option_enabled ('granite'):
-        check_pkg ('granite', '0.2', mandatory=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.env.append_value ('VALAFLAGS', '-D HAVE_GRANITE')
-    else:
-        conf.define ('GRANITE_VERSION', 'No')
-        conf.check_message_custom ('granite', '', 'disabled')
-
-    if option_enabled ('zeitgeist'):
-        check_pkg ('zeitgeist-1.0', '0.3.14')
-    else:
-        conf.check_message_custom ('zeitgeist', '', 'disabled')
-
-    conf.check (lib='m')
-    check_pkg ('gmodule-2.0')
-    check_pkg ('gio-2.0', '2.22.0')
-    if check_version (conf.env['GIO_VERSION'], 2, 30, 0) \
-        and check_version (conf.env['VALAC_VERSION'], 0, 16, 0):
-        # Older Vala doesn't have GLib 2.30 bindings
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_GLIB_2_30')
-
-    args = ''
-    if Options.platform == 'win32':
-        args = '--define-variable=target=win32'
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WIN32')
-    elif sys.platform != 'darwin':
-        if sys.platform.startswith ('freebsd'):
-            conf.env.append_value ('VALAFLAGS', '-D HAVE_FREEBSD')
-
-        check_pkg ('x11')
-        # Pass /usr/X11R6/include for OpenBSD
-        conf.check (header_name='X11/extensions/scrnsaver.h',
-                    includes='/usr/X11R6/include', mandatory=False)
-        conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False)
-
-    have_gtk3 = option_enabled ('gtk3') or option_enabled ('webkit2') or option_enabled ('granite')
-    if have_gtk3:
-        check_pkg ('gtk+-3.0', '3.0.0', var='GTK', mandatory=False)
-        check_pkg ('gcr-3', '2.32', mandatory=False)
-        if option_enabled ('webkit2'):
-            # 2.0.0 matches 1.11.91 API; 1.11.92 > 2.0.0
-            check_pkg ('webkit2gtk-3.0', '1.11.91', var='WEBKIT', mandatory=False)
-            if not conf.env['HAVE_WEBKIT']:
-                Utils.pprint ('RED', 'WebKit2/ GTK+3 was not found.\n' \
-                    'Pass --disable-webkit2 to build without WebKit2.')
-                sys.exit (1)
-            conf.define ('HAVE_WEBKIT2', 1)
-            conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT2')
-        else:
-            check_pkg ('webkitgtk-3.0', '1.1.17', var='WEBKIT', mandatory=False)
-        if not conf.env['HAVE_GTK'] or not conf.env['HAVE_WEBKIT']:
-            Utils.pprint ('RED', 'GTK+3 was not found.\n' \
-                'Pass --disable-gtk3 to build without GTK+3.')
-            sys.exit (1)
-        if check_version (conf.env['WEBKIT_VERSION'], 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')
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_DOM')
-    else:
-        check_pkg ('gtk+-2.0', '2.16.0', var='GTK')
-        check_pkg ('webkit-1.0', '1.1.17', args=args)
-        check_pkg ('gcr-3-gtk2', '2.32', mandatory=False)
-        if check_version (conf.env['WEBKIT_VERSION'], 1, 5, 1):
-            check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
-        if check_version (conf.env['GTK_VERSION'], 2, 20, 0):
-            conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
-    conf.env['HAVE_GTK3'] = have_gtk3
-    conf.env['HAVE_WEBKIT2'] = option_enabled ('webkit2')
-
-    if option_enabled ('unique'):
-        if have_gtk3: unique_pkg = 'unique-3.0'
-        else: unique_pkg = 'unique-1.0'
-        if not check_pkg (unique_pkg, '0.9', mandatory=False):
-            option_checkfatal ('unique', 'single instance')
-    else:
-        conf.define ('UNIQUE_VERSION', 'No')
-        conf.check_message_custom ('unique', '', 'disabled')
-    conf.define ('HAVE_UNIQUE', [0,1][conf.env['UNIQUE_VERSION'] != 'No'])
-
-    check_pkg ('libsoup-2.4', '2.27.90', var='LIBSOUP')
-    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, 34, 0):
-        conf.define ('HAVE_LIBSOUP_2_34_0', 1)
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_LIBSOUP_2_34_0')
-    if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
-        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
-
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 8):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_8')
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 13):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_13')
-    if check_version (conf.env['WEBKIT_VERSION'], 1, 8, 0):
-        conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_8_0')
-
-    check_pkg ('libxml-2.0', '2.6')
-    conf.undefine ('LIBXML_VERSION') # Defined in xmlversion.h
-    check_pkg ('sqlite3', '3.6.19', var='SQLITE')
-
-    # Store options in env, since 'Options' is not persistent
-    if 'CC' in os.environ: conf.env['CC'] = os.environ['CC'].split()
-    conf.env['addons'] = option_enabled ('addons')
-    conf.env['tests'] = option_enabled ('tests')
-    conf.env['docs'] = option_enabled ('docs')
-    if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS']
-
-    if not check_version (conf.env['GIO_VERSION'], 2, 26, 0):
-        conf.env['addons'] = False
-        Utils.pprint ('YELLOW', 'Glib < 2.26.0, disabling addons')
-
-    conf.check (header_name='unistd.h')
-    if not conf.env['HAVE_UNIQUE']:
-        if Options.platform == 'win32':
-            conf.check (lib='ws2_32')
-        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')
-        conf.check (function_name='inet_aton', header_name='sys/types.h sys/socket.h netinet/in.h arpa/inet.h')
-        conf.check (function_name='inet_addr', header_name='sys/types.h sys/socket.h netinet/in.h arpa/inet.h')
-    conf.define ('HAVE_OSX', int(sys.platform == 'darwin'))
-    if Options.platform == 'win32':
-        conf.env.append_value ('LINKFLAGS', '-mwindows')
-        conf.env.append_value ('program_LINKFLAGS', ['-Wl,--out-implib=default/midori/libmidori.a', '-Wl,--export-all-symbols'])
-    else:
-        conf.check (header_name='signal.h')
-
-    conf.define ('PACKAGE_NAME', APPNAME)
-    conf.define ('PACKAGE_BUGREPORT', 'https://bugs.launchpad.net/midori')
-    conf.define ('GETTEXT_PACKAGE', APPNAME)
-
-    conf.define ('MIDORI_VERSION', VERSION)
-    major, minor, micro = VERSION.split ('.', 2)
-    conf.define ('MIDORI_MAJOR_VERSION', int (major))
-    conf.define ('MIDORI_MINOR_VERSION', int (minor))
-    conf.define ('MIDORI_MICRO_VERSION', int (micro))
-
-    conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ())
-    debug_level = Options.options.debug_level
-    compiler = conf.env['CC_NAME']
-
-    if debug_level == 'full':
-        conf.define ('PACKAGE_VERSION', '%s (debug)' % VERSION_FULL)
-        conf.env.append_value ('CCFLAGS', '-DMIDORI_VERSION_SUFFIX="%s (debug)"' % VERSION_SUFFIX)
-    else:
-        conf.define ('PACKAGE_VERSION', VERSION_FULL)
-        conf.env.append_value ('CCFLAGS', '-DMIDORI_VERSION_SUFFIX="%s"' % VERSION_SUFFIX)
-    conf.write_config_header ('config.h')
-
-    if debug_level == 'debug':
-        conf.env.append_value ('VALAFLAGS', '--debug --enable-deprecated'.split ())
-        if compiler == 'gcc':
-            conf.env.append_value ('CCFLAGS', '-O2 -g -Wall -Wno-deprecated-declarations'.split ())
-    elif debug_level == 'full':
-        conf.env.append_value ('VALAFLAGS', '--debug --enable-checking'.split ())
-        if compiler == 'gcc':
-            conf.env.append_value ('CCFLAGS',
-                '-O2 -g -Wall -Wextra -DG_ENABLE_DEBUG '
-                '-Waggregate-return -Wno-unused-parameter '
-                '-Wno-missing-field-initializers '
-                '-Wredundant-decls -Wmissing-noreturn '
-                '-Wshadow -Wpointer-arith -Wcast-align '
-                '-Winline -Wformat-security -fno-common '
-                '-Winit-self -Wundef -Wdeclaration-after-statement '
-                '-Wmissing-format-attribute -Wnested-externs'.split ())
-    conf.env.append_value ('CCFLAGS', '-Wno-unused-variable -Wno-comment'.split ())
-
-    if conf.env['UNIQUE_VERSION'] == '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.env['GIO_VERSION'], 2, 32, 1) \
-        and not check_version (conf.env['GIO_VERSION'], 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 add_enable_option (option, desc, group=None, disable=False):
-        if group == None:
-            group = opt
-        option_ = option.replace ('-', '_')
-        group.add_option ('--enable-' + option, action='store_true', default=False,
-            help='Enable ' + desc + ' [Default: ' + str (not disable) + ']',
-            dest='enable_' + option_)
-        group.add_option ('--disable-' + option, action='store_true',
-            default=disable, help='Disable ' + desc, dest='disable_' + option_)
-
-    opt.tool_options ('compiler_cc')
-    opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level',
-        action = 'store', default = 'debug',
-        help = 'Specify the debugging level. [\'none\', \'debug\', \'full\']',
-        choices = ['none', 'debug', 'full'], dest = 'debug_level')
-    opt.tool_options ('gnu_dirs')
-    opt.parser.remove_option ('--oldincludedir')
-    opt.parser.remove_option ('--htmldir')
-    opt.parser.remove_option ('--dvidir')
-    opt.parser.remove_option ('--pdfdir')
-    opt.parser.remove_option ('--psdir')
-    opt.tool_options ('intltool')
-    opt.add_option ('--run', action='store_true', default=False,
-        help='Run application after building it', dest='run')
-
-    group = opt.add_option_group ('Localization and documentation', '')
-    add_enable_option ('nls', 'native language support', group)
-    group.add_option ('--update-po', action='store_true', default=False,
-        help='Update localization files', dest='update_po')
-    add_enable_option ('docs', 'informational text files', group)
-    add_enable_option ('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 ('libnotify', 'notification support', group)
-    add_enable_option ('granite', 'new notebook, pop-overs', group, disable=True)
-    add_enable_option ('addons', 'building of extensions', group)
-    add_enable_option ('tests', 'install tests', group, disable=True)
-    add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group, disable=True)
-    add_enable_option ('webkit2', 'WebKit2 support', group, disable=True)
-    add_enable_option ('zeitgeist', 'Zeitgeist history integration', group, disable=is_win32 (os.environ))
-
-    # Provided for compatibility
-    opt.add_option ('--build', help='Ignored')
-    opt.add_option ('--disable-maintainer-mode', help='Ignored')
-
-# Taken from Geany's wscript, modified to support LINGUAS variable
-def write_linguas_file (self):
-    linguas = ''
-    # Depending on Waf version, getcwd() is different
-    if os.path.exists ('./po'):
-        podir = './po'
-    else:
-        podir = '../po'
-    if 'LINGUAS' in Build.bld.env:
-        files = Build.bld.env['LINGUAS']
-        for f in files.split (' '):
-            if os.path.exists (podir + '/' + f + '.po'):
-                linguas += f + ' '
-    else:
-        files = os.listdir (podir)
-        for f in files:
-            if f.endswith ('.po'):
-                linguas += '%s ' % f[:-3]
-    f = open (podir + '/LINGUAS', 'w')
-    f.write ('# This file is autogenerated. Do not edit.\n%s\n' % linguas)
-    f.close ()
-write_linguas_file = feature ('intltool_po')(write_linguas_file)
-
-def build (bld):
-    bld.add_group ()
-
-    bld.add_subdirs ('midori icons')
-
-    if bld.env['addons']:
-        bld.add_subdirs ('extensions')
-
-    bld.add_group ()
-
-    if bld.env['docs']:
-        bld.install_files ('${DOCDIR}/', \
-            'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
-
-    # Install default configuration
-    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
-
-    if bld.env['INTLTOOL']:
-        obj = bld.new_task_gen ('intltool_po')
-        obj.podir = 'po'
-        obj.appname = APPNAME
-
-    if bld.env['GTKDOC_SCAN'] and Options.commands['build']:
-        bld.add_subdirs ('docs/api')
-        bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*')
-
-    for desktop in [APPNAME + '.desktop', APPNAME + '-private.desktop']:
-        if is_win32 (bld.env):
-            break
-        appdir = '${MDATADIR}/applications'
-        if bld.env['INTLTOOL']:
-            obj = bld.new_task_gen ('intltool_in')
-            obj.source = 'data/' + desktop + '.in'
-            obj.install_path = appdir
-            obj.flags  = ['-d', '-c']
-            bld.install_files (appdir, 'data/' + desktop)
-        else:
-            folder = os.path.abspath (blddir + '/default/data')
-            Utils.check_dir (folder)
-            pre = open ('data/' + desktop + '.in')
-            after = open (folder + '/' + desktop, 'w')
-            try:
-                try:
-                    for line in pre:
-                        if line != '':
-                            if line[0] == '_':
-                                after.write (line[1:])
-                            else:
-                                after.write (line)
-                    after.close ()
-                    Utils.pprint ('BLUE', desktop + '.in -> ' + desktop)
-                    bld.install_files (appdir, folder + '/' + desktop)
-                except:
-                    Utils.pprint ('BLUE', 'File ' + desktop + ' not generated')
-            finally:
-                pre.close ()
-
-    if bld.env['RSVG_CONVERT']:
-        Utils.check_dir (blddir + '/data')
-        command = bld.env['RSVG_CONVERT'] + \
-            ' -o ' + blddir + '/data/logo-shade.png ' + \
-            srcdir + '/data/logo-shade.svg'
-        if not Utils.exec_command (command):
-            bld.install_files ('${MDATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png')
-        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']:
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file)
-
-    if bld.env['addons']:
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
-
-        if 1:
-            extensions = os.listdir ('data/extensions')
-            for extension in extensions:
-                source = 'data/extensions/' + extension +  '/config'
-                if os.path.exists (source):
-                    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
-                                       '/extensions/' + extension, source)
-
-    if Options.commands['check'] or bld.env['tests']:
-        bld.add_subdirs ('tests')
-
-    if Options.commands['clean']:
-        distclean ()
-
-def check (ctx):
-    # The real work happens in shutdown ()
-    pass
-
-def distclean ():
-    if os.path.exists ('po/LINGUAS'):
-        os.remove ('po/LINGUAS')
-    if os.path.exists ('po/midori.pot'):
-        os.remove ('po/midori.pot')
-
-def shutdown ():
-    if Options.commands['install'] or Options.commands['uninstall']:
-        dir = Build.bld.get_install_path ('${MDATADIR}/icons/hicolor')
-        icon_cache_updated = False
-        if not Options.options.destdir:
-            # update the pixmap cache directory
-            try:
-                command = 'gtk-update-icon-cache -q -f -t %s' % dir
-                if not Utils.exec_command (command):
-                    Utils.pprint ('YELLOW', "Updated Gtk icon cache.")
-                    icon_cache_updated = True
-            except:
-                Utils.pprint ('RED', "Failed to update icon cache.")
-        if not icon_cache_updated:
-            Utils.pprint ('YELLOW', "Icon cache not updated. "
-                                     "After install, run this:")
-            Utils.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir)
-
-    elif Options.commands['check']:
-        def reset_xdg_dirs ():
-            import tempfile, shutil
-            base = os.path.join (tempfile.gettempdir (), 'midori-test', '%s')
-            if os.path.exists (base % ''):
-                shutil.rmtree (base % '')
-            for x in ['XDG_CONFIG_HOME', 'XDG_CACHE_HOME', 'XDG_DATA_HOME', 'XDG_RUNTIME_DIR', 'TMPDIR']:
-                os.environ[x] = (base % x).lower ()
-                Utils.check_dir (os.environ[x])
-
-        def subprocess_popen_timeout (args, stdout=None, stderr=None):
-            import threading, signal
-            def t_kill ():
-                Utils.pprint ('RED', 'timed out')
-                os.kill (pp.pid, signal.SIGABRT)
-            t = threading.Timer (int(os.environ.get ('MIDORI_TIMEOUT', '42')), t_kill)
-            t.start ()
-            if is_mingw (Build.bld.env):
-                args.insert (0, 'wine')
-            cwd = Build.bld.env['PREFIX'] + os.sep + 'bin'
-            pp = subprocess.Popen (args, cwd=cwd, stdout=stdout, stderr=stderr)
-            if stdout is None:
-                (out, err) = pp.communicate ()
-                t.cancel ()
-            return pp
-
-        # Avoid i18n-related false failures
-        os.environ['LC_ALL'] = 'C'
-        os.environ['UNIQUE_BACKEND'] = 'bacon'
-        if is_mingw (Build.bld.env):
-            os.environ['MIDORI_EXEC_PATH'] = Build.bld.env['PREFIX']
-        test = UnitTest.unit_test ()
-
-        reset_xdg_dirs ()
-        if True:
-            test.unit_test_results = {}
-            for obj in Build.bld.all_task_gen:
-                if getattr (obj, 'unit_test', '') and 'cprogram' in obj.features:
-                    if 'MIDORI_UNITS' in os.environ and not obj.target.split('-')[1] in os.environ['MIDORI_UNITS']:
-                        continue
-                    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)
-                    test.unit_tests[label] = (filename, srcdir)
-
-            Utils.pprint ('GREEN', 'Running the unit tests')
-            for label in test.unit_tests.allkeys:
-                filename = test.unit_tests[label][0]
-                test.unit_test_results[label] = 0
-                try:
-                    if is_mingw (Build.bld.env):
-                        filename += '.exe'
-                    args = [filename]
-                    pp = subprocess_popen_timeout (args)
-                    test.unit_test_results[label] = int (pp.returncode == 0)
-                    if not test.unit_test_results[label]:
-                        test.num_tests_failed += 1
-                except OSError:
-                    msg = sys.exc_info()[1] # Python 2/3 compatibility
-                    Utils.pprint ('RED', '%s: %s' % (args, msg))
-                    test.num_tests_err += 1
-                except KeyboardInterrupt:
-                    pass
-        else:
-            test.want_to_see_test_output = True
-            test.want_to_see_test_error = True
-            test.run ()
-
-        reset_xdg_dirs ()
-        for label in test.unit_tests.allkeys:
-            if not test.unit_test_results[label]:
-                Utils.pprint ('YELLOW', label + '...FAILED')
-                filename = test.unit_tests[label][0]
-                try:
-                    if is_mingw (Build.bld.env):
-                        filename += '.exe'
-                    args = ['gdb', '--batch', '-ex', 'set print thread-events off', '-ex', 'run', '-ex', 'bt', filename]
-                    pp = subprocess_popen_timeout (args)
-                except OSError:
-                    Utils.pprint ('RED', 'Install gdb to see backtraces')
-                except KeyboardInterrupt:
-                    pass
-            else:
-                Utils.pprint ('GREEN', label + '.......OK')
-                filename = test.unit_tests[label][0]
-                if is_mingw (Build.bld.env):
-                    filename += '.exe'
-                if os.environ.get ('MIDORI_TEST') == 'valgrind':
-                    args = ['valgrind', '-q', '--leak-check=no', '--num-callers=4', '--show-possibly-lost=no', '--undef-value-errors=yes', '--track-origins=yes', filename]
-                elif os.environ.get ('MIDORI_TEST') == 'callgrind':
-                    args = ['valgrind', '--tool=callgrind', '--callgrind-out-file=%s.callgrind' % filename, filename]
-                else:
-                    continue
-                try:
-                    pp = subprocess_popen_timeout (args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-                    skip = False
-                    for line in iter(pp.stdout.readline, ''):
-                        if line[:2] != '==':
-                            continue
-                        if line == '':
-                            skip = False
-                        elif 'Conditional jump or move' in line:
-                            skip = True
-                        elif 'Uninitialised value was created by a stack allocation' in line:
-                            skip = True
-                        elif not skip:
-                            sys.stdout.write (line[9:])
-                except OSError:
-                    Utils.pprint ('YELLOW', 'Install valgrind to perform memory checks')
-                except KeyboardInterrupt:
-                    pass
-
-        if not 'MIDORI_UNITS' in os.environ:
-            Utils.pprint ('BLUE', 'Set MIDORI_UNITS to select a subset of test cases')
-        if not 'MIDORI_TEST' in os.environ:
-            Utils.pprint ('BLUE', 'Set MIDORI_TEST to "valgrind" or "callgrind" to perform memory checks')
-        if not 'MIDORI_TIMEOUT' in os.environ:
-            Utils.pprint ('BLUE', 'Set MIDORI_TIMEOUT to set the maximum test runtime (default: 42)')
-        # if test.num_tests_failed > 0 or test.num_tests_err > 0:
-        #     sys.exit (1)
-
-    elif Options.options.update_po:
-        os.chdir('./po')
-        try:
-            try:
-                size_old = os.stat (APPNAME + '.pot').st_size
-            except:
-                size_old = 0
-            subprocess.call (['intltool-update', '-p', '-g', APPNAME])
-            size_new = os.stat (APPNAME + '.pot').st_size
-            if size_new != size_old:
-                Utils.pprint ('YELLOW', "Updated po template.")
-                try:
-                    command = 'intltool-update -r -g %s' % APPNAME
-                    Utils.exec_command (command)
-                    Utils.pprint ('YELLOW', "Updated translations.")
-                except:
-                    Utils.pprint ('RED', "Failed to update translations.")
-        except:
-            Utils.pprint ('RED', "Failed to generate po template.")
-            Utils.pprint ('RED', "Make sure intltool is installed.")
-        os.chdir ('..')
-    elif Options.options.run:
-        folder = os.path.abspath (blddir + '/default')
-        try:
-            relfolder = folder
-            if not is_mingw (Build.bld.env):
-                relfolder = os.path.relpath (folder)
-        except:
-            pass
-        try:
-            nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
-            lang = os.environ['LANG']
-            try:
-                for lang in os.listdir (folder + os.sep + 'po'):
-                    if lang[3:] == 'mo':
-                        lang = lang[:-3]
-                    else:
-                        continue
-                    Utils.check_dir (folder + os.sep + 'po' + os.sep + lang)
-                    Utils.check_dir (folder + os.sep + 'po' + os.sep + lang + \
-                        os.sep + 'LC_MESSAGES')
-                    os.symlink (folder + os.sep + 'po' + os.sep + lang + '.mo',
-                        folder + os.sep + 'po' + os.sep + lang + os.sep + \
-                        'LC_MESSAGES' + os.sep + APPNAME + '.mo')
-            except:
-                pass
-            command = 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')
-                command += ' wine cmd /k "PATH=%PATH%;' + Build.bld.env['PREFIX'] + os.sep + 'bin' + ' && ' + APPNAME + '.exe"'
-            else:
-                command += ' ' + relfolder + os.sep + APPNAME + os.sep + APPNAME
-            print (command)
-            Utils.exec_command (command)
-        except Exception:
-            msg = sys.exc_info()[1] # Python 2/3 compatibility
-            Utils.pprint ('RED', "Failed to run application: " + str (msg))